Changeset 20323 for extensions/oAuth/include

Timestamp:

Jan 22, 2013, 1:43:58 PM (12 years ago)

Author:

mistic100

Message:

fix redirect error, provide 3 sizes of icons, display login info on register page

Location:

extensions/oAuth/include

Files:

• install.inc.php (modified) (1 diff)
• public_events.inc.php (modified) (9 diffs)

extensions/oAuth/include/install.inc.php

@@ -11 +11 @@
       'display_menubar' => true,
       'display_register' => true,
+      'identification_icon' => '38px',
+      'menubar_icon' => '26px',
       ));
   

extensions/oAuth/include/public_events.inc.php

@@ -7 +7 @@
 function oauth_begin_identification()
 {
-  global $template;
-  
-  // template icons
-  if ($template->get_template_vars('OAUTH_URL') == null)
-  {
-    $template->assign(array(
-      'OAUTH_URL' => get_root_url() . OAUTH_PATH . 'auth.php?provider=',
-      'OAUTH_PATH' => OAUTH_PATH,
-      'OAUTH_ABS_PATH' => realpath(OAUTH_PATH) . '/',
-      'PROVIDERS' => get_activated_providers(),
-    ));
-  }
-  
+  global $template, $conf;
+  
+  oauth_assign_template_vars();
   $template->assign('REDIRECT_TO', !empty($_GET['redirect']) ? urldecode($_GET['redirect']) : get_gallery_home_url());
   
@@ -58 +48 @@
 function oauth_begin_register()
 {
-  global $conf, $template, $hybridauth_conf;
+  global $conf, $template, $hybridauth_conf, $page;
   
   // comming from identification page
@@ -71 +61 @@
       $adapter = $hybridauth->authenticate($provider);
       $remote_user = $adapter->getUserProfile();
+    
+      $template->assign(array(
+        'OAUTH_PROVIDER' => $provider,
+        'OAUTH_USERNAME' => $remote_user->displayName,
+        'OAUTH_PROFILE_URL' => $remote_user->profileURL,
+        'OAUTH_AVATAR' => $remote_user->photoURL,
+        'OAUTH_PATH' => OAUTH_PATH,
+        ));
+        
+      array_push($page['infos'], l10n('Your registration is almost done, please complete the registration form.'));
       
       $oauth_id = $provider.'---'.$remote_user->identifier;
@@ -119 +119 @@
       
       // template
+      $template->set_prefilter('register', 'oauth_add_profile_prefilter');
       $template->set_prefilter('register', 'oauth_remove_password_fields_prefilter');
     }
@@ -128 +129 @@
   else if ($conf['oauth']['display_register'])
   {
-    // template icons
-    if ($template->get_template_vars('OAUTH_URL') == null)
-    {
-      $template->assign(array(
-        'OAUTH_URL' => get_root_url() . OAUTH_PATH . 'auth.php?provider=',
-        'OAUTH_PATH' => OAUTH_PATH,
-        'OAUTH_ABS_PATH' => realpath(OAUTH_PATH) . '/',
-        'PROVIDERS' => get_activated_providers(),
-        ));
-    }
-    
+    oauth_assign_template_vars();
     $template->assign('REDIRECT_TO', get_gallery_home_url());
     
@@ -178 +169 @@
       'OAUTH_PROVIDER' => $provider,
       'OAUTH_USERNAME' => $remote_user->displayName,
-      'OAUTH_URL' => $remote_user->profileURL,
+      'OAUTH_PROFILE_URL' => $remote_user->profileURL,
       'OAUTH_AVATAR' => $remote_user->photoURL,
       'OAUTH_PATH' => OAUTH_PATH,
@@ -241 +232 @@
   }
   
-  if ($template->get_template_vars('OAUTH_URL') == null)
-  {
-    $template->assign(array(
-      'OAUTH_URL' => get_root_url() . OAUTH_PATH . 'auth.php?provider=',
-      'OAUTH_PATH' => OAUTH_PATH,
-      'OAUTH_ABS_PATH' => realpath(OAUTH_PATH) . '/',
-      'PROVIDERS' => get_activated_providers(),
-      ));
-  }
-  
+  oauth_assign_template_vars();
   $template->assign('REDIRECT_TO', get_gallery_home_url());
   
@@ -282 +264 @@
 function oauth_add_profile_prefilter($content)
 {
-  $search = '<legend>{\'Registration\'|@translate}</legend>';
+  $search = '#</legend>#';
   $add = file_get_contents(OAUTH_PATH . 'template/profile.tpl');
-  return str_replace($search, $search.$add, $content);
+  return preg_replace($search, '</legend> '.$add, $content, 1);
 }
 
@@ -294 +276 @@
 }
 
+
+function oauth_assign_template_vars()
+{
+  global $template, $conf;
+  
+  if ($template->get_template_vars('OAUTH_URL') == null)
+  {
+    $template->assign(array(
+      'oauth' => $conf['oauth'],
+      'OAUTH_URL' => get_root_url() . OAUTH_PATH . 'auth.php?provider=',
+      'OAUTH_PATH' => OAUTH_PATH,
+      'OAUTH_ABS_PATH' => realpath(OAUTH_PATH) . '/',
+      'PROVIDERS' => get_activated_providers(),
+      'ABS_ROOT_URL' => get_gallery_home_url(),
+      ));
+  }
+}
 ?>