6 files changed, 29 insertions, 8 deletions
diff --git a/actions/admin/plugins/activate.php b/actions/admin/plugins/activate.php
index 286cf5a4f..5234a4ca5 100644
--- a/actions/admin/plugins/activate.php
+++ b/actions/admin/plugins/activate.php
@@ -47,7 +47,8 @@ if (count($activated_guids) === 1) {
 		$url .= "?$query";
 	}
 	$plugin = get_entity($plugin_guids[0]);
-	forward("$url#{$plugin->getID()}");
+	$id = $css_id = preg_replace('/[^a-z0-9-]/i', '-', $plugin->getID());
+	forward("$url#$id");
 } else {
 	// forward to top of page with a failure so remove any #foo
 	$url = $_SERVER['HTTP_REFERER'];
diff --git a/actions/admin/plugins/deactivate.php b/actions/admin/plugins/deactivate.php
index e7ce65625..354f4717d 100644
--- a/actions/admin/plugins/deactivate.php
+++ b/actions/admin/plugins/deactivate.php
@@ -46,7 +46,8 @@ if (count($plugin_guids) == 1) {
 		$url .= "?$query";
 	}
 	$plugin = get_entity($plugin_guids[0]);
-	forward("$url#{$plugin->getID()}");
+	$id = preg_replace('/[^a-z0-9-]/i', '-', $plugin->getID());
+	forward("$url#$id");
 } else {
 	forward(REFERER);
 }
diff --git a/actions/admin/site/regenerate_secret.php b/actions/admin/site/regenerate_secret.php
new file mode 100644
index 000000000..3112fb5f3
--- /dev/null
+++ b/actions/admin/site/regenerate_secret.php
@@ -0,0 +1,11 @@
+<?php
+/**
+ * Generate a new site secret
+ */
+
+init_site_secret();
+elgg_reset_system_cache();
+
+system_message(elgg_echo('admin:site:secret_regenerated'));
+
+forward(REFERER);
diff --git a/actions/admin/site/unlock_upgrade.php b/actions/admin/site/unlock_upgrade.php
new file mode 100644
index 000000000..b625b1d26
--- /dev/null
+++ b/actions/admin/site/unlock_upgrade.php
@@ -0,0 +1,10 @@
+<?php
+/**
+ * Unlocks the upgrade script 
+ */
+
+if (_elgg_upgrade_is_locked()) {
+	_elgg_upgrade_unlock();
+}
+system_message(elgg_echo('upgrade:unlock:success'));
+forward(REFERER);
diff --git a/actions/admin/site/update_advanced.php b/actions/admin/site/update_advanced.php
index 897a2f983..4888b0a8d 100644
--- a/actions/admin/site/update_advanced.php
+++ b/actions/admin/site/update_advanced.php
@@ -14,10 +14,10 @@ if ($site = elgg_get_site_entity()) {
 		throw new InstallationException(elgg_echo('InvalidParameterException:NonElggSite'));
 	}
 
-	$site->url = get_input('wwwroot');
+	$site->url = rtrim(get_input('wwwroot', '', false), '/') . '/';
 
-	datalist_set('path', sanitise_filepath(get_input('path')));
-	$dataroot = sanitise_filepath(get_input('dataroot'));
+	datalist_set('path', sanitise_filepath(get_input('path', '', false)));
+	$dataroot = sanitise_filepath(get_input('dataroot', '', false));
 
 	// check for relative paths
 	if (stripos(PHP_OS, 'win') === 0) {
@@ -53,8 +53,6 @@ if ($site = elgg_get_site_entity()) {
 	$user_default_access = (get_input('allow_user_default_access')) ? 1 : 0;
 	set_config('allow_user_default_access', $user_default_access, $site->getGUID());
 
-	set_config('view', get_input('view'), $site->getGUID());
-
 	$debug = get_input('debug');
 	if ($debug) {
 		set_config('debug', $debug, $site->getGUID());
diff --git a/actions/admin/site/update_basic.php b/actions/admin/site/update_basic.php
index 97d258b65..9765182cc 100644
--- a/actions/admin/site/update_basic.php
+++ b/actions/admin/site/update_basic.php
@@ -16,7 +16,7 @@ if ($site = elgg_get_site_entity()) {
 	}
 
 	$site->description = get_input('sitedescription');
-	$site->name = get_input('sitename');
+	$site->name = strip_tags(get_input('sitename'));
 	$site->email = get_input('siteemail');
 	$site->save();