diff options
| -rw-r--r-- | actions/admin/plugins/disable.php | 72 | ||||
| -rw-r--r-- | actions/admin/plugins/disableall.php | 65 | ||||
| -rw-r--r-- | actions/admin/plugins/enable.php | 70 | ||||
| -rw-r--r-- | actions/admin/plugins/enableall.php | 68 | ||||
| -rw-r--r-- | actions/admin/plugins/reorder.php | 101 | ||||
| -rw-r--r-- | actions/admin/site/update_basic.php | 183 | ||||
| -rw-r--r-- | actions/admin/user/ban.php | 62 | ||||
| -rw-r--r-- | actions/admin/user/delete.php | 57 | ||||
| -rw-r--r-- | actions/admin/user/makeadmin.php | 60 | ||||
| -rw-r--r-- | actions/admin/user/removeadmin.php | 60 | ||||
| -rw-r--r-- | actions/admin/user/resetpassword.php | 83 | ||||
| -rw-r--r-- | actions/admin/user/unban.php | 71 |
12 files changed, 466 insertions, 486 deletions
diff --git a/actions/admin/plugins/disable.php b/actions/admin/plugins/disable.php index 90825bc2f..810eb1c94 100644 --- a/actions/admin/plugins/disable.php +++ b/actions/admin/plugins/disable.php @@ -1,38 +1,38 @@ <?php - /** - * Disable plugin action. - * - * @package Elgg - * @subpackage Core - * @author Curverider Ltd - * @link http://elgg.org/ - */ +/** + * Disable plugin action. + * + * @package Elgg + * @subpackage Core + * @author Curverider Ltd + * @link http://elgg.org/ + */ - require_once(dirname(dirname(dirname(dirname(__FILE__)))) . "/engine/start.php"); - - // block non-admin users - admin_gatekeeper(); - - // Validate the action - action_gatekeeper(); - - // Get the plugin - $plugin = get_input('plugin'); - if (!is_array($plugin)) - $plugin = array($plugin); - - foreach ($plugin as $p) - { - // Disable - if (disable_plugin($p)) - system_message(sprintf(elgg_echo('admin:plugins:disable:yes'), $p)); - else - register_error(sprintf(elgg_echo('admin:plugins:disable:no'), $p)); - } - - elgg_view_regenerate_simplecache(); - elgg_filepath_cache_reset(); - - forward($_SERVER['HTTP_REFERER']); - exit; -?>
\ No newline at end of file +require_once(dirname(dirname(dirname(dirname(__FILE__)))) . "/engine/start.php"); + +// block non-admin users +admin_gatekeeper(); + +// Validate the action +action_gatekeeper(); + +// Get the plugin +$plugin = get_input('plugin'); +if (!is_array($plugin)) { + $plugin = array($plugin); +} + +foreach ($plugin as $p) { + // Disable + if (disable_plugin($p)) { + system_message(sprintf(elgg_echo('admin:plugins:disable:yes'), $p)); + } else { + register_error(sprintf(elgg_echo('admin:plugins:disable:no'), $p)); + } +} + +elgg_view_regenerate_simplecache(); +elgg_filepath_cache_reset(); + +forward($_SERVER['HTTP_REFERER']); +exit;
\ No newline at end of file diff --git a/actions/admin/plugins/disableall.php b/actions/admin/plugins/disableall.php index 672915bce..b06961450 100644 --- a/actions/admin/plugins/disableall.php +++ b/actions/admin/plugins/disableall.php @@ -1,35 +1,34 @@ <?php - /** - * Disable plugin action. - * - * @package Elgg - * @subpackage Core - * @author Curverider Ltd - * @link http://elgg.org/ - */ +/** + * Disable plugin action. + * + * @package Elgg + * @subpackage Core + * @author Curverider Ltd + * @link http://elgg.org/ + */ - require_once(dirname(dirname(dirname(dirname(__FILE__)))) . "/engine/start.php"); - - // block non-admin users - admin_gatekeeper(); - - // Validate the action - action_gatekeeper(); - - $plugins = get_installed_plugins(); - - foreach ($plugins as $p => $data) - { - // Disable - if (disable_plugin($p)) - system_message(sprintf(elgg_echo('admin:plugins:disable:yes'), $p)); - else - register_error(sprintf(elgg_echo('admin:plugins:disable:no'), $p)); - } - - elgg_view_regenerate_simplecache(); - elgg_filepath_cache_reset(); - - forward($_SERVER['HTTP_REFERER']); - exit; -?>
\ No newline at end of file +require_once(dirname(dirname(dirname(dirname(__FILE__)))) . "/engine/start.php"); + +// block non-admin users +admin_gatekeeper(); + +// Validate the action +action_gatekeeper(); + +$plugins = get_installed_plugins(); + +foreach ($plugins as $p => $data) { + // Disable + if (disable_plugin($p)) { + system_message(sprintf(elgg_echo('admin:plugins:disable:yes'), $p)); + } else { + register_error(sprintf(elgg_echo('admin:plugins:disable:no'), $p)); + } +} + +elgg_view_regenerate_simplecache(); +elgg_filepath_cache_reset(); + +forward($_SERVER['HTTP_REFERER']); +exit;
\ No newline at end of file diff --git a/actions/admin/plugins/enable.php b/actions/admin/plugins/enable.php index 890e6648e..0a6631b65 100644 --- a/actions/admin/plugins/enable.php +++ b/actions/admin/plugins/enable.php @@ -1,38 +1,38 @@ <?php - /** - * Enable plugin action. - * - * @package Elgg - * @subpackage Core - * @author Curverider Ltd - * @link http://elgg.org/ - */ +/** + * Enable plugin action. + * + * @package Elgg + * @subpackage Core + * @author Curverider Ltd + * @link http://elgg.org/ + */ - require_once(dirname(dirname(dirname(dirname(__FILE__)))) . "/engine/start.php"); - - // block non-admin users - admin_gatekeeper(); - - // Validate the action - action_gatekeeper(); - - // Get the plugin - $plugin = get_input('plugin'); - if (!is_array($plugin)) - $plugin = array($plugin); - - foreach ($plugin as $p) - { - // Disable - if (enable_plugin($p)) - system_message(sprintf(elgg_echo('admin:plugins:enable:yes'), $p)); - else - register_error(sprintf(elgg_echo('admin:plugins:enable:no'), $p)); +require_once(dirname(dirname(dirname(dirname(__FILE__)))) . "/engine/start.php"); + +// block non-admin users +admin_gatekeeper(); + +// Validate the action +action_gatekeeper(); + +// Get the plugin +$plugin = get_input('plugin'); +if (!is_array($plugin)) { + $plugin = array($plugin); +} + +foreach ($plugin as $p) { + // Disable + if (enable_plugin($p)) { + system_message(sprintf(elgg_echo('admin:plugins:enable:yes'), $p)); + } else { + register_error(sprintf(elgg_echo('admin:plugins:enable:no'), $p)); } - - elgg_view_regenerate_simplecache(); - elgg_filepath_cache_reset(); - - forward($_SERVER['HTTP_REFERER']); - exit; -?>
\ No newline at end of file +} + +elgg_view_regenerate_simplecache(); +elgg_filepath_cache_reset(); + +forward($_SERVER['HTTP_REFERER']); +exit;
\ No newline at end of file diff --git a/actions/admin/plugins/enableall.php b/actions/admin/plugins/enableall.php index 596955884..92a44b7a7 100644 --- a/actions/admin/plugins/enableall.php +++ b/actions/admin/plugins/enableall.php @@ -1,37 +1,35 @@ <?php - /** - * Enable plugin action. - * - * @package Elgg - * @subpackage Core - * @author Curverider Ltd - * @link http://elgg.org/ - */ +/** + * Enable plugin action. + * + * @package Elgg + * @subpackage Core + * @author Curverider Ltd + * @link http://elgg.org/ + */ - require_once(dirname(dirname(dirname(dirname(__FILE__)))) . "/engine/start.php"); - - // block non-admin users - admin_gatekeeper(); - - // Validate the action - action_gatekeeper(); - - $plugins = get_installed_plugins(); - - foreach ($plugins as $p => $data) - { - // Enable - if (enable_plugin($p)) - system_message(sprintf(elgg_echo('admin:plugins:enable:yes'), $p)); - else - register_error(sprintf(elgg_echo('admin:plugins:enable:no'), $p)); - } - - // Regen view cache - elgg_view_regenerate_simplecache(); - elgg_filepath_cache_reset(); - - forward($_SERVER['HTTP_REFERER']); - exit; - -?>
\ No newline at end of file +require_once(dirname(dirname(dirname(dirname(__FILE__)))) . "/engine/start.php"); + +// block non-admin users +admin_gatekeeper(); + +// Validate the action +action_gatekeeper(); + +$plugins = get_installed_plugins(); + +foreach ($plugins as $p => $data) { + // Enable + if (enable_plugin($p)) { + system_message(sprintf(elgg_echo('admin:plugins:enable:yes'), $p)); + } else { + register_error(sprintf(elgg_echo('admin:plugins:enable:no'), $p)); + } +} + +// Regen view cache +elgg_view_regenerate_simplecache(); +elgg_filepath_cache_reset(); + +forward($_SERVER['HTTP_REFERER']); +exit;
\ No newline at end of file diff --git a/actions/admin/plugins/reorder.php b/actions/admin/plugins/reorder.php index 36ba1f66d..67cb6f02b 100644 --- a/actions/admin/plugins/reorder.php +++ b/actions/admin/plugins/reorder.php @@ -1,54 +1,51 @@ <?php - /** - * Reorder plugin action. - * - * @package Elgg - * @subpackage Core - - * @author Curverider Ltd - - * @link http://elgg.org/ - */ - - require_once(dirname(dirname(dirname(dirname(__FILE__)))) . "/engine/start.php"); - - // block non-admin users - admin_gatekeeper(); - - // Validate the action - action_gatekeeper(); - - // Get the plugin - $mod = get_input('plugin'); - $mod = str_replace('.','',$mod); - $mod = str_replace('/','',$mod); - - // Get the new order - $order = (int) get_input('order'); - - // Get the current plugin list - $plugins = get_plugin_list(); - - // Inject the plugin order back into the list - if ($key = array_search($mod, $plugins)) { - - unset($plugins[$key]); - while (isset($plugins[$order])) { - $order++; - } - - $plugins[$order] = $mod; +/** + * Reorder plugin action. + * + * @package Elgg + * @subpackage Core + * @author Curverider Ltd + * @link http://elgg.org/ + */ + +require_once(dirname(dirname(dirname(dirname(__FILE__)))) . "/engine/start.php"); + +// block non-admin users +admin_gatekeeper(); + +// Validate the action +action_gatekeeper(); + +// Get the plugin +$mod = get_input('plugin'); +$mod = str_replace('.','',$mod); +$mod = str_replace('/','',$mod); + +// Get the new order +$order = (int) get_input('order'); + +// Get the current plugin list +$plugins = get_plugin_list(); + +// Inject the plugin order back into the list +if ($key = array_search($mod, $plugins)) { + + unset($plugins[$key]); + while (isset($plugins[$order])) { + $order++; } - - // Disable - if (regenerate_plugin_list($plugins)) - system_message(sprintf(elgg_echo('admin:plugins:reorder:yes'), $plugin)); - else - register_error(sprintf(elgg_echo('admin:plugins:reorder:no'), $plugin)); - - elgg_view_regenerate_simplecache(); - elgg_filepath_cache_reset(); - - forward($_SERVER['HTTP_REFERER']); - -?>
\ No newline at end of file + + $plugins[$order] = $mod; +} + +// Disable +if (regenerate_plugin_list($plugins)) { + system_message(sprintf(elgg_echo('admin:plugins:reorder:yes'), $plugin)); +} else { + register_error(sprintf(elgg_echo('admin:plugins:reorder:no'), $plugin)); +} + +elgg_view_regenerate_simplecache(); +elgg_filepath_cache_reset(); + +forward($_SERVER['HTTP_REFERER']); diff --git a/actions/admin/site/update_basic.php b/actions/admin/site/update_basic.php index 31a6b401e..0b567340c 100644 --- a/actions/admin/site/update_basic.php +++ b/actions/admin/site/update_basic.php @@ -1,103 +1,94 @@ <?php +/** + * Elgg update site action + * + * This is an update version of the sitesettings/install action + * which is used by the admin panel to modify basic settings. + * + * @package Elgg + * @subpackage Core + * @author Curverider Ltd + * @link http://elgg.org/ + */ - /** - * Elgg update site action - * - * This is an update version of the sitesettings/install action which is used by the admin panel to modify basic settings. - * - * @package Elgg - * @subpackage Core +global $CONFIG; - * @author Curverider Ltd +// block non-admin users +admin_gatekeeper(); +action_gatekeeper(); - * @link http://elgg.org/ - */ +if (get_input('settings') == 'go') { + if (datalist_get('default_site')) { + $site = get_entity(datalist_get('default_site')); + if (!($site instanceof ElggSite)) { + throw new InstallationException(elgg_echo('InvalidParameterException:NonElggSite')); + } + + $site->description = get_input('sitedescription'); + $site->name = get_input('sitename'); + $site->email = get_input('siteemail'); + $site->url = get_input('wwwroot'); - global $CONFIG; - - // block non-admin users - admin_gatekeeper(); - action_gatekeeper(); - - if (get_input('settings') == 'go') { - - if (datalist_get('default_site')) { - - $site = get_entity(datalist_get('default_site')); - if (!($site instanceof ElggSite)) - throw new InstallationException(elgg_echo('InvalidParameterException:NonElggSite')); - - $site->description = get_input('sitedescription'); - $site->name = get_input('sitename'); - $site->email = get_input('siteemail'); - $site->url = get_input('wwwroot'); - - datalist_set('path',sanitise_filepath(get_input('path'))); - datalist_set('dataroot',sanitise_filepath(get_input('dataroot'))); - if (get_input('simplecache_enabled')) { - elgg_view_enable_simplecache(); - } else { - elgg_view_disable_simplecache(); - } - if (get_input('viewpath_cache_enabled')) { - elgg_enable_filepath_cache(); - } else { - elgg_disable_filepath_cache(); - } - - set_config('language', get_input('language'), $site->getGUID()); - - set_config('default_access', get_input('default_access'), $site->getGUID()); - - if (get_input('allow_user_default_access')) { - set_config('allow_user_default_access', 1, $site->getGUID()); - } else { - set_config('allow_user_default_access', 0, $site->getGUID()); - } - - set_config('view', get_input('view'), $site->getGUID()); - - $debug = get_input('debug'); - if ($debug) - set_config('debug', 1, $site->getGUID()); - else - unset_config('debug', $site->getGUID()); - - $https_login = get_input('https_login'); - if ($https_login) - set_config('https_login', 1, $site->getGUID()); - else - unset_config('https_login', $site->getGUID()); - - $usage = get_input('usage'); - if ($usage) - unset_config('ping_home', $site->getGUID()); - else - set_config('ping_home', 'disabled', $site->getGUID()); - - $api = get_input('api'); - if ($api) - unset_config('disable_api', $site->getGUID()); - else - set_config('disable_api', 'disabled', $site->getGUID()); - - // Now ping home - //if ((!isset($usage)) || ($usage!='disabled')) - //{ - // ping_home($site); - //} - - if ($site->save()) - system_message(elgg_echo("admin:configuration:success")); - else - register_error(elgg_echo("admin:configuration:fail")); - - //header("Location: {$CONFIG->wwwroot}admin/site/"); - forward($_SERVER['HTTP_REFERER']); - exit; - + datalist_set('path',sanitise_filepath(get_input('path'))); + datalist_set('dataroot',sanitise_filepath(get_input('dataroot'))); + if (get_input('simplecache_enabled')) { + elgg_view_enable_simplecache(); + } else { + elgg_view_disable_simplecache(); + } + if (get_input('viewpath_cache_enabled')) { + elgg_enable_filepath_cache(); + } else { + elgg_disable_filepath_cache(); + } + + set_config('language', get_input('language'), $site->getGUID()); + + set_config('default_access', get_input('default_access'), $site->getGUID()); + + if (get_input('allow_user_default_access')) { + set_config('allow_user_default_access', 1, $site->getGUID()); + } else { + set_config('allow_user_default_access', 0, $site->getGUID()); + } + + set_config('view', get_input('view'), $site->getGUID()); + + $debug = get_input('debug'); + if ($debug) { + set_config('debug', 1, $site->getGUID()); + } else { + unset_config('debug', $site->getGUID()); + } + + $https_login = get_input('https_login'); + if ($https_login) { + set_config('https_login', 1, $site->getGUID()); + } else { + unset_config('https_login', $site->getGUID()); + } + + $usage = get_input('usage'); + if ($usage) { + unset_config('ping_home', $site->getGUID()); + } else { + set_config('ping_home', 'disabled', $site->getGUID()); } - - } -?>
\ No newline at end of file + $api = get_input('api'); + if ($api) { + unset_config('disable_api', $site->getGUID()); + } else { + set_config('disable_api', 'disabled', $site->getGUID()); + } + + if ($site->save()) { + system_message(elgg_echo("admin:configuration:success")); + } else { + register_error(elgg_echo("admin:configuration:fail")); + } + + forward($_SERVER['HTTP_REFERER']); + exit; + } +}
\ No newline at end of file diff --git a/actions/admin/user/ban.php b/actions/admin/user/ban.php index 1033ec00a..030f5ae73 100644 --- a/actions/admin/user/ban.php +++ b/actions/admin/user/ban.php @@ -1,37 +1,35 @@ <?php - /** - * Elgg ban user - * - * @package Elgg - * @subpackage Core - * @author Curverider Ltd - * @link http://elgg.org/ - */ +/** + * Elgg ban user + * + * @package Elgg + * @subpackage Core + * @author Curverider Ltd + * @link http://elgg.org/ + */ - require_once(dirname(dirname(dirname(dirname(__FILE__)))) . "/engine/start.php"); - - // 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())) - { - // Now actually disable it - if ($obj->ban('banned')) { - system_message(elgg_echo('admin:user:ban:yes')); - } - else - register_error(elgg_echo('admin:user:ban:no')); +require_once(dirname(dirname(dirname(dirname(__FILE__)))) . "/engine/start.php"); + +// 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())) { + // Now actually disable it + if ($obj->ban('banned')) { + system_message(elgg_echo('admin:user:ban:yes')); } else { - $canedit = $obj->canEdit(); - $isinstance = ($obj instanceof ElggUser); register_error(elgg_echo('admin:user:ban:no')); } - - forward('pg/admin/user/'); - exit; -?>
\ No newline at end of file +} else { + $canedit = $obj->canEdit(); + $isinstance = ($obj instanceof ElggUser); + register_error(elgg_echo('admin:user:ban:no')); +} + +forward('pg/admin/user/'); +exit;
\ No newline at end of file diff --git a/actions/admin/user/delete.php b/actions/admin/user/delete.php index b14b17278..7d9249424 100644 --- a/actions/admin/user/delete.php +++ b/actions/admin/user/delete.php @@ -1,33 +1,32 @@ <?php - /** - * Elgg delete user - * - * @package Elgg - * @subpackage Core - * @author Curverider Ltd - * @link http://elgg.org/ - */ +/** + * Elgg delete user + * + * @package Elgg + * @subpackage Core + * @author Curverider Ltd + * @link http://elgg.org/ + */ - require_once(dirname(dirname(dirname(dirname(__FILE__)))) . "/engine/start.php"); +require_once(dirname(dirname(dirname(dirname(__FILE__)))) . "/engine/start.php"); - // 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())) - { - if ($obj->delete()) - system_message(elgg_echo('admin:user:delete:yes')); - else - register_error(elgg_echo('admin:user:delete:no')); - } - else +// 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())) { + if ($obj->delete()) { + system_message(elgg_echo('admin:user:delete:yes')); + } else { register_error(elgg_echo('admin:user:delete:no')); - - forward($_SERVER['HTTP_REFERER']); - exit; -?>
\ No newline at end of file + } +} else { + register_error(elgg_echo('admin:user:delete:no')); +} + +forward($_SERVER['HTTP_REFERER']); +exit;
\ No newline at end of file diff --git a/actions/admin/user/makeadmin.php b/actions/admin/user/makeadmin.php index fbf4293c5..b3e5ae8fc 100644 --- a/actions/admin/user/makeadmin.php +++ b/actions/admin/user/makeadmin.php @@ -1,35 +1,33 @@ <?php - /** - * Make another user an admin. - * - * @package Elgg - * @subpackage Core - * @author Curverider Ltd - * @link http://elgg.org/ - */ +/** + * Make another user an admin. + * + * @package Elgg + * @subpackage Core + * @author Curverider Ltd + * @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 = 'yes'; - if ($obj->admin) - system_message(elgg_echo('admin:user:makeadmin:yes')); - else - register_error(elgg_echo('admin:user:makeadmin:no')); - } - else +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 = 'yes'; + if ($obj->admin) { + system_message(elgg_echo('admin:user:makeadmin:yes')); + } else { register_error(elgg_echo('admin:user:makeadmin:no')); - - forward($_SERVER['HTTP_REFERER']); + } +} else { + register_error(elgg_echo('admin:user:makeadmin:no')); +} -?>
\ No newline at end of file +forward($_SERVER['HTTP_REFERER']);
\ No newline at end of file diff --git a/actions/admin/user/removeadmin.php b/actions/admin/user/removeadmin.php index 851a0aafd..2e1bbe180 100644 --- a/actions/admin/user/removeadmin.php +++ b/actions/admin/user/removeadmin.php @@ -1,35 +1,33 @@ <?php - /** - * Make another user an admin. - * - * @package Elgg - * @subpackage Core - * @author Curverider Ltd - * @link http://elgg.org/ - */ +/** + * Make another user an admin. + * + * @package Elgg + * @subpackage Core + * @author Curverider Ltd + * @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 +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')); - - forward($_SERVER['HTTP_REFERER']); + } +} else { + register_error(elgg_echo('admin:user:removeadmin:no')); +} -?>
\ No newline at end of file +forward($_SERVER['HTTP_REFERER']);
\ No newline at end of file diff --git a/actions/admin/user/resetpassword.php b/actions/admin/user/resetpassword.php index c2d3af160..50bdcb1ac 100644 --- a/actions/admin/user/resetpassword.php +++ b/actions/admin/user/resetpassword.php @@ -1,42 +1,45 @@ <?php - /** - * Admin password reset. - * - * @package Elgg - * @subpackage Core - * @author Curverider Ltd - * @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())) - { - $password = generate_random_cleartext_password(); - - $obj->salt = generate_random_cleartext_password(); // Reset the salt - $obj->password = generate_user_password($obj, $password); - - if ($obj->save()) - { - system_message(elgg_echo('admin:user:resetpassword:yes')); - - notify_user($obj->guid, $CONFIG->site->guid, elgg_echo('email:resetpassword:subject'), sprintf(elgg_echo('email:resetpassword:body'), $obj->username, $password), NULL, 'email'); - } else - register_error(elgg_echo('admin:user:resetpassword:no')); - } - else +/** + * Admin password reset. + * + * @package Elgg + * @subpackage Core + * @author Curverider Ltd + * @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())) { + $password = generate_random_cleartext_password(); + + $obj->salt = generate_random_cleartext_password(); // Reset the salt + $obj->password = generate_user_password($obj, $password); + + if ($obj->save()) { + system_message(elgg_echo('admin:user:resetpassword:yes')); + + notify_user($obj->guid, + $CONFIG->site->guid, + elgg_echo('email:resetpassword:subject'), + sprintf(elgg_echo('email:resetpassword:body'), $obj->username, $password), + NULL, + 'email'); + } else { register_error(elgg_echo('admin:user:resetpassword:no')); - - forward($_SERVER['HTTP_REFERER']); - exit; -?>
\ No newline at end of file + } +} else { + register_error(elgg_echo('admin:user:resetpassword:no')); +} + +forward($_SERVER['HTTP_REFERER']); +exit;
\ No newline at end of file diff --git a/actions/admin/user/unban.php b/actions/admin/user/unban.php index 64ba3516c..f78d291c5 100644 --- a/actions/admin/user/unban.php +++ b/actions/admin/user/unban.php @@ -1,39 +1,38 @@ <?php - /** - * Elgg ban user - * - * @package Elgg - * @subpackage Core - * @author Curverider Ltd - * @link http://elgg.org/ - */ +/** + * Elgg ban user + * + * @package Elgg + * @subpackage Core + * @author Curverider Ltd + * @link http://elgg.org/ + */ - require_once(dirname(dirname(dirname(dirname(__FILE__)))) . "/engine/start.php"); - - // block non-admin users - admin_gatekeeper(); - action_gatekeeper(); - - $access_status = access_get_show_hidden_status(); - access_show_hidden_entities(true); - - // Get the user - $guid = get_input('guid'); - $obj = get_entity($guid); - - if ( ($obj instanceof ElggUser) && ($obj->canEdit())) - { - // Now actually disable it - if ($obj->unban()) - system_message(elgg_echo('admin:user:unban:yes')); - else - register_error(elgg_echo('admin:user:unban:no')); - } - else +require_once(dirname(dirname(dirname(dirname(__FILE__)))) . "/engine/start.php"); + +// block non-admin users +admin_gatekeeper(); +action_gatekeeper(); + +$access_status = access_get_show_hidden_status(); +access_show_hidden_entities(true); + +// Get the user +$guid = get_input('guid'); +$obj = get_entity($guid); + +if (($obj instanceof ElggUser) && ($obj->canEdit())) { + // Now actually disable it + if ($obj->unban()) { + system_message(elgg_echo('admin:user:unban:yes')); + } else { register_error(elgg_echo('admin:user:unban:no')); - - access_show_hidden_entities($access_status); - - forward($_SERVER['HTTP_REFERER']); - exit; -?>
\ No newline at end of file + } +} else { + register_error(elgg_echo('admin:user:unban:no')); +} + +access_show_hidden_entities($access_status); + +forward($_SERVER['HTTP_REFERER']); +exit;
\ No newline at end of file |