Merge remote-tracking branch 'upstream/master' into owncloud

1 files changed, 19 insertions, 2 deletions

diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php
index 0922e43a8..bb82b355e 100644
--- a/classes/pref/prefs.php
+++ b/classes/pref/prefs.php
@@ -683,8 +683,9 @@ class Pref_Prefs extends Handler_Protected {
 		$system_enabled = array_map("trim", explode(",", PLUGINS));
 		$user_enabled = array_map("trim", explode(",", get_pref($this->link, "_ENABLED_PLUGINS")));
 
-		$tmppluginhost = new PluginHost($link);
-		$tmppluginhost->load_all($tmppluginhost::KIND_ALL);
+		$tmppluginhost = new PluginHost($this->link);
+		$tmppluginhost->load_all($tmppluginhost::KIND_ALL, $_SESSION["uid"]);
+		$tmppluginhost->load_data(true);
 
 		foreach ($tmppluginhost->get_plugins() as $name => $plugin) {
 			$about = $plugin->about();
@@ -707,6 +708,11 @@ class Pref_Prefs extends Handler_Protected {
 				print "<td>" . htmlspecialchars(sprintf("%.2f", $about[0])) . "</td>";
 				print "<td>" . htmlspecialchars($about[2]) . "</td>";
 
+				if (count($tmppluginhost->get_all($plugin)) > 0) {
+					print "<td><a href='#' onclick=\"clearPluginData('$name')\"
+						class='visibleLink'>".__("Clear data")."</a></td>";
+				}
+
 				print "</tr>";
 
 			}
@@ -752,6 +758,10 @@ class Pref_Prefs extends Handler_Protected {
 				print "<td>" . htmlspecialchars(sprintf("%.2f", $about[0])) . "</td>";
 				print "<td>" . htmlspecialchars($about[2]) . "</td>";
 
+				if (count($tmppluginhost->get_all($plugin)) > 0) {
+					print "<td><a href='#' onclick=\"clearPluginData('$name')\" class='visibleLink'>".__("Clear data")."</a></td>";
+				}
+
 				print "</tr>";
 
 
@@ -846,5 +856,12 @@ class Pref_Prefs extends Handler_Protected {
 
 		set_pref($this->link, "_ENABLED_PLUGINS", $plugins);
 	}
+
+	function clearplugindata() {
+		$name = db_escape_string($_REQUEST["name"]);
+
+		global $pluginhost;
+		$pluginhost->clear_data($pluginhost->get_plugin($name));
+	}
 }
 ?>