add the calls for the new keyserver. Still not connectect to the encryption system
This commit is contained in:
parent
20cb0af8ad
commit
d28be8de64
85
lib/ocs.php
85
lib/ocs.php
|
@ -153,6 +153,10 @@ class OC_OCS {
|
||||||
OC_OCS::privatedatadelete($format, $app, $key);
|
OC_OCS::privatedatadelete($format, $app, $key);
|
||||||
|
|
||||||
// CLOUD
|
// CLOUD
|
||||||
|
// systemWebApps
|
||||||
|
}elseif(($method=='get') and ($ex[$paracount-5] == 'v1.php') and ($ex[$paracount-4]=='cloud') and ($ex[$paracount-3] == 'system') and ($ex[$paracount-2] == 'webapps')){
|
||||||
|
OC_OCS::systemwebapps($format);
|
||||||
|
|
||||||
// quotaget
|
// quotaget
|
||||||
}elseif(($method=='get') and ($ex[$paracount-6] == 'v1.php') and ($ex[$paracount-5]=='cloud') and ($ex[$paracount-4] == 'user') and ($ex[$paracount-2] == 'quota')){
|
}elseif(($method=='get') and ($ex[$paracount-6] == 'v1.php') and ($ex[$paracount-5]=='cloud') and ($ex[$paracount-4] == 'user') and ($ex[$paracount-2] == 'quota')){
|
||||||
$user=$ex[$paracount-3];
|
$user=$ex[$paracount-3];
|
||||||
|
@ -164,6 +168,16 @@ class OC_OCS {
|
||||||
$quota = self::readData('post', 'quota', 'int');
|
$quota = self::readData('post', 'quota', 'int');
|
||||||
OC_OCS::quotaset($format,$user,$quota);
|
OC_OCS::quotaset($format,$user,$quota);
|
||||||
|
|
||||||
|
// keygetpublic
|
||||||
|
}elseif(($method=='get') and ($ex[$paracount-6] == 'v1.php') and ($ex[$paracount-5]=='cloud') and ($ex[$paracount-4] == 'user') and ($ex[$paracount-2] == 'publickey')){
|
||||||
|
$user=$ex[$paracount-3];
|
||||||
|
OC_OCS::publicKeyGet($format,$user);
|
||||||
|
|
||||||
|
// keygetprivate
|
||||||
|
}elseif(($method=='get') and ($ex[$paracount-6] == 'v1.php') and ($ex[$paracount-5]=='cloud') and ($ex[$paracount-4] == 'user') and ($ex[$paracount-2] == 'privatekey')){
|
||||||
|
$user=$ex[$paracount-3];
|
||||||
|
OC_OCS::privateKeyGet($format,$user);
|
||||||
|
|
||||||
|
|
||||||
// add more calls here
|
// add more calls here
|
||||||
// please document all the call in the draft spec
|
// please document all the call in the draft spec
|
||||||
|
@ -545,6 +559,29 @@ class OC_OCS {
|
||||||
|
|
||||||
// CLOUD API #############################################
|
// CLOUD API #############################################
|
||||||
|
|
||||||
|
/**
|
||||||
|
* get a list of installed web apps
|
||||||
|
* @param string $format
|
||||||
|
* @return string xml/json
|
||||||
|
*/
|
||||||
|
private static function systemWebApps($format) {
|
||||||
|
$login=OC_OCS::checkpassword();
|
||||||
|
$apps=OC_App::getEnabledApps();
|
||||||
|
$values=array();
|
||||||
|
foreach($apps as $app) {
|
||||||
|
$info=OC_App::getAppInfo($app);
|
||||||
|
if(isset($info['standalone'])) {
|
||||||
|
$newvalue=array('name'=>$info['name'],'url'=>OC_Helper::linkToAbsolute($app,''),'icon'=>'');
|
||||||
|
$values[]=$newvalue;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
$txt=OC_OCS::generatexml($format, 'ok', 100, '', $values, 'cloud', '', 2, 0, 0);
|
||||||
|
echo($txt);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* get the quota of a user
|
* get the quota of a user
|
||||||
* @param string $format
|
* @param string $format
|
||||||
|
@ -573,10 +610,10 @@ class OC_OCS {
|
||||||
$xml['used']=$used;
|
$xml['used']=$used;
|
||||||
$xml['relative']=$relative;
|
$xml['relative']=$relative;
|
||||||
|
|
||||||
$txt=OC_OCS::generatexml($format, 'ok', 100, '', $xml, 'cloud', 'full', 1, count($xml), 0);
|
$txt=OC_OCS::generatexml($format, 'ok', 100, '', $xml, 'cloud', '', 1, 0, 0);
|
||||||
echo($txt);
|
echo($txt);
|
||||||
}else{
|
}else{
|
||||||
echo self::generateXml('', 'fail', 300, 'User does not exist');
|
echo self::generateXml('', 'fail', 300, 'User does not exist');
|
||||||
}
|
}
|
||||||
}else{
|
}else{
|
||||||
echo self::generateXml('', 'fail', 300, 'You don´t have permission to access this ressource.');
|
echo self::generateXml('', 'fail', 300, 'You don´t have permission to access this ressource.');
|
||||||
|
@ -596,16 +633,56 @@ class OC_OCS {
|
||||||
|
|
||||||
// todo
|
// todo
|
||||||
// not yet implemented
|
// not yet implemented
|
||||||
// edit logic here
|
// add logic here
|
||||||
error_log('OCS call: user:'.$user.' quota:'.$quota);
|
error_log('OCS call: user:'.$user.' quota:'.$quota);
|
||||||
|
|
||||||
$xml=array();
|
$xml=array();
|
||||||
$txt=OC_OCS::generatexml($format, 'ok', 100, '', $xml, 'cloud', 'full', 1, count($xml), 0);
|
$txt=OC_OCS::generatexml($format, 'ok', 100, '', $xml, 'cloud', '', 1, 0, 0);
|
||||||
echo($txt);
|
echo($txt);
|
||||||
}else{
|
}else{
|
||||||
echo self::generateXml('', 'fail', 300, 'You don´t have permission to access this ressource.');
|
echo self::generateXml('', 'fail', 300, 'You don´t have permission to access this ressource.');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* get the public key of a user
|
||||||
|
* @param string $format
|
||||||
|
* @param string $user
|
||||||
|
* @return string xml/json
|
||||||
|
*/
|
||||||
|
private static function publicKeyGet($format,$user) {
|
||||||
|
$login=OC_OCS::checkpassword();
|
||||||
|
|
||||||
|
if(OC_User::userExists($user)){
|
||||||
|
// calculate the disc space
|
||||||
|
$txt='this is the public key of '.$user;
|
||||||
|
echo($txt);
|
||||||
|
}else{
|
||||||
|
echo self::generateXml('', 'fail', 300, 'User does not exist');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* get the private key of a user
|
||||||
|
* @param string $format
|
||||||
|
* @param string $user
|
||||||
|
* @return string xml/json
|
||||||
|
*/
|
||||||
|
private static function privateKeyGet($format,$user) {
|
||||||
|
$login=OC_OCS::checkpassword();
|
||||||
|
if(OC_Group::inGroup($login, 'admin') or ($login==$user)) {
|
||||||
|
|
||||||
|
if(OC_User::userExists($user)){
|
||||||
|
// calculate the disc space
|
||||||
|
$txt='this is the private key of '.$user;
|
||||||
|
echo($txt);
|
||||||
|
}else{
|
||||||
|
echo self::generateXml('', 'fail', 300, 'User does not exist');
|
||||||
|
}
|
||||||
|
}else{
|
||||||
|
echo self::generateXml('', 'fail', 300, 'You don´t have permission to access this ressource.');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue