Changeset 26608 for extensions/oAuth/template/identification_common.tpl

Timestamp:

Jan 11, 2014, 12:08:40 PM (10 years ago)

Author:

mistic100

Message:

finish updating guides, fix flow issues, update language file

File:

• extensions/oAuth/template/identification_common.tpl (modified) (6 diffs)

extensions/oAuth/template/identification_common.tpl

@@ -28 +28 @@
 function open_auth(url) {
   window.open(
-    url + '&t=' + (new Date()).getTime(), 
+    '{$OAUTH.u_login}' + url + '&key={$OAUTH.key}', 
     'hybridauth_social_sign_on', 
     'location=0,status=0,scrollbars=0,width=800,height=500'
@@ -45 +45 @@
         case 'OpenID':
           jQuery('#openid_label').html('{'Please enter your OpenID URL'|translate|escape:javascript}'); break;
-        case 'Wordpress': case 'Flickr': case 'Steam':
+        case 'Wordpress': case 'Steam':
           jQuery('#openid_label').html('{'Please enter your username'|translate|escape:javascript}'); break;
+        case 'Flickr': 
+          jQuery('#openid_label').html('{'Please enter your user ID'|translate|escape:javascript}'); break;
       }
       
@@ -70 +72 @@
       
     default:
-      open_auth('{$OAUTH.u_login}'+ idp);
+      open_auth(idp);
   }
 });
@@ -93 +95 @@
   }
 
-  open_auth('{$OAUTH.u_login}OpenID&openid_identifier=' + encodeURI(oi));
+  open_auth('OpenID&openid_identifier=' + encodeURI(oi));
 
   jQuery.colorbox.close();
@@ -111 +113 @@
 });
 
+{if not empty($OAUTH.persona_email)}
 jQuery('a[href$="act=logout"]').click(function(e) {
   e.preventDefault();
   navigator.id.logout();
 });
+{/if}
 
 navigator.id.watch({
@@ -124 +128 @@
       url: '{$OAUTH.u_login}Persona',
       dataType: 'json',
-      data: { assertion: assertion },
+      data: {
+        assertion: assertion,
+        key: '{$OAUTH.key}'
+      },
       success: function(data) {
         oauth_redirect(data.redirect_to);