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

Merge

Browse Source
This commit is contained in:
Romain Neutron
2012-01-31 23:04:28 +01:00
parent 2fbbe3fbbe d5137d991e
commit 0f28f12fe7
9 changed files with 32 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Alchemy/Phrasea/Application/OAuth2.php
View File

@@ -271,7 +271,7 @@ return call_user_func(function()
$route = "/applications/dev/new"; $route = "/applications/dev/new";
$app->get($route, function() use ($app) $app->get($route, function() use ($app)
{ {
$var = array("violations" => null); $var = array("violations" => null, 'form' => null);
return $app['response']('api/auth/application_dev_new.twig', $var); return $app['response']('api/auth/application_dev_new.twig', $var);
}); });

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

@@ -406,11 +406,22 @@ class API_OAuth2_Adapter extends OAuth2
'response_type' => $request->get('response_type', false) 'response_type' => $request->get('response_type', false)
, 'client_id' => $request->get('client_id', false) , 'client_id' => $request->get('client_id', false)
, 'redirect_uri' => $request->get('redirect_uri', false) , 'redirect_uri' => $request->get('redirect_uri', false)
, 'scope' => $request->get('scope', false)
, 'state' => $request->get('state', false)
); );
$scope = $request->get('scope', false);
$state = $request->get('state', false);
if($state)
{
$datas["state"] = $state;
}
if($scope)
{
$datas["scope"] = $scope;
}
$filters = array( $filters = array(
"client_id" => array( "client_id" => array(
"filter" => FILTER_VALIDATE_REGEXP "filter" => FILTER_VALIDATE_REGEXP

1
lib/classes/connection.class.php
View File

@@ -192,7 +192,6 @@ class connection
self::$_PDO_instance[$name] = null; self::$_PDO_instance[$name] = null;
unset(self::$_PDO_instance[$name]); unset(self::$_PDO_instance[$name]);
} }
return; return;
} }

2
templates/web/api/auth/application_dev_show.twig
View File

@@ -6,7 +6,7 @@
<li> <li>
<div> <div>
<span class='app-row'><strong><a class="link" id="app_dev_new" href="/api/oauthv2/applications/dev/{{app.get_id}}/show">{{app.get_name}}</a></strong></span> <span class='app-row'><strong><a class="link" id="app_dev_new" href="/api/oauthv2/applications/dev/{{app.get_id}}/show">{{app.get_name}}</a></strong></span>
<span class='app-row'>{{app.get_desciption }}</span> <span class='app-row'>{{app.get_description }}</span>
</div> </div>
</li> </li>
</ul> </ul>