From cf5fca13b0180e656427da4f818dfa34081fcc1c Mon Sep 17 00:00:00 2001 From: Matthew Radcliffe Date: Fri, 18 Mar 2011 08:50:00 -0400 Subject: [PATCH 3/3] * [#807390] by mradcliffe. Change admin/config/oauth to admin/config/services/oauth. Fix query fatal error in edit context validate (needs work). --- oauth_common.admin.inc | 46 ++++++++++++++++++++-------------------- oauth_common.info | 2 +- oauth_common.module | 4 +- oauth_common_providerui.info | 2 + oauth_common_providerui.module | 26 +++++++++++----------- 5 files changed, 41 insertions(+), 39 deletions(-) diff --git a/oauth_common.admin.inc b/oauth_common.admin.inc index 2550595..1bf852e 100644 --- a/oauth_common.admin.inc +++ b/oauth_common.admin.inc @@ -62,37 +62,37 @@ function oauth_common_list_context($js = NULL) { if (empty($context->disabled)) { $operations[] = array( 'title' => t('Edit'), - 'href' => 'admin/config/oauth/' . $context->name . '/edit', + 'href' => 'admin/config/services/oauth/' . $context->name . '/edit', ); $operations[] = array( 'title' => t('Export'), - 'href' => 'admin/config/oauth/' . $context->name . '/export', + 'href' => 'admin/config/services/oauth/' . $context->name . '/export', ); } if ($context->export_type == (EXPORT_IN_CODE | EXPORT_IN_DATABASE)) { $operations[] = array( 'title' => t('Revert'), - 'href' => 'admin/config/oauth/' . $context->name . '/delete', + 'href' => 'admin/config/services/oauth/' . $context->name . '/delete', ); } elseif ($context->export_type != EXPORT_IN_CODE) { $operations[] = array( 'title' => t('Delete'), - 'href' => 'admin/config/oauth/' . $context->name . '/delete', + 'href' => 'admin/config/services/oauth/' . $context->name . '/delete', ); } elseif (empty($context->disabled)) { $operations[] = array( 'title' => t('Disable'), - 'href' => 'admin/config/oauth/' . $context->name . '/disable', + 'href' => 'admin/config/services/oauth/' . $context->name . '/disable', 'query' => drupal_get_destination(), ); } else { $operations[] = array( 'title' => t('Enable'), - 'href' => 'admin/config/oauth/' . $context->name . '/enable', + 'href' => 'admin/config/services/oauth/' . $context->name . '/enable', 'query' => drupal_get_destination(), ); } @@ -228,21 +228,21 @@ function oauth_common_edit_form_context($form, &$form_state, $context) { '#description' => t('The title of the authorization page.'), '#size' => 40, '#maxlength' => 255, - '#default_value' => $context->authorization_options['page_title'], + '#default_value' => !empty($context->authorization_options['page_title']) ? $context->authorization_options['page_title'] : '', ); $form['authorization_options']['message'] = array( '#type' => 'textarea', '#title' => t('Message'), '#description' => t('The message shown to the user when authorizing.'), - '#default_value' => $context->authorization_options['message'], + '#default_value' => !empty($context->authorization_options['message']) ? $context->authorization_options['message'] : '', ); $form['authorization_options']['warning'] = array( '#type' => 'textarea', '#title' => t('Warning'), '#description' => t('The warning shown to the user when authorizing.'), - '#default_value' => $context->authorization_options['warning'], + '#default_value' => !empty($context->authorization_options['warning']) ? $context->authorization_options['message'] : '', ); $form['authorization_options']['deny_access_title'] = array( @@ -251,7 +251,7 @@ function oauth_common_edit_form_context($form, &$form_state, $context) { '#description' => t('The title of deny access link.'), '#size' => 40, '#maxlength' => 255, - '#default_value' => $context->authorization_options['deny_access_title'], + '#default_value' => !empty($context->authorization_options['deny_access_title']) ? $context->authorization_options['deny_access_title'] : '', ); $form['authorization_options']['grant_access_title'] = array( @@ -260,7 +260,7 @@ function oauth_common_edit_form_context($form, &$form_state, $context) { '#description' => t('The title of grant access button.'), '#size' => 40, '#maxlength' => 255, - '#default_value' => $context->authorization_options['grant_access_title'], + '#default_value' => !empty($context->authorization_options['grant_access_title']) ? $context->authorization_options['grant_access_title'] : '', ); $form['authorization_options']['access_token_lifetime'] = array( @@ -293,7 +293,7 @@ function oauth_common_edit_form_context($form, &$form_state, $context) { '#value' => t('Add authorization level'), '#weight' => 10, '#ahah' => array( - 'path' => 'admin/config/oauth/ahah/add-auth-level', + 'path' => 'admin/config/services/oauth/ahah/add-auth-level', 'wrapper' => 'auth-level-wrapper', 'method' => 'append', ), @@ -424,21 +424,21 @@ function oauth_common_ahah_add_auth_level() { */ function oauth_common_edit_form_context_validate(&$form, &$form_state) { $values = $form_state['values']; - + // Test uniqueness of name: if (preg_match("/[^A-Za-z0-9_]/", $values['name'])) { form_error($form['name'], t('Context name must be alphanumeric or underscores only.')); } else if (!empty($values['name'])) { - $query = "SELECT cid FROM {oauth_common_context} WHERE name = '%s'"; - $args = array( - ':name' => $values['name'], - ); + $query = db_select('oauth_common_context'); + $query + ->condition('name', $values['name'], '=') + ->fields('oauth_common_context', array('cid')); if (!empty($values['cid']) && is_numeric($values['cid'])) { - $query .= ' AND cid != %d'; - $args[':cid'] = $values['cid']; + $query->condition('cid', $values['cid'], '<>'); } - if (db_query($query, $args)->fetchField()) { + $result = $query->execute(); + if ($result->fetchField(0)) { form_error($form['name'], t('Context name must be unique.')); } } @@ -555,7 +555,7 @@ function oauth_common_edit_form_context_submit($form, &$form_state) { drupal_set_message(t('Your changes have been saved.')); } - $form_state['redirect'] = 'admin/config/oauth'; + $form_state['redirect'] = 'admin/config/services/oauth'; } /** @@ -587,7 +587,7 @@ function oauth_common_delete_confirm_context(&$form_state, $context) { ); return confirm_form($form, $title, - !empty($_GET['destination']) ? $_GET['destination'] : 'admin/config/oauth', + !empty($_GET['destination']) ? $_GET['destination'] : 'admin/config/services/oauth', t('This action cannot be undone.'), $submit, t('Cancel') ); @@ -600,7 +600,7 @@ function oauth_common_delete_confirm_context_submit($form, &$form_state) { $context = oauth_common_context_load($form_state['values']['context']); if ($context->cid == $form_state['values']['cid']) { oauth_common_context_delete($context); - $form_state['redirect'] = 'admin/config/oauth'; + $form_state['redirect'] = 'admin/config/services/oauth'; } } diff --git a/oauth_common.info b/oauth_common.info index 644feb2..e22c1de 100644 --- a/oauth_common.info +++ b/oauth_common.info @@ -33,4 +33,4 @@ files[] = updates/update.6201.inc files[] = updates/update.6202.inc files[] = updates/update.6300.inc -configure = admin/config/oauth +configure = admin/config/services/oauth diff --git a/oauth_common.module b/oauth_common.module index 05b07f5..9d8d2d8 100644 --- a/oauth_common.module +++ b/oauth_common.module @@ -75,7 +75,7 @@ function oauth_common_menu() { 'file' => 'oauth_common.admin.inc', ); - $menu['admin/config/oauth'] = array( + $menu['admin/config/services/oauth'] = array( 'title' => 'OAuth', 'description' => 'Settings for OAuth', 'page callback' => 'drupal_get_form', @@ -83,7 +83,7 @@ function oauth_common_menu() { 'type' => MENU_NORMAL_ITEM, ) + $admin_base; - $menu['admin/config/oauth/settings'] = array( + $menu['admin/config/services/oauth/settings'] = array( 'title' => 'Settings', 'description' => 'Settings for OAuth', 'page callback' => 'drupal_get_form', diff --git a/oauth_common_providerui.info b/oauth_common_providerui.info index ae068e2..ad2dace 100644 --- a/oauth_common_providerui.info +++ b/oauth_common_providerui.info @@ -31,3 +31,5 @@ files[] = updates/update.6200.inc files[] = updates/update.6201.inc files[] = updates/update.6202.inc files[] = updates/update.6300.inc + +configure = admin/config/services/oauth/contexts diff --git a/oauth_common_providerui.module b/oauth_common_providerui.module index 09ba27e..8f71448 100644 --- a/oauth_common_providerui.module +++ b/oauth_common_providerui.module @@ -10,7 +10,7 @@ function oauth_common_providerui_menu() { 'file' => 'oauth_common.admin.inc', ); - $menu['admin/config/oauth/contexts'] = array( + $menu['admin/config/services/oauth/contexts'] = array( 'title' => 'Contexts', 'description' => 'The different context for authorization', 'page callback' => 'oauth_common_list_context', @@ -22,50 +22,50 @@ function oauth_common_providerui_menu() { // Context administration //////////// - $menu['admin/config/oauth/add'] = array( + $menu['admin/config/services/oauth/add'] = array( 'title' => 'Add context', 'page callback' => 'oauth_common_add_context', 'type' => MENU_LOCAL_TASK, 'weight' => 10, ) + $admin_base; - $menu['admin/config/oauth/%oauth_common_context/edit'] = array( + $menu['admin/config/services/oauth/%oauth_common_context/edit'] = array( 'title' => 'Edit context', 'page callback' => 'oauth_common_edit_context', - 'page arguments' => array(3), + 'page arguments' => array(4), 'type' => MENU_LOCAL_TASK, 'weight' => 10, ) + $admin_base; - $menu['admin/config/oauth/ahah/add-auth-level'] = array( + $menu['admin/config/services/oauth/ahah/add-auth-level'] = array( 'page callback' => 'oauth_common_ahah_add_auth_level', 'type' => MENU_CALLBACK, ) + $admin_base; - $menu['admin/config/oauth/%oauth_common_context/export'] = array( + $menu['admin/config/services/oauth/%oauth_common_context/export'] = array( 'title' => 'Export context', 'page callback' => 'drupal_get_form', - 'page arguments' => array('oauth_common_export_context', 3), + 'page arguments' => array('oauth_common_export_context', 4), 'type' => MENU_LOCAL_TASK, 'weight' => 20, ) + $admin_base; - $menu['admin/config/oauth/%oauth_common_context/delete'] = array( + $menu['admin/config/services/oauth/%oauth_common_context/delete'] = array( 'title' => 'Delete context', 'page callback' => 'drupal_get_form', - 'page arguments' => array('oauth_common_delete_confirm_context', 3), + 'page arguments' => array('oauth_common_delete_confirm_context', 4), 'type' => MENU_CALLBACK, ) + $admin_base; - $menu['admin/config/oauth/%oauth_common_context/disable'] = array( + $menu['admin/config/services/oauth/%oauth_common_context/disable'] = array( 'page callback' => 'oauth_common_context', - 'page arguments' => array(3), + 'page arguments' => array(4), 'type' => MENU_CALLBACK, ) + $admin_base; - $menu['admin/config/oauth/%oauth_common_context/enable'] = array( + $menu['admin/config/services/oauth/%oauth_common_context/enable'] = array( 'page callback' => 'oauth_common_enable_context', - 'page arguments' => array(3), + 'page arguments' => array(4), 'type' => MENU_CALLBACK, ) + $admin_base; -- 1.7.4.msysgit.0