Subversion Repositories Applications.bazar

Compare Revisions

No changes between revisions

Regard whitespace Rev 481 → Rev 480

/trunk/jrest/jrest.ini.defaut.php
File deleted
\ No newline at end of file
/trunk/jrest/JRest.php
44,13 → 44,7
} else {
$len = -(strlen($_SERVER['QUERY_STRING']) + 1);
}
$urlString = '';
if (substr_count($_SERVER['REQUEST_URI'], $this->config['settings']['baseURL']) > 0) {
$urlString = substr($_SERVER['REQUEST_URI'], strlen($this->config['settings']['baseURL']), $len);
} else if (substr_count($_SERVER['REQUEST_URI'], $this->config['settings']['baseAlternativeURL']) > 0) {
$urlString = substr($_SERVER['REQUEST_URI'], strlen($this->config['settings']['baseAlternativeURL']), $len);
}
 
$urlParts = explode('/', $urlString);
 
132,7 → 126,7
 
// Ne pas effacer cette ligne ! Elle est indispensable pour les services du Carnet en ligne
// qui n'utilisent que le tableau pairs dans les posts
$pairs = array_merge($_POST, $pairs);
$pairs = array_merge($pairs, $_POST);
}
 
// gestion du contenu du post
140,7 → 134,7
{
// Safari ne sait pas envoyer des DELETE avec gwt...
// Nous utilisons le parametre "action" passé dans le POST qui doit contenir DELETE pour lancer la supression
if (isset($pairs['action']) && $pairs['action'] == 'DELETE') {
if ($pairs['action'] == 'DELETE') {
$this->delete();
return;
}
154,14 → 148,9
if (class_exists($resource_class)) {
$service = new $resource_class($this->config);
if (method_exists($service,'updateElement')) { // Update element
$ret_value = false;
try {
// TODO : a voir le retour ...
$ret_value = $service->updateElement($this->uid, $pairs);
if($ret_value) $this->created();
else $this->badRequest();
} catch (Exception $e) {
$this->badRequest($e);
if ($service->updateElement($this->uid, $pairs)) {
$this->created();
}
}
}
211,13 → 200,8
if (class_exists($resource_class)) {
$service = new $resource_class($this->config);
if (method_exists($service,'createElement')) { // Create a new element
$ret_value = false;
try {
$ret_value = $service->createElement($pairs);
if($ret_value) $this->created();
else $this->badRequest();
} catch (Exception $e) {
$this->badRequest($e);
if ($service->createElement($pairs)) {
$this->created();
}
}
}
264,9 → 248,8
/**
* Send a HTTP 400 response header.
*/
private function badRequest(Exception $e = NULL) {
private function badRequest() {
header('HTTP/1.0 400 Bad Request');
if($e) echo $e->getMessage();
}
 
/**
/trunk/.
Property changes:
Modified: svn:mergeinfo
Reverse-merged /branches/v3.1-blanche-neige:r480