Changeset 26604 for extensions/oAuth/admin/providers.php

Timestamp:

Jan 10, 2014, 9:51:32 PM (10 years ago)

Author:

mistic100

Message:

clean templating + allow to use Steam/Wordpress/Flickr without displaying OpenID

File:

• extensions/oAuth/admin/providers.php (modified) (4 diffs)

extensions/oAuth/admin/providers.php

@@ -8 +8 @@
 if (isset($_POST['save_config']))
 {
-  $providers = array();
+  $providers = array(); $count_enabled = 0;
   foreach ($_POST['providers'] as $id => $data)
   {
     $data['enabled'] = $data['enabled']=='true';
+    if ($data['enabled']) $count_enabled++;
     
     if ($PROVIDERS_CONFIG[$id]['new_app_link'] and $data['enabled'])
@@ -21 +22 @@
         $page['errors'][] = l10n('%s: invalid keys', $PROVIDERS_CONFIG[$id]['provider_name']);
       }
-    }
-    
-    if ( ($id=='Wordpress' or $id=='Flickr' or $id=='Steam') and $data['enabled'] and !@$providers['OpenID']['enabled'] ) // in the template, OpenID must be before other OpenID based providers
-    {
-      $page['errors'][] = l10n('OpenID must be enabled in order to use %s authentication', $id);
     }
     
@@ -43 +39 @@
   
   $hybridauth_conf['providers'] = $providers;
+  $hybridauth_conf['total'] = count($hybridauth_conf['providers']);
+  $hybridauth_conf['enabled'] = $count_enabled;
   
   if (!count($page['errors']))
@@ -48 +46 @@
     // generate config file
     $content = "<?php\ndefined('PHPWG_ROOT_PATH') or die('Hacking attempt!');\n\nreturn ";
-    $content.= var_export(array('providers'=>$providers), true);
+    $content.= var_export(array_intersect_key($hybridauth_conf, array_flip(array('providers','total','enabled'))), true);
     $content.= ";\n?>";