Changeset 21584 for extensions/oAuth/include

Timestamp:

Mar 15, 2013, 6:43:07 PM (11 years ago)

Author:

mistic100

Message:

don't delete keys when the provider is removed, hide fieldset when no provider active, use jQuery instead of $

Location:

extensions/oAuth/include

Files:

• providers_stats.inc.php (modified) (11 diffs)
• public_events.inc.php (modified) (6 diffs)

extensions/oAuth/include/providers_stats.inc.php

@@ -7 +7 @@
     'require_client_id' => true,
     'new_app_link'      => 'https://developers.facebook.com/apps',
-    'userguide_section' => 'http://hybridauth.sourceforge.net/userguide/IDProvider_info_Facebook.html',
     'scope'             => 'email',
   ),
@@ -17 +16 @@
     'require_client_id' => true,
     'new_app_link'      => 'https://code.google.com/apis/console',
-    'userguide_section' => 'http://hybridauth.sourceforge.net/userguide/IDProvider_info_Google.html',
     'scope'             => 'https://www.googleapis.com/auth/userinfo.profile https://www.googleapis.com/auth/userinfo.email',
   ),
@@ -26 +24 @@
     'require_client_id' => true,
     'new_app_link'      => 'http://instagram.com/developer/clients/manage',
-    'userguide_section' => null,
   ),
   'LinkedIn' => array( 
@@ -32 +29 @@
     'provider_name'     => 'LinkedIn',
     'new_app_link'      => 'https://www.linkedin.com/secure/developer',
-    'userguide_section' => 'http://hybridauth.sourceforge.net/userguide/IDProvider_info_LinkedIn.html',
   ),
   'Tumblr' => array(
@@ -38 +34 @@
     'provider_name'     => 'Tumblr',
     'new_app_link'      => 'http://www.tumblr.com/oauth/apps',
-    'userguide_section' => 'http://hybridauth.sourceforge.net/userguide/IDProvider_info_Tumblr.html',
   ),
   'Twitter' => array( 
@@ -44 +39 @@
     'provider_name'     => 'Twitter',
     'new_app_link'      => 'https://dev.twitter.com/apps',
-    'userguide_section' => 'http://hybridauth.sourceforge.net/userguide/IDProvider_info_Twitter.html',
   ),
   'Live' => array( 
@@ -51 +45 @@
     'require_client_id' => true,
     'new_app_link'      => 'https://manage.dev.live.com/ApplicationOverview.aspx',
-    'userguide_section' => 'http://hybridauth.sourceforge.net/userguide/IDProvider_info_Live.html',
   ),
   'Yahoo' => array( 
@@ -57 +50 @@
     'provider_name'     => 'Yahoo!',
     'new_app_link'      => 'https://developer.apps.yahoo.com/projects/',
-    'userguide_section' => 'http://hybridauth.sourceforge.net/userguide/IDProvider_info_Yahoo.html',
   ),
   'OpenID' => array( 
@@ -63 +55 @@
     'provider_name'     => 'OpenID',
     'new_app_link'      => null,
-    'userguide_section' => 'http://hybridauth.sourceforge.net/userguide/IDProvider_info_OpenID.html',
   ),
   'Flickr' => array( 
@@ -69 +60 @@
     'provider_name'     => 'Flickr',
     'new_app_link'      => null,
-    'userguide_section' => 'http://hybridauth.sourceforge.net/userguide/IDProvider_info_OpenID.html',
   ),
   'Wordpress' => array( 
@@ -75 +65 @@
     'provider_name'     => 'Wordpress',
     'new_app_link'      => null,
-    'userguide_section' => 'http://hybridauth.sourceforge.net/userguide/IDProvider_info_OpenID.html',
   ),
 );

extensions/oAuth/include/public_events.inc.php

@@ -61 +61 @@
       $adapter = $hybridauth->authenticate($provider);
       $remote_user = $adapter->getUserProfile();
+      
+      // security, check remote identifier
+      if ($remote_user->identifier != $user_identifier)
+      {
+        pwg_unset_session_var('oauth_new_user');
+        throw new Exception('Hacking attempt!');
+      }
     
       $template->assign(array(
@@ -73 +80 @@
       
       $oauth_id = $provider.'---'.$remote_user->identifier;
-      
-      // security, check remote identifier
-      if ($remote_user->identifier != $user_identifier)
-      {
-        pwg_unset_session_var('oauth_new_user');
-        throw new Exception('Hacking attempt!');
-      }
       
       // form submited
@@ -96 +96 @@
           $user_id = get_userid($_POST['login']);
           
-          // udpdate oauth field
+          // update oauth field
           $query = '
 UPDATE '.USERS_TABLE.'
@@ -235 +235 @@
   $template->assign('REDIRECT_TO', get_gallery_home_url());
   
-  $template->set_prefilter('menubar', 'oauth_add_menubar_buttons');
+  $template->set_prefilter('menubar', 'oauth_add_menubar_buttons_prefilter');
 }
 
@@ -254 +254 @@
   $add = 'disabled="disabled" ';
   $script = '
-{footer_script}{literal}
+{footer_script}
 jQuery("input[type=\'password\'], input[name=\'send_password_by_mail\']").parent("li").css("display", "none");
-{/literal}{/footer_script}';
+{/footer_script}';
 
   $content = str_replace($search, $search.$add, $content);
@@ -269 +269 @@
 }
 
-function oauth_add_menubar_buttons($content)
+function oauth_add_menubar_buttons_prefilter($content)
 {
   $search = '{include file=$block->template|@get_extent:$id }';