hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-10 03:23:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

update API

Browse Source 
revert bad merge

fix cs
This commit is contained in:
Nicolas Le Goff
2012-07-06 20:10:21 +02:00
parent 9ab4e0c1c4
commit b4ff14f3e4
6 changed files with 123 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/classes/API/OAuth2/Adapter.class.php
View File

@@ -168,19 +168,6 @@ class API_OAuth2_Adapter extends OAuth2
return $this->usr_id;
}
/**
*
* @param string $secret
* @param string $nonce
* @return string
*/
protected static function crypt_secret($secret, $nonce)
{
$registry = registry::get_instance();
return hash_hmac('sha512', $secret . $nonce, $registry->get('GV_sit'));
}
/**
*
* Implements OAuth2::checkClientCredentials().
@@ -198,9 +185,7 @@ class API_OAuth2_Adapter extends OAuth2
return true;
}
$crypted = $this->crypt_secret($client_secret, $application->get_nonce());
return ($result["client_secret"] === $crypted);
return ($application->get_client_secret() === $client_secret);
} catch (Exception $e) {
}

4
lib/classes/API/V1/adapter.class.php
View File

@@ -1063,7 +1063,7 @@ class API_V1_adapter extends API_V1_Abstract
}
$record->set_metadatas($metadatas);
$result->set_datas(array("metadatas" => $this->list_record_caption($record->get_caption())));
$result->set_datas(array("record_metadatas" => $this->list_record_caption($record->get_caption())));
} catch (Exception $e) {
$result->set_error_message(API_V1_result::ERROR_BAD_REQUEST, _('An error occured'));
}
@@ -1817,7 +1817,7 @@ class API_V1_adapter extends API_V1_Abstract
'mime_type' => $record->get_mime(),
'title' => $record->get_title(),
'original_name' => $record->get_original_name(),
'updated-on' => $record->get_modification_date()->format(DATE_ATOM),
'updated_on' => $record->get_modification_date()->format(DATE_ATOM),
'created_on' => $record->get_creation_date()->format(DATE_ATOM),
'collection_id' => phrasea::collFromBas($record->get_base_id()),
'sha256' => $record->get_sha256(),