diff options
author | Tom Needham <needham.thomas@gmail.com> | 2012-12-12 21:35:58 +0400 |
---|---|---|
committer | Tom Needham <needham.thomas@gmail.com> | 2012-12-12 21:35:58 +0400 |
commit | 2a4b554ca67ba55c75bbff75777285e550dca84f (patch) | |
tree | 2a5a91f2ccdea2bcfe3c91f287e9b856c9bd284d | |
parent | 140141edf2c5d89f083b4d254c0533e0209d517b (diff) |
API: OCS methods now use OC_OCS_Result to return data
-rw-r--r-- | lib/ocs/cloud.php | 4 | ||||
-rw-r--r-- | lib/ocs/config.php | 2 | ||||
-rw-r--r-- | lib/ocs/person.php | 6 | ||||
-rw-r--r-- | lib/ocs/privatedata.php | 8 |
4 files changed, 10 insertions, 10 deletions
diff --git a/lib/ocs/cloud.php b/lib/ocs/cloud.php index 2f2aad714a3..720cc0ade39 100644 --- a/lib/ocs/cloud.php +++ b/lib/ocs/cloud.php @@ -13,7 +13,7 @@ class OC_OCS_Cloud { $values[] = $newvalue; } } - return $values; + return new OC_OCS_Result($values); } public static function getUserQuota($parameters){ @@ -39,7 +39,7 @@ class OC_OCS_Cloud { $xml['used']=$used; $xml['relative']=$relative; - return $xml; + return new OC_OCS_Result($xml); }else{ return 300; } diff --git a/lib/ocs/config.php b/lib/ocs/config.php index 06103cbeb4f..eb9e470381a 100644 --- a/lib/ocs/config.php +++ b/lib/ocs/config.php @@ -8,6 +8,6 @@ class OC_OCS_Config { $xml['host'] = OCP\Util::getServerHost(); $xml['contact'] = ''; $xml['ssl'] = 'false'; - return $xml; + return new OC_OCS_Result($xml); } } diff --git a/lib/ocs/person.php b/lib/ocs/person.php index 23b8853533d..b5f07d88ae1 100644 --- a/lib/ocs/person.php +++ b/lib/ocs/person.php @@ -8,12 +8,12 @@ class OC_OCS_Person { if($login && $password){ if(OC_User::checkPassword($login,$password)){ $xml['person']['personid'] = $login; - return $xml; + return new OC_OCS_Result($xml); }else{ - return 102; + return new OC_OCS_Result(null, 102); } }else{ - return 101; + return new OC_OCS_Result(null, 101); } } diff --git a/lib/ocs/privatedata.php b/lib/ocs/privatedata.php index 1c781dece8a..02ca31f2d29 100644 --- a/lib/ocs/privatedata.php +++ b/lib/ocs/privatedata.php @@ -14,7 +14,7 @@ class OC_OCS_Privatedata { $xml[$i]['app']=$log['app']; $xml[$i]['value']=$log['value']; } - return $xml; + return new OC_OCS_Result($xml); //TODO: replace 'privatedata' with 'attribute' once a new libattice has been released that works with it } @@ -25,7 +25,7 @@ class OC_OCS_Privatedata { $key = addslashes(strip_tags($parameters['key'])); $value = OC_OCS::readData('post', 'value', 'text'); if(OC_OCS::setData($user,$app,$key,$value)){ - return 100; + return new OC_OCS_Result(null, 100); } } @@ -35,10 +35,10 @@ class OC_OCS_Privatedata { $app = addslashes(strip_tags($parameters['app'])); $key = addslashes(strip_tags($parameters['key'])); if($key=="" or $app==""){ - return; //key and app are NOT optional here + return new OC_OCS_Result(null, 101); //key and app are NOT optional here } if(OC_OCS::deleteData($user,$app,$key)){ - return 100; + return new OC_OCS_Result(null, 100); } } } |