Interface design: add export option through API into the profile page
git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@94 b3834d28-1941-0410-a4f8-b48e95affb8f
This commit is contained in:
parent
96728fd633
commit
0564d64de2
2 changed files with 34 additions and 20 deletions
|
@ -1,4 +1,7 @@
|
||||||
<?php
|
<?php
|
||||||
|
require_once('../header.inc.php');
|
||||||
|
$userservice =& ServiceFactory::getServiceInstance('UserService');
|
||||||
|
|
||||||
// Provides HTTP Basic authentication of a user, and sets two variables, sId and username,
|
// Provides HTTP Basic authentication of a user, and sets two variables, sId and username,
|
||||||
// with the user's info.
|
// with the user's info.
|
||||||
|
|
||||||
|
@ -6,24 +9,23 @@ function authenticate() {
|
||||||
header('WWW-Authenticate: Basic realm="SemanticScuttle API"');
|
header('WWW-Authenticate: Basic realm="SemanticScuttle API"');
|
||||||
header('HTTP/1.0 401 Unauthorized');
|
header('HTTP/1.0 401 Unauthorized');
|
||||||
|
|
||||||
die("Use of the API calls requires authentication.");
|
die(T_("Use of the API calls requires authentication."));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if(!$userservice->isLoggedOn()) {
|
||||||
|
|
||||||
/* Maybe we have caught authentication data in $_SERVER['REMOTE_USER']
|
/* Maybe we have caught authentication data in $_SERVER['REMOTE_USER']
|
||||||
( Inspired by http://www.yetanothercommunitysystem.com/article-321-regle-comment-utiliser-l-authentification-http-en-php-chez-ovh ) */
|
( Inspired by http://www.yetanothercommunitysystem.com/article-321-regle-comment-utiliser-l-authentification-http-en-php-chez-ovh ) */
|
||||||
if((!$_SERVER['PHP_AUTH_USER'] || !$_SERVER['PHP_AUTH_USER'])
|
if((!isset($_SERVER['PHP_AUTH_USER']) || !isset($_SERVER['PHP_AUTH_PW']))
|
||||||
&& preg_match('/Basic\s+(.*)$/i', $_SERVER['REMOTE_USER'], $matches)) {
|
&& preg_match('/Basic\s+(.*)$/i', $_SERVER['REMOTE_USER'], $matches)) {
|
||||||
list($name, $password) = explode(':', base64_decode($matches[1]));
|
list($name, $password) = explode(':', base64_decode($matches[1]));
|
||||||
$_SERVER['PHP_AUTH_USER'] = strip_tags($name);
|
$_SERVER['PHP_AUTH_USER'] = strip_tags($name);
|
||||||
$_SERVER['PHP_AUTH_PW'] = strip_tags($password);
|
$_SERVER['PHP_AUTH_PW'] = strip_tags($password);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!isset($_SERVER['PHP_AUTH_USER'])) {
|
||||||
|
|
||||||
if (!isset($_SERVER['PHP_AUTH_USER'])) {
|
|
||||||
authenticate();
|
authenticate();
|
||||||
} else {
|
} else {
|
||||||
require_once('../header.inc.php');
|
require_once('../header.inc.php');
|
||||||
$userservice =& ServiceFactory::getServiceInstance('UserService');
|
$userservice =& ServiceFactory::getServiceInstance('UserService');
|
||||||
|
|
||||||
|
@ -31,5 +33,6 @@ if (!isset($_SERVER['PHP_AUTH_USER'])) {
|
||||||
if (!$login) {
|
if (!$login) {
|
||||||
authenticate();
|
authenticate();
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
|
|
|
@ -4,6 +4,17 @@ $this->includeTemplate($GLOBALS['top_include']);
|
||||||
|
|
||||||
<form action="<?php echo $formaction; ?>" method="post">
|
<form action="<?php echo $formaction; ?>" method="post">
|
||||||
|
|
||||||
|
<h3><?php echo T_('Actions'); ?></h3>
|
||||||
|
<table class="profile">
|
||||||
|
<tr>
|
||||||
|
<th align="left"><?php echo T_('Export'); ?></th>
|
||||||
|
<td>
|
||||||
|
<a href="../api/posts/all"><?php echo T_('All bookmarks')?></a>
|
||||||
|
<?php echo ' ← '.T_('Del.icio.us-like API')?>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
</table>
|
||||||
|
|
||||||
<h3><?php echo T_('Account Details'); ?></h3>
|
<h3><?php echo T_('Account Details'); ?></h3>
|
||||||
|
|
||||||
<table class="profile">
|
<table class="profile">
|
||||||
|
|
Loading…
Reference in a new issue