[tokenauth-token]";
}
- $tokenauth_text['format'] = FILTER_FORMAT_DEFAULT;
+ $tokenauth_text['format'] = NULL;
}
if (!$render) {
return $tokenauth_text;
@@ -185,7 +189,7 @@ EOT;
if (empty($account)) {
$account = $GLOBALS['user'];
}
- $tokenauth_text['body'] = token_replace($tokenauth_text['body'], 'user', $account);
+ $tokenauth_text['body'] = token_replace($tokenauth_text['body'], array('user'=>$account));
}
- return check_markup($tokenauth_text['body'], $tokenauth_text['format']);
+ return check_markup($tokenauth_text['body']);
}
Index: tokenauth.info
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/tokenauth/Attic/tokenauth.info,v
retrieving revision 1.3.4.1
diff -u -p -r1.3.4.1 tokenauth.info
--- tokenauth.info 28 May 2008 04:55:54 -0000 1.3.4.1
+++ tokenauth.info 25 Jan 2011 09:51:58 -0000
@@ -1,4 +1,6 @@
; $Id: tokenauth.info,v 1.3.4.1 2008/05/28 04:55:54 weitzman Exp $
-name = Token authentication
+name = Token Authentication
description = Enable aggregators, feed readers and other simple clients to see private pages by providing an authentication token.
-core = 6.x
+core = 7.x
+dependencies[] = user
+configure = admin/config/services/tokenauth
Index: tokenauth.install
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/tokenauth/Attic/tokenauth.install,v
retrieving revision 1.3.4.12
diff -u -p -r1.3.4.12 tokenauth.install
--- tokenauth.install 2 Nov 2010 06:14:46 -0000 1.3.4.12
+++ tokenauth.install 25 Jan 2011 09:51:58 -0000
@@ -38,7 +38,6 @@ function tokenauth_schema() {
* Implementation of hook_install().
*/
function tokenauth_install() {
- drupal_install_schema('tokenauth');
// Tokenauth must authenticate the user before other modules can deny anonymous access.
db_query("UPDATE {system} SET weight='-1000' WHERE name='tokenauth'");
}
@@ -47,32 +46,17 @@ function tokenauth_install() {
* Implementation of hook_enable().
*/
function tokenauth_enable() {
- // Assign tokens for each user.
- $result = db_query("SELECT u.uid FROM {users} u LEFT JOIN {tokenauth_tokens} tt ON u.uid = tt.uid WHERE tt.token IS NULL AND u.uid > 0");
- while ($row = db_fetch_object($result)) {
- tokenauth_insert($row->uid);
- }
+ tokenauth_reset(NULL, NULL, FALSE);
// Clean up orphaned tokens from users removed while module disabled
- db_query("DELETE tt.* FROM {tokenauth_tokens} tt WHERE NOT EXISTS (SELECT * FROM {users} u WHERE u.uid=tt.uid)");
+ db_query("DELETE tt.* FROM {tokenauth_tokens} tt WHERE NOT EXISTS (SELECT * FROM {users} u WHERE u.uid = tt.uid)");
}
/**
* Implementation of hook_uninstall().
*/
function tokenauth_uninstall() {
- drupal_uninstall_schema('tokenauth');
variable_del('tokenauth_length');
variable_del('tokenauth_pages');
variable_del('tokenauth_reset');
variable_del('tokenauth_text');
}
-
-/**
- * Make sure tokenauth has a low module weight.
- */
-function tokenauth_update_6106() {
- $ret = array();
- // Make sure existing tokenauth installations operate at the proper weight.
- db_query("UPDATE {system} SET weight='-1000' WHERE name='tokenauth'");
- return $ret;
-}
\ No newline at end of file
Index: tokenauth.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/tokenauth/Attic/tokenauth.module,v
retrieving revision 1.11.4.32
diff -u -p -r1.11.4.32 tokenauth.module
--- tokenauth.module 23 Jan 2011 06:56:23 -0000 1.11.4.32
+++ tokenauth.module 25 Jan 2011 09:51:59 -0000
@@ -11,24 +11,34 @@ include_once('tokenauth.inc');
/**
* Implementation of hook_perm().
*/
-function tokenauth_perm() {
- return array('access tokenauth', 'administer tokenauth');
+function tokenauth_permission() {
+ return array(
+ 'administer tokenauth'=>array(
+ 'title'=>t('Administer tokenauth'),
+ 'description'=>t('User can administer site-wide tokenauth settings.')
+ ),
+ 'access tokenauth'=>array(
+ 'title'=>t('Access tokenauth'),
+ 'description'=>t('User can access feeds using auth tokens.')
+ )
+ );
}
/**
* Implementation of hook_menu().
*/
function tokenauth_menu() {
- $items['admin/settings/tokenauth'] = array(
+ $items['admin/config/services/tokenauth'] = array(
'title' => t('Token authentication'),
- 'description' => t('Configure token behavior to allow users to authenticate per page-load via URL.'),
+ 'description' => t('Configure authorisation token behavior to allow users to authenticate per page-load via URL.'),
'page callback' => 'drupal_get_form',
'page arguments' => array('tokenauth_admin_settings'),
'access arguments' => array('administer tokenauth'),
'file' => 'tokenauth.pages.inc',
+ 'type' => MENU_NORMAL_ITEM
);
- $items['admin/settings/tokenauth/reset'] = array(
- 'title' => t('Reset tokens'),
+ $items['admin/config/services/tokenauth/reset'] = array(
+ 'title' => t('Reset authorisation tokens'),
'page callback' => 'drupal_get_form',
'page arguments' => array('tokenauth_reset_confirm'),
'access arguments' => array('administer tokenauth'),
@@ -45,7 +55,7 @@ function tokenauth_menu() {
'type' => MENU_LOCAL_TASK,
);
$items['user/%user/tokenauth/reset'] = array(
- 'title' => t('Reset token'),
+ 'title' => t('Reset authorisation token'),
'page callback' => 'drupal_get_form',
'page arguments' => array('tokenauth_user_reset_confirm'),
'access callback' => 'tokenauth_profile_access',
@@ -58,6 +68,19 @@ function tokenauth_menu() {
}
/**
+ * Implementation of hook_admin_paths().
+ */
+function tokenauth_admin_paths() {
+ $paths = array(
+ 'admin/config/services/tokenauth' => TRUE,
+ 'admin/config/services/tokenauth/reset' => TRUE,
+ 'user/*/tokenauth' => TRUE,
+ 'user/*/edit/*' => TRUE,
+ );
+ return $paths;
+}
+
+/**
* Implementation of hook_help().
*/
function tokenauth_help($path, $arg) {
@@ -69,10 +92,13 @@ function tokenauth_help($path, $arg) {
}
/**
- * Access callback for tokenauth view/edit.
+ * Form access callback for tokenauth view/edit.
*/
function tokenauth_profile_access($account) {
- return (user_access('administer users') || ($GLOBALS['user']->uid == $account->uid)) && user_access('access tokenauth') && $account->uid > 0;
+ return (user_access('administer users') // Current user can admin users.
+ || ($GLOBALS['user']->uid == $account->uid)) // Current user is editing own profile.
+ && user_access('access tokenauth') // Current user can use tokenauth. TODO: Should this be target user rather than current user?
+ && ($account->uid > 1); // Don't allow anon or admin to use tokenauth under any circumstances.
}
/**
@@ -81,19 +107,31 @@ function tokenauth_profile_access($accou
function tokenauth_init() {
global $user;
// Process any provided token and log in user
- if (user_is_anonymous() && isset($_REQUEST['token']) && tokenauth_allowed_pages($_GET['q'])) {
+ if (user_is_anonymous()
+ && isset($_REQUEST['token'])
+ && tokenauth_allowed_pages($_GET['q'])) {
if ($uid = tokenauth_get_user($_REQUEST['token'])) {
$account = user_load($uid);
if (user_access('access tokenauth', $account)) {
$user = $account;
- // Store the fact that this user authenticated via token. Needed for logout.
+ // Store the fact that this user authenticated via token. Needed for tokenauth_exit.
$_SESSION['tokenauth_auth'] = TRUE;
if (function_exists('drupal_save_session')) {
drupal_save_session(FALSE);
}
- watchdog('user', 'Page @page loaded for %name via token authentication.', array('@page' => $_GET['q'], '%name' => $account->name));
+ watchdog('user', 'Page @page loaded for %name via token authentication.', array(
+ '@page' => $_GET['q'],
+ '%name' => $account->name
+ ));
+
+ // Warning! Danger!
+ // Kill the static data stored by menu_get_item, which will force it to re-create it
+ // and more importantly, recalculate the access field. This works, but might not be
+ // strictly conformant to the Drupal API.
+ drupal_static_reset('menu_get_item');
}
}
+
// Supplied an invalid token
if (empty($_SESSION['tokenauth_auth'])) {
drupal_access_denied();
@@ -102,14 +140,15 @@ function tokenauth_init() {
}
// Trigger tokenauth context condition.
- if (module_exists('context') && $plugin = context_get_plugin('condition', 'tokenauth_auth')) {
+ if (module_exists('context')
+ && ($plugin = context_get_plugin('condition', 'tokenauth_auth'))) {
$plugin->execute((int)$_SESSION['tokenauth_auth']);
}
}
/**
* Implementation of hook_exit().
- * Deliberately insure that this session will not be saved by sess_write(). Safety.
+ * Deliberately ensure that this session will not be saved by sess_write(). Safety.
* @see user_logout
*/
function tokenauth_exit() {
@@ -128,17 +167,24 @@ function tokenauth_exit() {
* that also passes tokenauth's allowed pages filter.
*/
function tokenauth_url_outbound_alter(&$path, &$options, $original_path) {
- if (isset($_SESSION['tokenauth_auth']) && $_REQUEST['token'] == ($token = tokenauth_get_token())
- && tokenauth_allowed_pages($original_path)) {
-
+ if (isset($_SESSION['tokenauth_auth'])
+ && ($_REQUEST['token'] == ($token = tokenauth_get_token()))
+ && tokenauth_allowed_pages($original_path)) {
if (is_array($options['query'])) {
$options['query']['token'] = $token;
}
- elseif (!$options['query']) {
- $options['query'] = 'token=' . $token;
- }
else {
- $options['query'] .= '&token=' . $token;
+ $options['query'] .= 'token=' . $token;
+ }
+ }
+ else if (!isset($_SESSION['tokenauth_auth'])
+ && user_access('access tokenauth')
+ && tokenauth_allowed_pages($original_path)) {
+ // We are rendering a link to an RSS file, so append the token.
+ $token = tokenauth_get_token();
+ if ($token != NULL) {
+ // From D6 on, the query element is an array (it previously was a string).
+ $options['query']['token'] = $token;
}
}
}
@@ -157,8 +203,7 @@ function tokenauth_user($op, &$edit, &$a
tokenauth_insert($account->uid);
break;
case 'delete':
- $sql = 'DELETE FROM {tokenauth_tokens} WHERE uid = %d';
- db_query($sql, $account->uid);
+ tokenauth_delete($account->uid);
}
}
Index: tokenauth.pages.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/tokenauth/Attic/tokenauth.pages.inc,v
retrieving revision 1.1.2.6
diff -u -p -r1.1.2.6 tokenauth.pages.inc
--- tokenauth.pages.inc 2 Sep 2010 21:10:57 -0000 1.1.2.6
+++ tokenauth.pages.inc 25 Jan 2011 09:51:59 -0000
@@ -29,7 +29,12 @@ function tokenauth_admin_settings() {
'#type' => 'textarea',
'#title' => t('Activate tokens on specific pages'),
'#default_value' => variable_get('tokenauth_pages', "rss.xml\n*/feed\n*/opml"),
- '#description' => t("Enter one page per line as Drupal paths. The '*' character is a wildcard. Example paths are %blog for the blog page and %blog-wildcard for every personal blog. %front is the front page. Read drupal_match_path() for the details.", array('%blog' => 'blog', '%blog-wildcard' => 'blog/*', '%front' => '" . t('Your token:') . " ?token=$token
" . t('Your token:') . " ?token=$token