'api-version' => '1.0',
);
+ $client = $this->getClient();
+ if ($client !== false) {
+ $data['oauth_authorize_url'] .= '?client='
+ . urlencode($this->getNiceClientName($client));
+ }
+
if ($authenticated) {
$data['user-ref'] = array(
'api-ref' => $urlGen->getAbsoluteURL(
return new JSONResponse($note);
}
+ protected function getClient()
+ {
+ if (isset($_SERVER['HTTP_X_TOMBOY_CLIENT'])) {
+ $client = $_SERVER['HTTP_X_TOMBOY_CLIENT'];
+ $doublepos = strpos($client, ', org.tomdroid');
+ if ($doublepos !== false) {
+ //https://bugs.launchpad.net/tomdroid/+bug/1375436
+ //X-Tomboy-Client header is sent twice
+ $client = substr($client, 0, $doublepos);
+ }
+ return $client;
+ }
+
+ return false;
+ }
+
+ protected function getNiceClientName($client)
+ {
+ if (substr($client, 0, 12) == 'org.tomdroid') {
+ //org.tomdroid v0.7.5, build 14, Android v4.4.2, innotek GmbH/VirtualBox
+ return 'Tomdroid';
+ }
+ return $client;
+ }
+
/**
* Checks if the given user is authorized (by oauth token or normal login)
*
return $token;
}
+ $client = 'unknown';
+ if (isset($_GET['client'])) {
+ $client = $_GET['client'];
+ }
+
$res = new TemplateResponse('grauphel', 'oauthAuthorize');
$res->setParams(
array(
'oauth_token' => $token->tokenKey,
+ 'client' => $client,
'formaction' => $this->deps->urlGen->linkToRoute(
'grauphel.oauth.confirm'
),
.app-grauphel #app-content a.lined {
text-decoration: underline;
}
+
+.app-grauphel .oauth-authorize {
+ margin: 2ex;
+ text-align: center;
+}
+.app-grauphel .msg {
+ padding: 2ex;
+}
+.app-grauphel .buttons {
+ margin-top: 2ex;
+ text-align: center;
+}
\ No newline at end of file
-<form method="post" action="<?php p($_['formaction']); ?>">
+<link rel="stylesheet" href="<?php p(OCP\Util::linkTo('grauphel','grauphel.css')); ?>" type="text/css"/>
+<form method="post" action="<?php p($_['formaction']); ?>" class="oauth-authorize">
<input type="hidden" value="<?php p($_['requesttoken']); ?>" name="requesttoken" />
<input type="hidden" value="<?php p($_['oauth_token']); ?>" name="oauth_token" />
- <p>
- Shall application FIXME get full access to the notes?
+ <p class="msg">
+ Shall application
+ <strong><?php p($_['client']); ?></strong>
+ get full access to the notes?
</p>
- <button type="submit" name="auth" value="ok">Yes, authorize</button>
- <button type="submit" name="auth" value="cancel">No, decline</button>
+ <div class="buttons">
+ <button type="submit" name="auth" value="ok">Yes, authorize</button>
+ <button type="submit" name="auth" value="cancel">No, decline</button>
+ </div>
</form>