diff --git a/e107_plugins/social/admin_config.php b/e107_plugins/social/admin_config.php index e058289ec..8f9923e38 100644 --- a/e107_plugins/social/admin_config.php +++ b/e107_plugins/social/admin_config.php @@ -158,7 +158,7 @@ class social_ui extends e_admin_ui "keys" => array ( "id" => "", "secret" => "" ), "trustForwarded" => false, // A comma-separated list of permissions you want to request from the user. See the Facebook docs for a full list of available permissions: http://developers.facebook.com/docs/reference/api/permissions. - "scope" => "", + "scope" => "email", // The display context to show the authentication page. Options are: page, popup, iframe, touch and wap. Read the Facebook docs for more details: http://developers.facebook.com/docs/reference/dialogs#display. Default: page "display" => "" @@ -171,13 +171,14 @@ class social_ui extends e_admin_ui "Github" => array ( "enabled" => true, - "keys" => array ( "id" => "", "secret" => "" ) + "keys" => array ( "id" => "", "secret" => "" ), + "scope" => "user:email", ), "Google" => array ( "enabled" => true, "keys" => array ( "id" => "", "secret" => "" ), - "scope" => "" + "scope" => "email" ), /* "Instagram" => array ( @@ -319,6 +320,7 @@ class social_ui extends e_admin_ui + @@ -326,6 +328,7 @@ class social_ui extends e_admin_ui ".LAN_SOCIAL_ADMIN_04." ".LAN_SOCIAL_ADMIN_05." ".LAN_SOCIAL_ADMIN_06." + ".LAN_SOCIAL_ADMIN_38." ".LAN_SOCIAL_ADMIN_03." @@ -374,7 +377,9 @@ class social_ui extends e_admin_ui break; case 'scope': - $textScope .= $frm->hidden('social_login['.$prov.'][scope]','email'); + $eopt = array( 'size'=>'block-level'); + $keyCount[] = 1; + $textScope .= "".$frm->text('social_login['.$prov.'][scope]', vartrue($pref['social_login'][$prov]['scope']), 100, $eopt).""; break; default: @@ -389,16 +394,20 @@ class social_ui extends e_admin_ui - if(empty($keyCount)) - { - $textKeys = "  "; - } - elseif(count($keyCount) == 1) - { - $textKeys .= " "; - } + if(empty($keyCount)) + { + $textKeys = "   "; + } + elseif(count($keyCount) == 1) + { + $textKeys .= "  "; + } + elseif(count($keyCount) == 2) + { + $textKeys .= " "; + } - $text .= $textKeys."".$textEnabled.$textScope.""; + $text .= $textKeys.$textScope."".$textEnabled.""; $text .= " diff --git a/e107_plugins/social/languages/English/English_admin.php b/e107_plugins/social/languages/English/English_admin.php index 4623d8a51..905671a7a 100644 --- a/e107_plugins/social/languages/English/English_admin.php +++ b/e107_plugins/social/languages/English/English_admin.php @@ -45,6 +45,6 @@ define("LAN_SOCIAL_ADMIN_34", "Number of tweets to display."); define("LAN_SOCIAL_ADMIN_35", "Light"); define("LAN_SOCIAL_ADMIN_36", "Dark"); define("LAN_SOCIAL_ADMIN_37", "Open Graph Meta"); - +define("LAN_SOCIAL_ADMIN_38", "Scope");