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

diff --git a/api/httpauth.inc.php b/api/httpauth.inc.php
index 3e5d464a7fab42cffb3632c3c412334fe9848639..f693d35488237eacfd726f28b9f08598da4c4e62 100644 (file)
--- a/api/httpauth.inc.php
+++ b/api/httpauth.inc.php
@@ -1,4 +1,7 @@
 <?php
+require_once('../header.inc.php');
+$userservice =& ServiceFactory::getServiceInstance('UserService');
+
 //  Provides HTTP Basic authentication of a user, and sets two variables, sId and username,
 //  with the user's info.
 
@@ -6,30 +9,30 @@ function authenticate() {
     header('WWW-Authenticate: Basic realm="SemanticScuttle API"');
     header('HTTP/1.0 401 Unauthorized');
     
-    die("Use of the API calls requires authentication.");
-}
-
-
-/* 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 ) */
-if((!$_SERVER['PHP_AUTH_USER'] || !$_SERVER['PHP_AUTH_USER'])
-&& preg_match('/Basic\s+(.*)$/i', $_SERVER['REMOTE_USER'], $matches)) {
-list($name, $password) = explode(':', base64_decode($matches[1]));
-$_SERVER['PHP_AUTH_USER'] = strip_tags($name);
-$_SERVER['PHP_AUTH_PW'] = strip_tags($password);
+    die(T_("Use of the API calls requires authentication."));
 }
 
+if(!$userservice->isLoggedOn()) {
 
+    /* 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 ) */
+    if((!isset($_SERVER['PHP_AUTH_USER']) || !isset($_SERVER['PHP_AUTH_PW']))
+    && preg_match('/Basic\s+(.*)$/i', $_SERVER['REMOTE_USER'], $matches)) {
+       list($name, $password) = explode(':', base64_decode($matches[1]));
+       $_SERVER['PHP_AUTH_USER'] = strip_tags($name);
+       $_SERVER['PHP_AUTH_PW'] = strip_tags($password);
+    }
 
-if (!isset($_SERVER['PHP_AUTH_USER'])) {
-    authenticate();
-} else {
-    require_once('../header.inc.php');
-    $userservice =& ServiceFactory::getServiceInstance('UserService');
+    if (!isset($_SERVER['PHP_AUTH_USER'])) {
+       authenticate();
+    } else {
+       require_once('../header.inc.php');
+       $userservice =& ServiceFactory::getServiceInstance('UserService');
 
-    $login = $userservice->login($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW']);
-    if (!$login) {
-        authenticate();
+       $login = $userservice->login($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW']);
+       if (!$login) {
+           authenticate();
+       }
     }
 }
 ?>

diff --git a/templates/editprofile.tpl.php b/templates/editprofile.tpl.php
index ebfc97255fa3e569d167976266df77d4586c2918..d84fac5d11f1769697d9569efbc469839998d776 100644 (file)
--- a/templates/editprofile.tpl.php
+++ b/templates/editprofile.tpl.php
@@ -4,6 +4,17 @@ $this->includeTemplate($GLOBALS['top_include']);
 
 <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 ' &larr; '.T_('Del.icio.us-like API')?>
+    </td>
+</tr>
+</table>
+
 <h3><?php echo T_('Account Details'); ?></h3>
 
 <table class="profile">
@@ -53,4 +64,4 @@ $this->includeTemplate($GLOBALS['top_include']);
 
 <?php
 $this->includeTemplate($GLOBALS['bottom_include']);
-?>
\ No newline at end of file
+?>