Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2013-10-31 13:24:28 +0400
committerThomas Müller <thomas.mueller@tmit.eu>2013-10-31 13:24:28 +0400
commitaae6e769266f516408d1c1c578e64985c2f41fd2 (patch)
treeb0eda0516964cfc0cbf76365f796e36c6feec941 /lib
parentbd5663bc3dc5d6901d9051a08d9ec4a8df24cca4 (diff)
fixing undefined index in delete()
Diffstat (limited to 'lib')
-rw-r--r--lib/private/ocs/privatedata.php12
1 files changed, 7 insertions, 5 deletions
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 ));