Merge lp:~canonical-isd-hackers/wordpress-launchpad-integration/ubuntu-sso into lp:wordpress-launchpad-integration

[Szilveszter Farkas]

This branch adds the Ubuntu SSO service as an option to use for authentication.

[lp:~canonical-isd-hackers/wordpress-launchpad-integration/ubuntu-sso]

21. By Szilveszter Farkas on 2010-04-26

Fix spelling of the Ubuntu SSO service.

[Stuart Metcalfe (stuartmetcalfe)]

We discussed removing the hyphen from "Sign-On". Also, changing the constant name from LAUNCHPAD_SSO to UBUNTU_SSO but this will require more significant changes so we should hold off on this until we have better test coverage and more time. I notice the first change has already been done, and there's current no unit-test suite to build on, so this merge is approved.

review: Approve

=== modified file 'launchpad_login.php'
--- launchpad_login.php	2010-03-02 15:34:37 +0000
+++ launchpad_login.php	2010-04-26 15:04:27 +0000
@@ -89,13 +89,19 @@
         echo '<p class="message">' . apply_filters('login_messages', $messages) . "</p>\n";
     }
 }
+
+if (strpos(openid_launchpad_get_server(), 'ubuntu') === false) {
+    $login_button = __('Login with Launchpad');
+} else {
+    $login_button = __('Login with Ubuntu Single Sign On');
+}
 ?>
 <form name="loginform" id="loginform"
       action="<?php echo site_url('wp-login.php', 'login_post') ?>"
       method="post">
     <div class="submit">
       <input type="submit" name="launchpad" value="<?php echo
-        __('Login with Launchpad', 'openid'); ?>" id="lplogin" />
+        $login_button; ?>" id="lplogin" />
         <input type="hidden" name="redirect_to"
                value="<?php echo attribute_escape($redirect_to); ?>" />
         <input type="hidden" name="testcookie" value="1" />
 
=== modified file 'openid-launchpad.php'
--- openid-launchpad.php	2010-03-02 15:34:37 +0000
+++ openid-launchpad.php	2010-04-26 15:04:27 +0000
@@ -31,6 +31,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('LAUNCHPAD_SSO_PRODUCTION_URL', 'https://login.ubuntu.com/');
+define('LAUNCHPAD_SSO_PRODUCTION_OP', LAUNCHPAD_SSO_PRODUCTION_URL.'+openid');
+define('LAUNCHPAD_SSO_STAGING_URL', 'https://login.staging.ubuntu.com/');
+define('LAUNCHPAD_SSO_STAGING_OP', LAUNCHPAD_SSO_STAGING_URL.'+openid');
 
 define('LAUNCHPAD_USERPAGE_FORMAT', 'https://launchpad.net/~%s');
 
@@ -78,9 +82,11 @@
           <td>
             <p><select name="launchpad_server"><?php
             $options = array(
-              'PRODUCTION' => __('Production', 'openid-launchpad'),
-              'TESTING'    => __('Testing', 'openid-launchpad'),
-              'STAGING'    => __('Staging', 'openid-launchpad'),
+              'PRODUCTION'     => __('Production', 'openid-launchpad'),
+              'TESTING'        => __('Testing', 'openid-launchpad'),
+              'STAGING'        => __('Staging', 'openid-launchpad'),
+              'SSO_PRODUCTION' => __('Ubuntu SSO production', 'openid-launchpad'),
+              'SSO_STAGING'    => __('Ubuntu SSO staging', 'openid-launchpad'),
             );
             foreach ($options as $key => $label) {
               $selected = openid_launchpad_get_server();
@@ -280,7 +286,7 @@
  */
 function is_current_launchpad_endpoint($endpoint) {
   $current = openid_launchpad_get_server();
-  foreach (array('PRODUCTION', 'TESTING', 'STAGING') as $server) {
+  foreach (array('PRODUCTION', 'TESTING', 'STAGING', 'SSO_PRODUCTION', 'SSO_STAGING') as $server) {
     if (constant("LAUNCHPAD_{$server}_URL") == $current) {
       return constant("LAUNCHPAD_{$server}_OP") == $endpoint;
     }