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

[Leo Iannacone]

Added Ubuntu SSO websites

Unmerged revisions

6. By Leo Iannacone on 2012-07-21

Added Ubuntu SSO websites

=== 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 @@
 define('LAUNCHPAD_TESTING_OP', LAUNCHPAD_TESTING_URL . '+openid');
 define('LAUNCHPAD_STAGING_URL', 'https://login.staging.launchpad.net/');
 define('LAUNCHPAD_STAGING_OP', LAUNCHPAD_STAGING_URL . '+openid');
+define('UBUNTU_SSO_PRODUCTION_URL', 'https://login.ubuntu.com/');
+define('UBUNTU_SSO_PRODUCTION_OP', UBUNTU_SSO_PRODUCTION_URL . '+openid');
+define('UBUNTU_SSO_STAGING_URL', 'https://login.staging.ubuntu.com/');
+define('UBUNTU_SSO_STAGING_OP', UBUNTU_SSO_STAGING_URL . '+openid');
 
 /**
  * Implements hook_menu().
@@ -344,7 +348,10 @@
 function get_expected_endpoint() {
   $endpoints = array(LAUNCHPAD_PRODUCTION_URL => LAUNCHPAD_PRODUCTION_OP,
                       LAUNCHPAD_TESTING_URL => LAUNCHPAD_TESTING_OP,
-                      LAUNCHPAD_STAGING_URL => LAUNCHPAD_STAGING_OP);
+                      LAUNCHPAD_STAGING_URL => LAUNCHPAD_STAGING_OP,
+                      LAUNCHPAD_STAGING_URL => LAUNCHPAD_STAGING_OP,
+                      UBUNTU_SSO_PRODUCTION_URL => UBUNTU_SSO_PRODUCTION_OP,
+                      UBUNTU_SSO_STAGING_URL => UBUNTU_SSO_STAGING_OP);
   $current_server = variable_get('openid_launchpad_server', LAUNCHPAD_PRODUCTION_URL);
   return $endpoints[$current_server];
 }
@@ -426,10 +433,12 @@
     '#type'    => 'radios',
     '#title'   => t('Select server'),
     '#options' => array(
-      LAUNCHPAD_PRODUCTION_URL => t('Production') . " (" . LAUNCHPAD_PRODUCTION_URL . ")",
-      LAUNCHPAD_STAGING_URL    => t('Staging') . " (" . LAUNCHPAD_STAGING_URL . ")",
-      LAUNCHPAD_TESTING_URL    => t('Testing') . " (" . LAUNCHPAD_TESTING_URL . ")",
-    ),
+        LAUNCHPAD_PRODUCTION_URL  => t('Production') . " (" . LAUNCHPAD_PRODUCTION_URL . ")",
+        LAUNCHPAD_STAGING_URL     => t('Staging') . " (" . LAUNCHPAD_STAGING_URL . ")",
+        LAUNCHPAD_TESTING_URL     => t('Testing') . " (" . LAUNCHPAD_TESTING_URL . ")",
+        UBUNTU_SSO_PRODUCTION_URL => t('Ubuntu SSO production') . " (" . UBUNTU_SSO_PRODUCTION_URL . ")",
+        UBUNTU_SSO_STAGING_URL    => t('Ubuntu SSO staging') . " (" . UBUNTU_SSO_STAGING_URL . ")",
+   ),
     '#default_value' => variable_get('openid_launchpad_server', LAUNCHPAD_PRODUCTION_URL),
   );
   $form['sso'] = array(