API: OCS methods now use OC_OCS_Result to return data

diff --git a/lib/ocs/cloud.php b/lib/ocs/cloud.php
index 2f2aad714a3052d1fb795778f2254c9db4becf43..720cc0ade39678e7087bbd97fd2f612383ec1647 100644 (file)
--- 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 06103cbeb4f5ef2f6209ff010cbc7ae15567d39f..eb9e470381a9e4481f61b15cb101a4fc5d6eba6c 100644 (file)
--- 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 23b8853533d699cd64324600c9d850a05dec7d19..b5f07d88ae1b30afcaf8f9effedc10d3b1c993c4 100644 (file)
--- 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 1c781dece8ab73f1d73902b773e03f8a067a7cf2..02ca31f2d29f29bd0b359c2e650f3991309d59ed 100644 (file)
--- 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);
                }
        }
 }