From: Thomas Müller <thomas.mueller@tmit.eu>
Date: Thu, 31 Oct 2013 09:24:28 +0000 (+0100)
Subject: fixing undefined index in delete()
X-Git-Tag: v6.0.0beta3~28^2~2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=aae6e769266f516408d1c1c578e64985c2f41fd2;p=nextcloud-server.git

fixing undefined index in delete()
---

diff --git a/lib/private/ocs/privatedata.php b/lib/private/ocs/privatedata.php
index f2c6ec7fecd..2c53d576092 100644
--- a/lib/private/ocs/privatedata.php
+++ b/lib/private/ocs/privatedata.php
@@ -35,7 +35,7 @@ class OC_OCS_Privatedata {
 	public static function get($parameters) {
 		$user = OC_User::getUser();
 		$app = addslashes(strip_tags($parameters['app']));
-		$key = isset($parameters['key']) ?addslashes(strip_tags($parameters['key'])) : null;
+		$key = isset($parameters['key']) ? addslashes(strip_tags($parameters['key'])) : null;
 		
 		if(empty($key)) {
 			$query = \OCP\DB::prepare('SELECT `key`, `app`, `value`  FROM `*PREFIX*privatedata` WHERE `user` = ? AND `app` = ? ');
@@ -94,12 +94,14 @@ class OC_OCS_Privatedata {
 	 */
 	public static function delete($parameters) {
 		$user = OC_User::getUser();
+		if (!isset($parameters['app']) or !isset($parameters['key'])) {
+			//key and app are NOT optional here
+			return new OC_OCS_Result(null, 101);
+		}
+
 		$app = addslashes(strip_tags($parameters['app']));
 		$key = addslashes(strip_tags($parameters['key']));
-		if($key==="" or $app==="") {
-			return new OC_OCS_Result(null, 101); //key and app are NOT optional here
-		}
-		
+
 		// delete in DB
 		$query = \OCP\DB::prepare('DELETE FROM `*PREFIX*privatedata`  WHERE `user` = ? AND `app` = ? AND `key` = ? ');
 		$query->execute(array($user, $app, $key ));