aboutsummaryrefslogtreecommitdiff
path: root/actions
diff options
context:
space:
mode:
Diffstat (limited to 'actions')
-rw-r--r--actions/admin/plugins/activate.php7
-rw-r--r--actions/admin/plugins/activate_all.php20
-rw-r--r--actions/admin/plugins/deactivate.php7
-rw-r--r--actions/admin/plugins/deactivate_all.php20
-rw-r--r--actions/avatar/crop.php3
-rw-r--r--actions/avatar/upload.php4
-rw-r--r--actions/logout.php1
7 files changed, 44 insertions, 18 deletions
diff --git a/actions/admin/plugins/activate.php b/actions/admin/plugins/activate.php
index e04ee6298..feb986b27 100644
--- a/actions/admin/plugins/activate.php
+++ b/actions/admin/plugins/activate.php
@@ -39,7 +39,12 @@ elgg_invalidate_simplecache();
elgg_filepath_cache_reset();
if (count($activated_guids) === 1) {
- forward("admin/plugins/advanced#elgg-plugin-" . $plugin_guids[0]);
+ $url = 'admin/plugins';
+ $query = (string)parse_url($_SERVER['HTTP_REFERER'], PHP_URL_QUERY);
+ if ($query) {
+ $url .= "?$query";
+ }
+ forward($url . '#elgg-plugin-' . $plugin_guids[0]);
} else {
forward(REFERER);
} \ No newline at end of file
diff --git a/actions/admin/plugins/activate_all.php b/actions/admin/plugins/activate_all.php
index 0f0352877..19eb82142 100644
--- a/actions/admin/plugins/activate_all.php
+++ b/actions/admin/plugins/activate_all.php
@@ -1,21 +1,25 @@
<?php
/**
- * Activates all installed and inactive plugins.
+ * Activates all specified installed and inactive plugins.
*
- * All plugins in the mod/ directory are that aren't active are activated and the views
+ * All specified plugins in the mod/ directory are that aren't active are activated and the views
* cache and simplecache are invalidated.
*
* @package Elgg.Core
* @subpackage Administration.Plugins
*/
-$plugins = elgg_get_plugins('inactive');
+$guids = get_input('guids');
+$guids = explode(',', $guids);
-foreach ($plugins as $plugin) {
- if ($plugin->activate()) {
- //system_message(elgg_echo('admin:plugins:activate:yes', array($plugin->getManifest()->getName())));
- } else {
- register_error(elgg_echo('admin:plugins:activate:no', array($plugin->getManifest()->getName())));
+foreach ($guids as $guid) {
+ $plugin = get_entity($guid);
+ if (!$plugin->isActive()) {
+ if ($plugin->activate()) {
+ //system_message(elgg_echo('admin:plugins:activate:yes', array($plugin->getManifest()->getName())));
+ } else {
+ register_error(elgg_echo('admin:plugins:activate:no', array($plugin->getManifest()->getName())));
+ }
}
}
diff --git a/actions/admin/plugins/deactivate.php b/actions/admin/plugins/deactivate.php
index 9ec620e13..6c9a55c15 100644
--- a/actions/admin/plugins/deactivate.php
+++ b/actions/admin/plugins/deactivate.php
@@ -38,7 +38,12 @@ elgg_invalidate_simplecache();
elgg_filepath_cache_reset();
if (count($plugin_guids) == 1) {
- forward("admin/plugins/advanced#elgg-plugin-" . $plugin_guids[0]);
+ $url = 'admin/plugins';
+ $query = (string)parse_url($_SERVER['HTTP_REFERER'], PHP_URL_QUERY);
+ if ($query) {
+ $url .= "?$query";
+ }
+ forward($url . '#elgg-plugin-' . $plugin_guids[0]);
} else {
forward(REFERER);
}
diff --git a/actions/admin/plugins/deactivate_all.php b/actions/admin/plugins/deactivate_all.php
index 446cad8c0..436a3ad30 100644
--- a/actions/admin/plugins/deactivate_all.php
+++ b/actions/admin/plugins/deactivate_all.php
@@ -1,21 +1,25 @@
<?php
/**
- * Disable all installed plugins.
+ * Disable all specified installed plugins.
*
- * All plugins in the mod/ directory are disabled and the views cache and simplecache
+ * Specified plugins in the mod/ directory are disabled and the views cache and simplecache
* are reset.
*
* @package Elgg.Core
* @subpackage Administration.Plugins
*/
-$plugins = elgg_get_plugins('active');
+$guids = get_input('guids');
+$guids = explode(',', $guids);
-foreach ($plugins as $plugin) {
- if ($plugin->deactivate()) {
- //system_message(elgg_echo('admin:plugins:deactivate:yes', array($plugin->getManifest()->getName())));
- } else {
- register_error(elgg_echo('admin:plugins:deactivate:no', array($plugin->getManifest()->getName())));
+foreach ($guids as $guid) {
+ $plugin = get_entity($guid);
+ if ($plugin->isActive()) {
+ if ($plugin->deactivate()) {
+ //system_message(elgg_echo('admin:plugins:activate:yes', array($plugin->getManifest()->getName())));
+ } else {
+ register_error(elgg_echo('admin:plugins:deactivate:no', array($plugin->getManifest()->getName())));
+ }
}
}
diff --git a/actions/avatar/crop.php b/actions/avatar/crop.php
index ed5faecfa..9c57530ae 100644
--- a/actions/avatar/crop.php
+++ b/actions/avatar/crop.php
@@ -65,5 +65,8 @@ $owner->y1 = $y1;
$owner->y2 = $y2;
system_message(elgg_echo('avatar:crop:success'));
+$view = 'river/user/default/profileiconupdate';
+elgg_delete_river(array('subject_guid' => $owner->guid, 'view' => $view));
+add_to_river($view, 'update', $owner->guid, $owner->guid);
forward(REFERER);
diff --git a/actions/avatar/upload.php b/actions/avatar/upload.php
index 052212e97..e21aa49c8 100644
--- a/actions/avatar/upload.php
+++ b/actions/avatar/upload.php
@@ -50,6 +50,10 @@ foreach ($icon_sizes as $name => $size_info) {
$owner->icontime = time();
if (elgg_trigger_event('profileiconupdate', $owner->type, $owner)) {
system_message(elgg_echo("avatar:upload:success"));
+
+ $view = 'river/user/default/profileiconupdate';
+ elgg_delete_river(array('subject_guid' => $owner->guid, 'view' => $view));
+ add_to_river($view, 'update', $owner->guid, $owner->guid);
}
forward(REFERER);
diff --git a/actions/logout.php b/actions/logout.php
index 98926d205..c48a26b15 100644
--- a/actions/logout.php
+++ b/actions/logout.php
@@ -12,6 +12,7 @@ $result = logout();
// Set the system_message as appropriate
if ($result) {
system_message(elgg_echo('logoutok'));
+ forward();
} else {
register_error(elgg_echo('logouterror'));
} \ No newline at end of file