From 330d026be73efb6e6630094c34607a0feb6dd3ff Mon Sep 17 00:00:00 2001 From: Frank Karlitschek Date: Wed, 30 Oct 2013 19:36:29 +0100 Subject: fix the privatedata key value store --- lib/private/ocs.php | 32 -------------------- lib/private/ocs/privatedata.php | 66 ++++++++++++++++++++++++++++++++++------- 2 files changed, 55 insertions(+), 43 deletions(-) (limited to 'lib/private') diff --git a/lib/private/ocs.php b/lib/private/ocs.php index 93e8931ce2e..e067196cf11 100644 --- a/lib/private/ocs.php +++ b/lib/private/ocs.php @@ -228,36 +228,4 @@ class OC_OCS { } } } - - /** - * get private data - * @param string $user - * @param string $app - * @param string $key - * @param bool $like use LIKE instead of = when comparing keys - * @return array - */ - public static function getData($user, $app="", $key="") { - if($app) { - $apps=array($app); - }else{ - $apps=OC_Preferences::getApps($user); - } - if($key) { - $keys=array($key); - }else{ - foreach($apps as $app) { - $keys=OC_Preferences::getKeys($user, $app); - } - } - $result=array(); - foreach($apps as $app) { - foreach($keys as $key) { - $value=OC_Preferences::getValue($user, $app, $key); - $result[]=array('app'=>$app, 'key'=>$key, 'value'=>$value); - } - } - return $result; - } - } diff --git a/lib/private/ocs/privatedata.php b/lib/private/ocs/privatedata.php index 4dfd0a6e66e..b489cd0fbb3 100644 --- a/lib/private/ocs/privatedata.php +++ b/lib/private/ocs/privatedata.php @@ -22,35 +22,75 @@ * */ + class OC_OCS_Privatedata { + /** + * read keys + * test: curl http://login:passwd@oc/core/ocs/v1.php/privatedata/getattribute/testy/123 + * test: curl http://login:passwd@oc/core/ocs/v1.php/privatedata/getattribute/testy + * @param array $parameters The OCS parameter + */ public static function get($parameters) { OC_Util::checkLoggedIn(); $user = OC_User::getUser(); $app = addslashes(strip_tags($parameters['app'])); $key = addslashes(strip_tags($parameters['key'])); - $result = OC_OCS::getData($user, $app, $key); + + if(empty($key)) { + $query = \OCP\DB::prepare('SELECT `key`, `app`, `value` FROM `*PREFIX*privatedata` WHERE `user` = ? AND `app` = ? '); + $result = $query->execute(array($user, $app)); + } else { + $query = \OCP\DB::prepare('SELECT `key`, `app`, `value` FROM `*PREFIX*privatedata` WHERE `user` = ? AND `app` = ? AND `key` = ? '); + $result = $query->execute(array($user, $app, $key)); + } + $xml = array(); - foreach($result as $i=>$log) { - $xml[$i]['key']=$log['key']; - $xml[$i]['app']=$log['app']; - $xml[$i]['value']=$log['value']; + while ($row = $result->fetchRow()) { + $data=array(); + $data['key']=$row['key']; + $data['app']=$row['app']; + $data['value']=$row['value']; + $xml[] = $data; } + return new OC_OCS_Result($xml); - //TODO: replace 'privatedata' with 'attribute' once a new libattice has been released that works with it } + /** + * set a key + * test: curl http://login:passwd@oc/core/ocs/v1.php/privatedata/setattribute/testy/123 --data "value=foobar" + * @param array $parameters The OCS parameter + */ public static function set($parameters) { OC_Util::checkLoggedIn(); $user = OC_User::getUser(); $app = addslashes(strip_tags($parameters['app'])); $key = addslashes(strip_tags($parameters['key'])); $value = OC_OCS::readData('post', 'value', 'text'); - if(OC_Preferences::setValue($user, $app, $key, $value)) { - return new OC_OCS_Result(null, 100); + + // check if key is already set + $query = \OCP\DB::prepare('SELECT `value` FROM `*PREFIX*privatedata` WHERE `user` = ? AND `app` = ? AND `key` = ? '); + $result = $query->execute(array($user, $app, $key)); + + if ($result->numRows()==0) { + // store in DB + $query = \OCP\DB::prepare('INSERT INTO `*PREFIX*privatedata` (`user`, `app`, `key`, `value`)' . ' VALUES(?, ?, ?, ?)'); + $query->execute(array($user, $app, $key, $value)); + } else { + // update in DB + $query = \OCP\DB::prepare('UPDATE `*PREFIX*privatedata` SET `value` = ? WHERE `user` = ? AND `app` = ? AND `key` = ? '); + $query->execute(array($value, $user, $app, $key )); } + + return new OC_OCS_Result(null, 100); } + /** + * delete a key + * test: curl http://login:passwd@oc/core/ocs/v1.php/privatedata/deleteattribute/testy/123 --data "post=1" + * @param array $parameters The OCS parameter + */ public static function delete($parameters) { OC_Util::checkLoggedIn(); $user = OC_User::getUser(); @@ -59,8 +99,12 @@ class OC_OCS_Privatedata { if($key==="" or $app==="") { return new OC_OCS_Result(null, 101); //key and app are NOT optional here } - if(OC_Preferences::deleteKey($user, $app, $key)) { - return new OC_OCS_Result(null, 100); - } + + // delete in DB + $query = \OCP\DB::prepare('DELETE FROM `*PREFIX*privatedata` WHERE `user` = ? AND `app` = ? AND `key` = ? '); + $query->execute(array($user, $app, $key )); + + return new OC_OCS_Result(null, 100); } } + -- cgit v1.2.3 From b2929de0a73a131735e051bf620f23b9bd055d2e Mon Sep 17 00:00:00 2001 From: Thomas Müller Date: Thu, 31 Oct 2013 09:58:18 +0100 Subject: no need to check if the user is logged in - this is already done in the ocs dispatcher itself adding @return --- lib/private/ocs/privatedata.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'lib/private') diff --git a/lib/private/ocs/privatedata.php b/lib/private/ocs/privatedata.php index b489cd0fbb3..e528dfbcb74 100644 --- a/lib/private/ocs/privatedata.php +++ b/lib/private/ocs/privatedata.php @@ -26,13 +26,13 @@ class OC_OCS_Privatedata { /** - * read keys - * test: curl http://login:passwd@oc/core/ocs/v1.php/privatedata/getattribute/testy/123 - * test: curl http://login:passwd@oc/core/ocs/v1.php/privatedata/getattribute/testy - * @param array $parameters The OCS parameter - */ + * read keys + * test: curl http://login:passwd@oc/core/ocs/v1.php/privatedata/getattribute/testy/123 + * test: curl http://login:passwd@oc/core/ocs/v1.php/privatedata/getattribute/testy + * @param array $parameters The OCS parameter + * @return \OC_OCS_Result + */ public static function get($parameters) { - OC_Util::checkLoggedIn(); $user = OC_User::getUser(); $app = addslashes(strip_tags($parameters['app'])); $key = addslashes(strip_tags($parameters['key'])); -- cgit v1.2.3 From 47da2ef8db27d7fd52b615e3f1e4e67d969aad06 Mon Sep 17 00:00:00 2001 From: Thomas Müller Date: Thu, 31 Oct 2013 10:02:18 +0100 Subject: fixing php notice: Undefined index key --- lib/private/ocs/privatedata.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/private') diff --git a/lib/private/ocs/privatedata.php b/lib/private/ocs/privatedata.php index e528dfbcb74..4b16268b8f4 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 = addslashes(strip_tags($parameters['key'])); + $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` = ? '); -- cgit v1.2.3 From 0cec17ba8700b0892927300b19abf3a4b5d8deaf Mon Sep 17 00:00:00 2001 From: Thomas Müller Date: Thu, 31 Oct 2013 10:14:06 +0100 Subject: no need to check if the user is logged in --- lib/private/ocs/privatedata.php | 1 - 1 file changed, 1 deletion(-) (limited to 'lib/private') diff --git a/lib/private/ocs/privatedata.php b/lib/private/ocs/privatedata.php index 4b16268b8f4..0ef38f87b58 100644 --- a/lib/private/ocs/privatedata.php +++ b/lib/private/ocs/privatedata.php @@ -63,7 +63,6 @@ class OC_OCS_Privatedata { * @param array $parameters The OCS parameter */ public static function set($parameters) { - OC_Util::checkLoggedIn(); $user = OC_User::getUser(); $app = addslashes(strip_tags($parameters['app'])); $key = addslashes(strip_tags($parameters['key'])); -- cgit v1.2.3 From 64d0b0d18489e3cbacdfd826c84bdf16f8164268 Mon Sep 17 00:00:00 2001 From: Thomas Müller Date: Thu, 31 Oct 2013 10:21:17 +0100 Subject: PHPDoc comment updated - checkLoggedIn() removed --- lib/private/ocs/privatedata.php | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'lib/private') diff --git a/lib/private/ocs/privatedata.php b/lib/private/ocs/privatedata.php index 0ef38f87b58..f2c6ec7fecd 100644 --- a/lib/private/ocs/privatedata.php +++ b/lib/private/ocs/privatedata.php @@ -58,10 +58,11 @@ class OC_OCS_Privatedata { } /** - * set a key - * test: curl http://login:passwd@oc/core/ocs/v1.php/privatedata/setattribute/testy/123 --data "value=foobar" - * @param array $parameters The OCS parameter - */ + * set a key + * test: curl http://login:passwd@oc/core/ocs/v1.php/privatedata/setattribute/testy/123 --data "value=foobar" + * @param array $parameters The OCS parameter + * @return \OC_OCS_Result + */ public static function set($parameters) { $user = OC_User::getUser(); $app = addslashes(strip_tags($parameters['app'])); @@ -86,12 +87,12 @@ class OC_OCS_Privatedata { } /** - * delete a key - * test: curl http://login:passwd@oc/core/ocs/v1.php/privatedata/deleteattribute/testy/123 --data "post=1" - * @param array $parameters The OCS parameter - */ + * delete a key + * test: curl http://login:passwd@oc/core/ocs/v1.php/privatedata/deleteattribute/testy/123 --data "post=1" + * @param array $parameters The OCS parameter + * @return \OC_OCS_Result + */ public static function delete($parameters) { - OC_Util::checkLoggedIn(); $user = OC_User::getUser(); $app = addslashes(strip_tags($parameters['app'])); $key = addslashes(strip_tags($parameters['key'])); -- cgit v1.2.3 From aae6e769266f516408d1c1c578e64985c2f41fd2 Mon Sep 17 00:00:00 2001 From: Thomas Müller Date: Thu, 31 Oct 2013 10:24:28 +0100 Subject: fixing undefined index in delete() --- lib/private/ocs/privatedata.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'lib/private') 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 )); -- cgit v1.2.3 From d6ddb12c20a646204bee1d5c3d749e1b22783f05 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Thu, 31 Oct 2013 15:44:19 +0100 Subject: Get rid of the SELECT query. Try UPDATE, on failure INSERT. --- lib/private/ocs/privatedata.php | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'lib/private') diff --git a/lib/private/ocs/privatedata.php b/lib/private/ocs/privatedata.php index 2c53d576092..932413711b8 100644 --- a/lib/private/ocs/privatedata.php +++ b/lib/private/ocs/privatedata.php @@ -69,18 +69,14 @@ class OC_OCS_Privatedata { $key = addslashes(strip_tags($parameters['key'])); $value = OC_OCS::readData('post', 'value', 'text'); - // check if key is already set - $query = \OCP\DB::prepare('SELECT `value` FROM `*PREFIX*privatedata` WHERE `user` = ? AND `app` = ? AND `key` = ? '); - $result = $query->execute(array($user, $app, $key)); + // update in DB + $query = \OCP\DB::prepare('UPDATE `*PREFIX*privatedata` SET `value` = ? WHERE `user` = ? AND `app` = ? AND `key` = ?'); + $numRows = $query->execute(array($value, $user, $app, $key)); - if ($result->numRows()==0) { + if ($numRows === false || $numRows === 0) { // store in DB $query = \OCP\DB::prepare('INSERT INTO `*PREFIX*privatedata` (`user`, `app`, `key`, `value`)' . ' VALUES(?, ?, ?, ?)'); $query->execute(array($user, $app, $key, $value)); - } else { - // update in DB - $query = \OCP\DB::prepare('UPDATE `*PREFIX*privatedata` SET `value` = ? WHERE `user` = ? AND `app` = ? AND `key` = ? '); - $query->execute(array($value, $user, $app, $key )); } return new OC_OCS_Result(null, 100); -- cgit v1.2.3