mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-31 20:00:37 +02:00
Code Issues Releases Wiki Activity

Moved all social prefs (login/xurls etc) into the "Social" plugin admin area. Extended admin-ui with renderHelp() method for adding a help panel from within the admin-ui.

Browse Source
This commit is contained in:
Cameron
2015-04-08 20:20:10 -07:00
parent 1078c9c84c
commit d543ab71ff
9 changed files with 363 additions and 255 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
e107_admin/cpage.php
View File

@@ -740,9 +740,14 @@ class page_admin_ui extends e_admin_ui
}
function afterDelete() //TODO Delete Menu item.
{
}
}

239
e107_admin/prefs.php
View File

@@ -1401,94 +1401,6 @@ $text .= "
// =========== Registration Preferences. ==================
// Single/ Social Login / / copied from hybridAuth config.php so it's easy to add more.
// Used Below.
$social_logins = array (
// openid providers
"OpenID" => array (
"enabled" => true
),
"Yahoo" => array (
"enabled" => true
),
"AOL" => array (
"enabled" => true
),
"Facebook" => array (
"enabled" => true,
"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" => "",
// 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" => ""
),
"Foursquare" => array (
"enabled" => true,
"keys" => array ( "id" => "", "secret" => "" )
),
"Github" => array (
"enabled" => true,
"keys" => array ( "id" => "", "secret" => "" )
),
"Google" => array (
"enabled" => true,
"keys" => array ( "id" => "", "secret" => "" ),
"scope" => ""
),
"LinkedIn" => array (
"enabled" => true,
"keys" => array ( "key" => "", "secret" => "" )
),
// windows live
"Live" => array (
"enabled" => true,
"keys" => array ( "id" => "", "secret" => "" )
),
/*
"MySpace" => array (
"enabled" => true,
"keys" => array ( "key" => "", "secret" => "" )
),
*/
"Twitter" => array (
"enabled" => true,
"keys" => array ( "key" => "", "secret" => "" )
),
);
$social_external = array(
"Facebook" => "https://developers.facebook.com/apps",
"Twitter" => "https://dev.twitter.com/apps/new",
"Google" => "https://code.google.com/apis/console/",
"Live" => "https://manage.dev.live.com/ApplicationOverview.aspx",
"LinkedIn" => "https://www.linkedin.com/secure/developer",
"Foursquare" => "https://www.foursquare.com/oauth/",
"Github" => "https://github.com/settings/applications/new",
);
$testUrl = SITEURL."?route=system/xup/test";
$elements = array(1=>'Register & Login', 2=> 'Login Only', 0=>LAN_DISABLED);
@@ -1501,7 +1413,7 @@ $text .= "
<col class='col-label' />
<col class='col-control' />
</colgroup>
<thead>
<tbody>
<tr>
<td><label for='user-reg'>".PRFLAN_224."</label></td>
<td>
@@ -1509,8 +1421,8 @@ $text .= "
<div class='smalltext field-help'>".PRFLAN_30."</div>
</td>
</tr>
</thead>
<tbody>
<tr>
<td><label for='user-reg-veri'>".PRFLAN_154."</label></td>
@@ -1604,91 +1516,9 @@ $text .= "
</tr>
</tbody>";
</tbody>
$text .= "
<thead>
<tr>
<th><label for='social-login-active'>Social Signup/Login</label>
</th>
<td>
".$frm->radio_switch('social_login_active', $pref['social_login_active'])."
<div class='smalltext field-help'>Allows users to signup/login with their social media accounts. When enabled, this option will still allow users to signup/login even if the core user registration system above is disabled. </div>
</td>
</tr>
</thead>
<tbody>
<tr><td colspan='2'><div>Note: In most cases you will need to obtain an id and secret key from one of the providers. Click the blue links below to configure.
<br />You may test your configuration with the following URL:
<a href='".$testUrl."' rel='external'>".$testUrl."</a></div>
</div>
</tr>
";
if(!is_array($pref['social_login']))
{
$pref['social_login'] = array();
}
foreach($social_logins as $prov=>$val)
{
$label = varset($social_external[$prov]) ? "<a class='e-tip' rel='external' title='Get a key from the provider' href='".$social_external[$prov]."'>".$prov."</a>" : $prov;
$radio_label = strtolower($prov);
$text .= "
<tr>
<td><label for='social-login-".$radio_label."-enabled'>".$label."</label></td>
<td>
";
foreach($val as $k=>$v)
{
switch ($k) {
case 'enabled':
$eopt = array('class'=>'e-expandit');
$text .= $frm->radio_switch('social_login['.$prov.'][enabled]', vartrue($pref['social_login'][$prov]['enabled']),'','',$eopt);
break;
case 'keys':
// $cls = vartrue($pref['single_login'][$prov]['keys'][$tk]) ? "class='e-hideme'" : '';
$sty = vartrue($pref['social_login'][$prov]['keys'][vartrue($tk)]) ? "" : "e-hideme";
$text .= "<div class='e-expandit-container {$sty}' id='option-{$prov}' >";
foreach($v as $tk=>$idk)
{
$eopt = array('placeholder'=> $tk, 'size'=>'xxlarge');
$text .= "<br />".$frm->text('social_login['.$prov.'][keys]['.$tk.']', vartrue($pref['social_login'][$prov]['keys'][$tk]), 100, $eopt);
}
$text .= "</div>";
break;
case 'scope':
$text .= $frm->hidden('social_login['.$prov.'][scope]','email');
break;
default:
break;
}
}
$text .= "</td>
</tr>
";
}
$text .= "
</tbody>
</table>
".pref_submit('registration')."
</fieldset>
@@ -1699,63 +1529,6 @@ $text .= "
// Key registration
// TODO LAN
$text .= "
<fieldset class='e-hideme' id='core-prefs-sociallogin'>
<legend>Social Options</legend>
<table class='table adminform'>
<colgroup>
<col class='col-label' />
<col class='col-control' />
</colgroup>
<tbody>
<tr>
<th colspan='2'>External Social Pages</th>
</tr>";
//XXX XURL Definitions.
$xurls = array(
'facebook' => array('label'=>"Facebook", "placeholder"=>"eg. https://www.facebook.com/e107CMS"),
'twitter' => array('label'=>"Twitter", "placeholder"=>"eg. https://twitter.com/e107"),
'youtube' => array('label'=>"Youtube", "placeholder"=>"eg.https://youtube.com/e107Inc"),
'google' => array('label'=>"Google+", "placeholder"=>""),
'linkedin' => array('label'=>"LinkedIn", "placeholder"=>"eg. http://www.linkedin.com/groups?home=&gid=1782682"),
'github' => array('label'=>"Github", "placeholder"=>"eg. https://github.com/e107inc"),
'flickr' => array('label'=>"Flickr", "placeholder"=>""),
'instagram' => array('label'=>"Instagram", "placeholder"=>""),
'pinterest' => array('label'=>"Pinterest", "placeholder"=>""),
'vimeo' => array('label'=>"Vimeo", "placeholder"=>""),
);
foreach($xurls as $k=>$var)
{
$keypref = "xurl[".$k."]";
$text_label = "xurl-".$k."";
$def = "XURL_". strtoupper($k);
$opts = array('size'=>'xxlarge','placeholder'=> $var['placeholder']);
$text .= "
<tr>
<td><label for='".$text_label."'>Your ".$var['label']." page</label></td>
<td>
".$frm->text($keypref, $pref['xurl'][$k], false, $opts)."
<div class='field-help'>Used by some themes to provide a link to your ".$var['label']." page. (".$def.")</div>
</td>
</tr>
";
}
$text .= "
</tbody>
</table>
".pref_submit('sociallogin')."
</fieldset>
";
@@ -2670,7 +2443,7 @@ function prefs_adminmenu()
$var['core-prefs-email']['text'] = "Email &amp; Contact Info";
$var['core-prefs-registration']['text'] = PRFLAN_28;
$var['core-prefs-signup']['text'] = PRFLAN_19;
$var['core-prefs-sociallogin']['text'] = "Social Options";
// $var['core-prefs-sociallogin']['text'] = "Social Options"; // Moved into plugin.
$var['core-prefs-comments']['text'] = PRFLAN_210;
$var['core-prefs-uploads']['text'] = "File Uploading"; // TODO LAN

6
e107_core/shortcodes/batch/admin_shortcodes.php
View File

@@ -137,6 +137,12 @@ class admin_shortcodes
$ns = e107::getRender();
$pref = e107::getPref();
if($tmp = e107::getRegistry('core/e107/adminui/help'))
{
return $ns->tablerender($tmp['caption'],$tmp['text'],'e_help',true);
}
if(function_exists('e_help') && ($tmp = e_help())) // new in v2.x for non-admin-ui admin pages.
{

11
e107_core/shortcodes/batch/news_shortcodes.php
View File

@@ -30,6 +30,8 @@ class news_shortcodes extends e_shortcode
//protected $param; - shouldn't be set - see __set/__get methods of e_shortcode & news::render_newsitem()
protected $commentsDisabled;
protected $commentsEngine = 'e107';
private $imageItem;
@@ -42,6 +44,11 @@ class news_shortcodes extends e_shortcode
$pref = e107::getPref();
$this->commentsDisabled = vartrue($pref['comments_disabled']);
if(!empty($pref['comments_engine']))
{
$this->commentsEngine = $pref['comments_engine'];
}
}
function sc_newstitle()
@@ -269,9 +276,9 @@ class news_shortcodes extends e_shortcode
*/
function sc_newscommentcount($parm='')
{
if($this->commentsDisabled)
if($this->commentsDisabled || ($this->commentsEngine != 'e107'))
{
return;
return;
}
$text = varset($parm['glyph']) ? e107::getParser()->toGlyph($parm['glyph']) : "";

17
e107_handlers/admin_ui.php
View File

@@ -1541,8 +1541,8 @@ class e_admin_dispatcher
*/
function renderHelp()
{
}
@@ -4142,6 +4142,17 @@ class e_admin_ui extends e_admin_controller_ui
$this->addTitle($this->pluginTitle, true)->parseAliases();
$this->initAdminAddons();
if($help = $this->renderHelp())
{
if(!empty($help))
{
e107::setRegistry('core/e107/adminui/help',$help);
}
}
}
@@ -5133,6 +5144,8 @@ class e_admin_ui extends e_admin_controller_ui
{
}
/**
* User defined after-update logic
* @param $new_data

313
e107_plugins/social/admin_config.php
View File

@@ -30,10 +30,10 @@ class social_adminarea extends e_admin_dispatcher
// 'main/list' => array('caption'=> LAN_MANAGE, 'perm' => 'P'),
// 'main/create' => array('caption'=> LAN_CREATE, 'perm' => 'P'),
'main/configure' => array('caption'=> LAN_CONFIGURE, 'perm' => 'P'),
'main/prefs' => array('caption'=> LAN_PREFS, 'perm' => 'P'),
// 'main/custom' => array('caption'=> 'Custom Page', 'perm' => 'P')
);
protected $adminMenuAliases = array(
@@ -71,21 +71,127 @@ class social_ui extends e_admin_ui
protected $fieldpref = array();
protected $preftabs = array('Twitter Menu');
protected $preftabs = array('Facebook Comments', 'Twitter Menu');
protected $prefs = array(
'twitter_menu_height' => array('title'=> 'Height', 'type'=>'number', 'tab'=>0, 'data' => 'int','help'=>'Height in px'),
'twitter_menu_limit' => array('title'=> 'Limit', 'type'=>'number', 'tab'=>0, 'data' => 'int','help'=>'Number of tweets to display.'),
'facebook_comments_limit' => array('title'=> 'Limit', 'type'=>'number', 'tab'=>0, 'data' => 'int','help'=>'Number of tweets to display.'),
'facebook_comments_theme' => array('title'=> 'Theme', 'type'=>'dropdown', 'tab'=>0, 'writeParms'=>array('optArray'=>array('light'=>'Light','dark'=>'Dark')), 'data' => 'int','help'=>'Number of tweets to display.'),
'facebook_comments_loadingtext' => array('title'=> 'Text while loading', 'type'=>'text', 'tab'=>0, 'data' => 'int', 'writeParms'=>array('placeholder'=>'Loading...'), 'help'=>'Number of tweets to display.'),
'twitter_menu_height' => array('title'=> 'Height', 'type'=>'number', 'tab'=>1, 'data' => 'int','help'=>'Height in px'),
'twitter_menu_limit' => array('title'=> 'Limit', 'type'=>'number', 'tab'=>1, 'data' => 'int','help'=>'Number of tweets to display.'),
);
protected $social_logins = array();
protected $social_external = array();
public function init()
{
if(!empty($_POST['save_social']) )
{
$cfg = e107::getConfig();
$cfg->setPref('social_login', $_POST['social_login']);
$cfg->setPref('social_login_active', $_POST['social_login_active']);
$cfg->setPref('xurl', $_POST['xurl']);
$cfg->save(true, true, true);
}
// Single/ Social Login / / copied from hybridAuth config.php so it's easy to add more.
// Used Below.
$this->social_logins = array (
// openid providers
"OpenID" => array (
"enabled" => true
),
"Yahoo" => array (
"enabled" => true
),
"AOL" => array (
"enabled" => true
),
"Facebook" => array (
"enabled" => true,
"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" => "",
// 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" => ""
),
"Foursquare" => array (
"enabled" => true,
"keys" => array ( "id" => "", "secret" => "" )
),
"Github" => array (
"enabled" => true,
"keys" => array ( "id" => "", "secret" => "" )
),
"Google" => array (
"enabled" => true,
"keys" => array ( "id" => "", "secret" => "" ),
"scope" => ""
),
"LinkedIn" => array (
"enabled" => true,
"keys" => array ( "key" => "", "secret" => "" )
),
// windows live
"Live" => array (
"enabled" => true,
"keys" => array ( "id" => "", "secret" => "" )
),
/*
"MySpace" => array (
"enabled" => true,
"keys" => array ( "key" => "", "secret" => "" )
),
*/
"Twitter" => array (
"enabled" => true,
"keys" => array ( "key" => "", "secret" => "" )
),
);
$this->social_external = array(
"Facebook" => "https://developers.facebook.com/apps",
"Twitter" => "https://dev.twitter.com/apps/new",
"Google" => "https://code.google.com/apis/console/",
"Live" => "https://manage.dev.live.com/ApplicationOverview.aspx",
"LinkedIn" => "https://www.linkedin.com/secure/developer",
"Foursquare" => "https://www.foursquare.com/oauth/",
"Github" => "https://github.com/settings/applications/new",
);
// print_a($this->fields);
}
@@ -124,17 +230,196 @@ class social_ui extends e_admin_ui
// do something
}
/*
function renderHelp()
{
$this->testUrl = SITEURL."?route=system/xup/test";
$notice = "Note: In most cases you will need to obtain an id and secret key from one of the providers. Click the blue links below to configure.
<br />You may test your configuration with the following URL: <a href='".$this->testUrl."' rel='external'>".$this->testUrl."</a>";
return array("caption"=>"Help",'text'=> $notice);
}
// optional - a custom page.
public function customPage()
public function configurePage()
{
$ns = e107::getRender();
$text = 'Hello World!';
$ns->tablerender('Hello',$text);
$frm = e107::getForm();
$pref = e107::pref('core');
// e107::getMessage()->addInfo($notice);
$text = "<table class='table adminform'>
<colgroup>
<col class='col-label' />
<col class='col-control' />
</colgroup>
<tbody>
<tr>
<td><label for='social-login-active'>Social Signup/Login</label>
</td>
<td>
".$frm->radio_switch('social_login_active', $pref['social_login_active'])."
<div class='smalltext field-help'>Allows users to signup/login with their social media accounts. When enabled, this option will still allow users to signup/login even if the core user registration system above is disabled. </div>
</td>
</tr>
<tr>
<td>Application Keys and IDs <br /></td>
<td>
<table class='table table-bordered table-striped'>
<colgroup>
<col class='col-label' />
<col class='col-control' />
</colgroup>
";
if(!is_array($pref['social_login']))
{
$pref['social_login'] = array();
}
foreach($this->social_logins as $prov=>$val)
{
$label = varset($this->social_external[$prov]) ? "<a class='e-tip' rel='external' title='Get a key from the provider' href='".$social_external[$prov]."'>".$prov."</a>" : $prov;
$radio_label = strtolower($prov);
$text .= "
<tr>
<td><label for='social-login-".$radio_label."-enabled'>".$label."</label></td>
<td>
";
foreach($val as $k=>$v)
{
switch ($k) {
case 'enabled':
$eopt = array('class'=>'e-expandit');
$text .= $frm->radio_switch('social_login['.$prov.'][enabled]', vartrue($pref['social_login'][$prov]['enabled']),'','',$eopt);
break;
case 'keys':
// $cls = vartrue($pref['single_login'][$prov]['keys'][$tk]) ? "class='e-hideme'" : '';
$sty = vartrue($pref['social_login'][$prov]['keys'][vartrue($tk)]) ? "" : "e-hideme";
$text .= "<div class='e-expandit-container {$sty}' id='option-{$prov}' >";
foreach($v as $tk=>$idk)
{
$eopt = array('placeholder'=> $tk, 'size'=>'xxlarge');
$text .= "<br />".$frm->text('social_login['.$prov.'][keys]['.$tk.']', vartrue($pref['social_login'][$prov]['keys'][$tk]), 100, $eopt);
}
$text .= "</div>";
break;
case 'scope':
$text .= $frm->hidden('social_login['.$prov.'][scope]','email');
break;
default:
break;
}
}
$text .= "</td>
</tr>
";
}
$text .= "</table>
</td></tr>
</tbody></table>
";
// -------------------------------
//
//
$text2 = "
<table class='table'>
<colgroup>
<col class='col-label' />
<col class='col-control' />
</colgroup>
<tbody>
";
//XXX XURL Definitions.
$xurls = array(
'facebook' => array('label'=>"Facebook", "placeholder"=>"eg. https://www.facebook.com/e107CMS"),
'twitter' => array('label'=>"Twitter", "placeholder"=>"eg. https://twitter.com/e107"),
'youtube' => array('label'=>"Youtube", "placeholder"=>"eg.https://youtube.com/e107Inc"),
'google' => array('label'=>"Google+", "placeholder"=>""),
'linkedin' => array('label'=>"LinkedIn", "placeholder"=>"eg. http://www.linkedin.com/groups?home=&gid=1782682"),
'github' => array('label'=>"Github", "placeholder"=>"eg. https://github.com/e107inc"),
'flickr' => array('label'=>"Flickr", "placeholder"=>""),
'instagram' => array('label'=>"Instagram", "placeholder"=>""),
'pinterest' => array('label'=>"Pinterest", "placeholder"=>""),
'vimeo' => array('label'=>"Vimeo", "placeholder"=>""),
);
foreach($xurls as $k=>$var)
{
$keypref = "xurl[".$k."]";
$text_label = "xurl-".$k."";
$def = "XURL_". strtoupper($k);
$opts = array('size'=>'xxlarge','placeholder'=> $var['placeholder']);
$text2 .= "
<tr>
<td><label for='".$text_label."'>Your ".$var['label']." page</label></td>
<td>
".$frm->text($keypref, $pref['xurl'][$k], false, $opts)."
<div class='field-help'>Used by some themes to provide a link to your ".$var['label']." page. (".$def.")</div>
</td>
</tr>
";
}
$text2 .= "
</tbody>
</table>
";
$tabs = array();
$tabs[] = array('caption'=>"Apps", 'text'=>$text);
$tabs[] = array('caption'=>'Pages', 'text'=>$text2);
$ret = $frm->open('social','post',null, 'class=form-horizontal').$frm->tabs($tabs);
$ret .= "<div class='buttons-bar center'>
".$frm->button('save_social',1,'submit',LAN_SAVE)."
</div>";
$ret .= $frm->close();
return $ret;
}
*/
}

7
e107_plugins/social/e_comment.php
View File

@@ -81,9 +81,12 @@ class social_comment
$link = e_REQUEST_URL;
}
$pref = e107::pref('social');
$limit = vartrue($pref['facebook_comments_limit'], 10);
$theme = vartrue($pref['facebook_comments_theme'], 'light');
$loading = vartrue($pref['facebook_comments_loadingtext'], 'Loading...');
//TODO Consider adding prefs to colorscheme and number of posts to the social admin area.
$text = '<div class="fb-comments" data-href="'.$link.'" data-width="100%" data-numposts="10" data-colorscheme="light">Loading...</div>';
$text = '<div class="fb-comments" data-href="'.$link.'" data-width="100%" data-numposts="'.$limit.'" data-colorscheme="'.$theme.'">'.$loading.'</div>';
return $text;
}

9
e107_plugins/social/e_header.php
View File

@@ -3,6 +3,15 @@
if(USER_AREA)
{
e107::css('social', 'css/fontello.css');
$social = e107::pref('core','social_login');
$appID = vartrue($social['Facebook']['keys']['id']);
if(!empty($appID))
{
e107::meta('fb:app_id', $appID);
}
}

11
e107_plugins/social/plugin.xml
View File

@@ -1,6 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<e107Plugin name="Social" version="1.0" date="2012-12-01" compatibility="2.0" installRequired="false" >
<category>misc</category>
<e107Plugin name="Social" version="1.0" date="2012-12-01" compatibility="2.0" installRequired="true" >
<category>settings</category>
<author name="e107 Inc." email="devs@e107.org" />
<summary lan="">Adds Facebook, Twitter and other social media widgets to e107.</summary>
<description lan="">Adds options to replace the e107 comment engine with Facebook. Add Twitter feeds to your site. etc.</description>
<keywords>
<word>facebook</word>
<word>twitter</word>
</keywords>
<adminLinks>
<link url="admin_config.php" description="" icon="" iconSmall="" primary="true" >LAN_CONFIGURE</link>
</adminLinks>