mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-03 05:07:27 +02:00
Code Issues Releases Wiki Activity

Issue #2055 - Ability to set a "scope" for HybridAuth provider.

Browse Source
This commit is contained in:
Lóna Lore
2016-11-30 19:24:08 +01:00
parent b8cfac8dd7
commit 57cb4308db
2 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
e107_plugins/social/admin_config.php
View File

@@ -158,7 +158,7 @@ class social_ui extends e_admin_ui
"keys" => array ( "id" => "", "secret" => "" ), "keys" => array ( "id" => "", "secret" => "" ),
"trustForwarded" => false, "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. // 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 // 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" => "" "display" => ""
@@ -171,13 +171,14 @@ class social_ui extends e_admin_ui
"Github" => array ( "Github" => array (
"enabled" => true, "enabled" => true,
"keys" => array ( "id" => "", "secret" => "" ) "keys" => array ( "id" => "", "secret" => "" ),
"scope" => "user:email",
), ),
"Google" => array ( "Google" => array (
"enabled" => true, "enabled" => true,
"keys" => array ( "id" => "", "secret" => "" ), "keys" => array ( "id" => "", "secret" => "" ),
"scope" => "" "scope" => "email"
), ),
/* /*
"Instagram" => array ( "Instagram" => array (
@@ -319,6 +320,7 @@ class social_ui extends e_admin_ui
<col style='width:10%' /> <col style='width:10%' />
<col class='col-control' /> <col class='col-control' />
<col class='col-control' /> <col class='col-control' />
<col class='col-control' />
<col style='width:20%' /> <col style='width:20%' />
</colgroup> </colgroup>
<thead> <thead>
@@ -326,6 +328,7 @@ class social_ui extends e_admin_ui
<th>".LAN_SOCIAL_ADMIN_04."</th> <th>".LAN_SOCIAL_ADMIN_04."</th>
<th>".LAN_SOCIAL_ADMIN_05."</th> <th>".LAN_SOCIAL_ADMIN_05."</th>
<th>".LAN_SOCIAL_ADMIN_06."</th> <th>".LAN_SOCIAL_ADMIN_06."</th>
<th>".LAN_SOCIAL_ADMIN_38."</th>
<th class='center'>".LAN_SOCIAL_ADMIN_03."</th> <th class='center'>".LAN_SOCIAL_ADMIN_03."</th>
</tr> </tr>
</thead> </thead>
@@ -374,7 +377,9 @@ class social_ui extends e_admin_ui
break; break;
case 'scope': case 'scope':
$textScope .= $frm->hidden('social_login['.$prov.'][scope]','email'); $eopt = array( 'size'=>'block-level');
$keyCount[] = 1;
$textScope .= "<td>".$frm->text('social_login['.$prov.'][scope]', vartrue($pref['social_login'][$prov]['scope']), 100, $eopt)."</td>";
break; break;
default: default:
@@ -391,14 +396,18 @@ class social_ui extends e_admin_ui
if(empty($keyCount)) if(empty($keyCount))
{ {
$textKeys = "<td>&nbsp;</td><td>&nbsp;</td>"; $textKeys = "<td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>";
} }
elseif(count($keyCount) == 1) elseif(count($keyCount) == 1)
{
$textKeys .= "<td>&nbsp;</td><td>&nbsp;</td>";
}
elseif(count($keyCount) == 2)
{ {
$textKeys .= "<td>&nbsp;</td>"; $textKeys .= "<td>&nbsp;</td>";
} }
$text .= $textKeys."<td class='center'>".$textEnabled.$textScope."</td>"; $text .= $textKeys.$textScope."<td class='center'>".$textEnabled."</td>";
$text .= " $text .= "
</tr> </tr>

2
e107_plugins/social/languages/English/English_admin.php
View File

@@ -45,6 +45,6 @@ define("LAN_SOCIAL_ADMIN_34", "Number of tweets to display.");
define("LAN_SOCIAL_ADMIN_35", "Light"); define("LAN_SOCIAL_ADMIN_35", "Light");
define("LAN_SOCIAL_ADMIN_36", "Dark"); define("LAN_SOCIAL_ADMIN_36", "Dark");
define("LAN_SOCIAL_ADMIN_37", "Open Graph Meta"); define("LAN_SOCIAL_ADMIN_37", "Open Graph Meta");
define("LAN_SOCIAL_ADMIN_38", "Scope");