Changeset 20301 for extensions/oAuth/include/public_events.inc.php

Timestamp:

Jan 20, 2013, 9:41:55 PM (11 years ago)

Author:

mistic100

Message:

clean code

File:

• extensions/oAuth/include/public_events.inc.php (modified) (12 diffs)

extensions/oAuth/include/public_events.inc.php

@@ -7 +7 @@
 function oauth_begin_identification()
 {
-  global $template, $conf, $page, $hybridauth_conf;
-  
-  if (isset($_GET['redirect']))
-  {
-    pwg_set_session_var('oauth_redirect', $_GET['redirect']);
-  }
-  else
-  {
-    pwg_unset_session_var('oauth_redirect');
-  }
+  global $template;
   
   // template icons
@@ -22 +13 @@
   {
     $template->assign(array(
-      'OAUTH_URL' => get_root_url().OAUTH_PATH.'auth.php?provider=',
+      'OAUTH_URL' => get_root_url() . OAUTH_PATH . 'auth.php?provider=',
       'OAUTH_PATH' => OAUTH_PATH,
-      'OAUTH_ABS_PATH' => realpath(OAUTH_PATH).'/',
+      'OAUTH_ABS_PATH' => realpath(OAUTH_PATH) . '/',
       'PROVIDERS' => get_activated_providers(),
     ));
@@ -52 +43 @@
     list($oauth_id) = pwg_db_fetch_row($result);
     list($provider) = explode('---', $oauth_id);
-    $_SESSION['page_errors'][] = 'You registered with a '.ucfirst($provider).' account, please login with the same account.';
+    $_SESSION['page_errors'][] = sprintf(l10n('You registered with a %s account, please sign in with the same account.'), $provider);
     
     $redirect_to = get_root_url().'identification.php';
@@ -68 +59 @@
 {
   global $conf, $template, $hybridauth_conf;
-  
-  if (!$conf['oauth']['display_register'])
-  {
-    return;
-  }
   
   // comming from identification page
@@ -135 +121 @@
       $template->set_prefilter('register', 'oauth_remove_password_fields_prefilter');
     }
-    catch( Exception $e ){
-      die($e->getMessage());
+    catch (Exception $e) {
+      array_push($page['errors'], sprintf(l10n('An error occured, please contact the gallery owner. <i>Error code : %s</i>'), $e->getCode()));
     }
   }
-  else
+  // display login buttons
+  else if ($conf['oauth']['display_register'])
   {
     // template icons
@@ -145 +132 @@
     {
       $template->assign(array(
-        'OAUTH_URL' => get_root_url().OAUTH_PATH.'auth.php?provider=',
+        'OAUTH_URL' => get_root_url() . OAUTH_PATH . 'auth.php?provider=',
         'OAUTH_PATH' => OAUTH_PATH,
-        'OAUTH_ABS_PATH' => realpath(OAUTH_PATH).'/',
+        'OAUTH_ABS_PATH' => realpath(OAUTH_PATH) . '/',
         'PROVIDERS' => get_activated_providers(),
         ));
@@ -189 +176 @@
     
     $template->assign(array(
-      'OAUTH_PROVIDER' => ucfirst($provider),
+      'OAUTH_PROVIDER' => $provider,
       'OAUTH_USERNAME' => $remote_user->displayName,
       'OAUTH_URL' => $remote_user->profileURL,
@@ -197 +184 @@
     
     $template->set_prefilter('profile_content', 'oauth_add_profile_prefilter');
-  }
-  catch( Exception $e ){
-    die($e->getMessage());
-  }
-  
-  
-  $template->set_prefilter('profile_content', 'oauth_remove_password_fields_prefilter');
+    $template->set_prefilter('profile_content', 'oauth_remove_password_fields_prefilter');
+  }
+  catch (Exception $e) {
+    array_push($page['errors'], sprintf(l10n('An error occured, please contact the gallery owner. <i>Error code : %s</i>'), $e->getCode()));
+  }
 }
 
@@ -236 +221 @@
     $adapter->logout();
   }
-  catch( Exception $e ){
-    die($e->getMessage());
+  catch (Exception $e) {
+    $_SESSION['page_errors'][] = sprintf(l10n('An error occured, please contact the gallery owner. <i>Error code : %s</i>'), $e->getCode());
   }
 }
@@ -249 +234 @@
   global $template, $conf;
   
-  if (!$conf['oauth']['display_menubar'])
+  $menu = &$menu_ref_arr[0];  
+  
+  if ( !$conf['oauth']['display_menubar'] or $menu->get_block('mbIdentification') == null )
   {
     return;
   }
   
-  $menu = &$menu_ref_arr[0];  
-  
-  if ($menu->get_block('mbIdentification') == null)
-  {
-    return;
-  }
-  
   if ($template->get_template_vars('OAUTH_URL') == null)
   {
     $template->assign(array(
-      'OAUTH_URL' => get_root_url().OAUTH_PATH.'auth.php?provider=',
+      'OAUTH_URL' => get_root_url() . OAUTH_PATH . 'auth.php?provider=',
       'OAUTH_PATH' => OAUTH_PATH,
-      'OAUTH_ABS_PATH' => realpath(OAUTH_PATH).'/',
+      'OAUTH_ABS_PATH' => realpath(OAUTH_PATH) . '/',
       'PROVIDERS' => get_activated_providers(),
       ));
@@ -283 +263 @@
 {
   $search = '</form>';
-  $add = file_get_contents(OAUTH_PATH.'template/identification_page.tpl');
+  $add = file_get_contents(OAUTH_PATH . 'template/identification_page.tpl');
   return str_replace($search, $search.$add, $content);
 }
@@ -310 +290 @@
 {
   $search = '{include file=$block->template|@get_extent:$id }';
-  $add = file_get_contents(OAUTH_PATH.'template/identification_menubar.tpl');
+  $add = file_get_contents(OAUTH_PATH . 'template/identification_menubar.tpl');
   return str_replace($search, $search.$add, $content);
 }