Drupal/Launchpad login module

Merge lp:~l3on/drupal-launchpad/7.x-dev_with-ubuntu-sso into lp:~ubuntu-drupal-devs/drupal-launchpad/7.x-dev

  1. 7.x-dev_with-ubuntu-sso
  2. Merge into 7.x-dev
Proposed by Leo Iannacone
Status: Needs review
Proposed branch: lp:~l3on/drupal-launchpad/7.x-dev_with-ubuntu-sso
Merge into: lp:~ubuntu-drupal-devs/drupal-launchpad/7.x-dev
Diff against target: 43 lines (+14/-5)
1 file modified
openid_launchpad.module (+14/-5)
To merge this branch: bzr merge lp:~l3on/drupal-launchpad/7.x-dev_with-ubuntu-sso
Reviewer Review Type Date Requested Status
UD Devs Pending
Review via email: mp+116113@code.launchpad.net

Description of the change

Added Ubuntu SSO websites

To post a comment you must log in.

Unmerged revisions

6. By Leo Iannacone

Added Ubuntu SSO websites

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'openid_launchpad.module'
--- openid_launchpad.module 2011-05-16 02:36:44 +0000
+++ openid_launchpad.module 2012-07-21 11:20:23 +0000
@@ -26,6 +26,10 @@
26define('LAUNCHPAD_TESTING_OP', LAUNCHPAD_TESTING_URL . '+openid');26define('LAUNCHPAD_TESTING_OP', LAUNCHPAD_TESTING_URL . '+openid');
27define('LAUNCHPAD_STAGING_URL', 'https://login.staging.launchpad.net/');27define('LAUNCHPAD_STAGING_URL', 'https://login.staging.launchpad.net/');
28define('LAUNCHPAD_STAGING_OP', LAUNCHPAD_STAGING_URL . '+openid');28define('LAUNCHPAD_STAGING_OP', LAUNCHPAD_STAGING_URL . '+openid');
29define('UBUNTU_SSO_PRODUCTION_URL', 'https://login.ubuntu.com/');
30define('UBUNTU_SSO_PRODUCTION_OP', UBUNTU_SSO_PRODUCTION_URL . '+openid');
31define('UBUNTU_SSO_STAGING_URL', 'https://login.staging.ubuntu.com/');
32define('UBUNTU_SSO_STAGING_OP', UBUNTU_SSO_STAGING_URL . '+openid');
2933
30/**34/**
31 * Implements hook_menu().35 * Implements hook_menu().
@@ -344,7 +348,10 @@
344function get_expected_endpoint() {348function get_expected_endpoint() {
345 $endpoints = array(LAUNCHPAD_PRODUCTION_URL => LAUNCHPAD_PRODUCTION_OP,349 $endpoints = array(LAUNCHPAD_PRODUCTION_URL => LAUNCHPAD_PRODUCTION_OP,
346 LAUNCHPAD_TESTING_URL => LAUNCHPAD_TESTING_OP,350 LAUNCHPAD_TESTING_URL => LAUNCHPAD_TESTING_OP,
347 LAUNCHPAD_STAGING_URL => LAUNCHPAD_STAGING_OP);351 LAUNCHPAD_STAGING_URL => LAUNCHPAD_STAGING_OP,
352 LAUNCHPAD_STAGING_URL => LAUNCHPAD_STAGING_OP,
353 UBUNTU_SSO_PRODUCTION_URL => UBUNTU_SSO_PRODUCTION_OP,
354 UBUNTU_SSO_STAGING_URL => UBUNTU_SSO_STAGING_OP);
348 $current_server = variable_get('openid_launchpad_server', LAUNCHPAD_PRODUCTION_URL);355 $current_server = variable_get('openid_launchpad_server', LAUNCHPAD_PRODUCTION_URL);
349 return $endpoints[$current_server];356 return $endpoints[$current_server];
350}357}
@@ -426,10 +433,12 @@
426 '#type' => 'radios',433 '#type' => 'radios',
427 '#title' => t('Select server'),434 '#title' => t('Select server'),
428 '#options' => array(435 '#options' => array(
429 LAUNCHPAD_PRODUCTION_URL => t('Production') . " (" . LAUNCHPAD_PRODUCTION_URL . ")",436 LAUNCHPAD_PRODUCTION_URL => t('Production') . " (" . LAUNCHPAD_PRODUCTION_URL . ")",
430 LAUNCHPAD_STAGING_URL => t('Staging') . " (" . LAUNCHPAD_STAGING_URL . ")",437 LAUNCHPAD_STAGING_URL => t('Staging') . " (" . LAUNCHPAD_STAGING_URL . ")",
431 LAUNCHPAD_TESTING_URL => t('Testing') . " (" . LAUNCHPAD_TESTING_URL . ")",438 LAUNCHPAD_TESTING_URL => t('Testing') . " (" . LAUNCHPAD_TESTING_URL . ")",
432 ),439 UBUNTU_SSO_PRODUCTION_URL => t('Ubuntu SSO production') . " (" . UBUNTU_SSO_PRODUCTION_URL . ")",
440 UBUNTU_SSO_STAGING_URL => t('Ubuntu SSO staging') . " (" . UBUNTU_SSO_STAGING_URL . ")",
441 ),
433 '#default_value' => variable_get('openid_launchpad_server', LAUNCHPAD_PRODUCTION_URL),442 '#default_value' => variable_get('openid_launchpad_server', LAUNCHPAD_PRODUCTION_URL),
434 );443 );
435 $form['sso'] = array(444 $form['sso'] = array(

Subscribers

People subscribed via source and target branches

to all changes: