Skip to content
Snippets Groups Projects
Commit 4e6b4b26 authored by Bart Visscher's avatar Bart Visscher
Browse files

remoteStorage: split auth allow template

parent 34c076e2
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
apps/remoteStorage/auth.php
+ 9
− 51
View file @ 4e6b4b26
...@@ -60,57 +60,15 @@ if($userId && $appUrl && $categories) { ...@@ -60,57 +60,15 @@ if($userId && $appUrl && $categories) {
header('Location: '.$_GET['redirect_uri'].'#access_token='.$existingToken.'&token_type=bearer'); header('Location: '.$_GET['redirect_uri'].'#access_token='.$existingToken.'&token_type=bearer');
} else { } else {
//params ok, logged in ok, but need to click Allow still: //params ok, logged in ok, but need to click Allow still:
?> $appUrlParts = explode('/', $_GET['redirect_uri']);
<!DOCTYPE html> $host = $appUrlParts[2];
<html> $categories = explode(',', $_GET['scope']);
<head> OCP\Util::addStyle('', 'auth');
<title>ownCloud</title> OCP\Template::printGuestPage('remoteStorage', 'auth', array(
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> 'host' => $host,
<link rel="shortcut icon" href="../../../core/img/favicon.png" /><link rel="apple-touch-icon-precomposed" href="../../../core/img/favicon-touch.png" /> 'categories' => $categories,
<link rel="stylesheet" href="../../../core/css/styles.css" type="text/css" media="screen" /> ));
<link rel="stylesheet" href="../../../core/css/auth.css" type="text/css" media="screen" /> }//end 'need to click Allow still'
</head>
<body id="body-login">
<div id="login">
<header>
<div id="header">
<img src="../../../core/img/logo.png" alt="ownCloud" />
</div>
</header>
<section id="main">
<div id="oauth">
<h2><img src="../../../core/img/remoteStorage-big.png" alt="remoteStorage" /></h2>
<p><strong><?php $appUrlParts = explode('/', $_GET['redirect_uri']); echo htmlentities($appUrlParts[2]); ?></strong>
requests read &amp; write access to your
<?php
$categories = explode(',', htmlentities($_GET['scope']));
if(!count($categories)) {
echo htmlentities($_GET['scope']);
} else {
echo '<em>'.$categories[0].'</em>';
if(count($categories)==2) {
echo ' and <em>'.$categories[1].'</em>';
} else if(count($categories)>2) {
for($i=1; $i<count($categories)-1; $i++) {
echo ', <em>'.$categories[$i].'</em>';
}
echo ', and <em>'.$categories[$i].'</em>';
}
}
?>.
</p>
<form accept-charset="UTF-8" method="post">
<input id="allow-auth" name="allow" type="submit" value="Allow" />
<input id="deny-auth" name="deny" type="submit" value="Deny" />
</form>
</div>
</section>
</div>
<footer><p class="info"><a href="http://owncloud.org/">ownCloud</a> &ndash; web services under your control</p></footer>
</body>
</html>
<?php
}//end 'need to click Allow still'
} else {//login not ok } else {//login not ok
if($currUser) { if($currUser) {
die('You are logged in as '.$currUser.' instead of '.htmlentities($userId)); die('You are logged in as '.$currUser.' instead of '.htmlentities($userId));
......
apps/remoteStorage/templates/auth.php 0 → 100644
+ 28
− 0
View file @ 4e6b4b26
<section id="main">
<div id="oauth">
<h2><img src="<?php echo image_path('', 'remoteStorage-big.png'); ?>" alt="remoteStorage" /></h2>
<p><strong><?php echo $_['host'] ?></strong>
requests read &amp; write access to your
<?php
$categories = $_['categories'];
if(!count($categories)) {
echo $categories[0];
} else {
echo '<em>'.$categories[0].'</em>';
if(count($categories)==2) {
echo ' and <em>'.$categories[1].'</em>';
} else if(count($categories)>2) {
for($i=1; $i<count($categories)-1; $i++) {
echo ', <em>'.$categories[$i].'</em>';
}
echo ', and <em>'.$categories[$i].'</em>';
}
}
?>.
</p>
<form accept-charset="UTF-8" method="post">
<input id="allow-auth" name="allow" type="submit" value="Allow" />
<input id="deny-auth" name="deny" type="submit" value="Deny" />
</form>
</div>
</section>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment