reformat OpenIDPlugin for PHPCS
This commit is contained in:
parent
5b0b6097e0
commit
fcdbf421ab
|
@ -59,6 +59,8 @@ class OpenIDPlugin extends Plugin
|
||||||
*
|
*
|
||||||
* Hook for RouterInitialized event.
|
* Hook for RouterInitialized event.
|
||||||
*
|
*
|
||||||
|
* @param Net_URL_Mapper $m URL mapper
|
||||||
|
*
|
||||||
* @return boolean hook return
|
* @return boolean hook return
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
@ -67,13 +69,27 @@ class OpenIDPlugin extends Plugin
|
||||||
$m->connect('main/openid', array('action' => 'openidlogin'));
|
$m->connect('main/openid', array('action' => 'openidlogin'));
|
||||||
$m->connect('main/openidtrust', array('action' => 'openidtrust'));
|
$m->connect('main/openidtrust', array('action' => 'openidtrust'));
|
||||||
$m->connect('settings/openid', array('action' => 'openidsettings'));
|
$m->connect('settings/openid', array('action' => 'openidsettings'));
|
||||||
$m->connect('index.php?action=finishopenidlogin', array('action' => 'finishopenidlogin'));
|
$m->connect('index.php?action=finishopenidlogin',
|
||||||
$m->connect('index.php?action=finishaddopenid', array('action' => 'finishaddopenid'));
|
array('action' => 'finishopenidlogin'));
|
||||||
|
$m->connect('index.php?action=finishaddopenid',
|
||||||
|
array('action' => 'finishaddopenid'));
|
||||||
$m->connect('main/openidserver', array('action' => 'openidserver'));
|
$m->connect('main/openidserver', array('action' => 'openidserver'));
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Public XRDS output hook
|
||||||
|
*
|
||||||
|
* Puts the bits of code needed by some OpenID providers to show
|
||||||
|
* we're good citizens.
|
||||||
|
*
|
||||||
|
* @param Action $action Action being executed
|
||||||
|
* @param XMLOutputter &$xrdsOutputter Output channel
|
||||||
|
*
|
||||||
|
* @return boolean hook return
|
||||||
|
*/
|
||||||
|
|
||||||
function onEndPublicXRDS($action, &$xrdsOutputter)
|
function onEndPublicXRDS($action, &$xrdsOutputter)
|
||||||
{
|
{
|
||||||
$xrdsOutputter->elementStart('XRD', array('xmlns' => 'xri://$xrd*($v*2.0)',
|
$xrdsOutputter->elementStart('XRD', array('xmlns' => 'xri://$xrd*($v*2.0)',
|
||||||
|
@ -94,6 +110,17 @@ class OpenIDPlugin extends Plugin
|
||||||
$xrdsOutputter->elementEnd('XRD');
|
$xrdsOutputter->elementEnd('XRD');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* User XRDS output hook
|
||||||
|
*
|
||||||
|
* Puts the bits of code needed to discover OpenID endpoints.
|
||||||
|
*
|
||||||
|
* @param Action $action Action being executed
|
||||||
|
* @param XMLOutputter &$xrdsOutputter Output channel
|
||||||
|
*
|
||||||
|
* @return boolean hook return
|
||||||
|
*/
|
||||||
|
|
||||||
function onEndUserXRDS($action, &$xrdsOutputter)
|
function onEndUserXRDS($action, &$xrdsOutputter)
|
||||||
{
|
{
|
||||||
$xrdsOutputter->elementStart('XRD', array('xmlns' => 'xri://$xrd*($v*2.0)',
|
$xrdsOutputter->elementStart('XRD', array('xmlns' => 'xri://$xrd*($v*2.0)',
|
||||||
|
@ -115,6 +142,14 @@ class OpenIDPlugin extends Plugin
|
||||||
$xrdsOutputter->elementEnd('XRD');
|
$xrdsOutputter->elementEnd('XRD');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Menu item for login
|
||||||
|
*
|
||||||
|
* @param Action &$action Action being executed
|
||||||
|
*
|
||||||
|
* @return boolean hook return
|
||||||
|
*/
|
||||||
|
|
||||||
function onEndLoginGroupNav(&$action)
|
function onEndLoginGroupNav(&$action)
|
||||||
{
|
{
|
||||||
$action_name = $action->trimmed('action');
|
$action_name = $action->trimmed('action');
|
||||||
|
@ -127,6 +162,14 @@ class OpenIDPlugin extends Plugin
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Menu item for OpenID admin
|
||||||
|
*
|
||||||
|
* @param Action &$action Action being executed
|
||||||
|
*
|
||||||
|
* @return boolean hook return
|
||||||
|
*/
|
||||||
|
|
||||||
function onEndAccountSettingsNav(&$action)
|
function onEndAccountSettingsNav(&$action)
|
||||||
{
|
{
|
||||||
$action_name = $action->trimmed('action');
|
$action_name = $action->trimmed('action');
|
||||||
|
@ -139,6 +182,16 @@ class OpenIDPlugin extends Plugin
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Autoloader
|
||||||
|
*
|
||||||
|
* Loads our classes if they're requested.
|
||||||
|
*
|
||||||
|
* @param string $cls Class requested
|
||||||
|
*
|
||||||
|
* @return boolean hook return
|
||||||
|
*/
|
||||||
|
|
||||||
function onAutoload($cls)
|
function onAutoload($cls)
|
||||||
{
|
{
|
||||||
switch ($cls)
|
switch ($cls)
|
||||||
|
@ -151,19 +204,30 @@ class OpenIDPlugin extends Plugin
|
||||||
case 'OpenidsettingsAction':
|
case 'OpenidsettingsAction':
|
||||||
case 'OpenidserverAction':
|
case 'OpenidserverAction':
|
||||||
case 'OpenidtrustAction':
|
case 'OpenidtrustAction':
|
||||||
require_once(INSTALLDIR.'/plugins/OpenID/' . strtolower(mb_substr($cls, 0, -6)) . '.php');
|
require_once INSTALLDIR.'/plugins/OpenID/' . strtolower(mb_substr($cls, 0, -6)) . '.php';
|
||||||
return false;
|
return false;
|
||||||
case 'User_openid':
|
case 'User_openid':
|
||||||
require_once(INSTALLDIR.'/plugins/OpenID/User_openid.php');
|
require_once INSTALLDIR.'/plugins/OpenID/User_openid.php';
|
||||||
return false;
|
return false;
|
||||||
case 'User_openid_trustroot':
|
case 'User_openid_trustroot':
|
||||||
require_once(INSTALLDIR.'/plugins/OpenID/User_openid_trustroot.php');
|
require_once INSTALLDIR.'/plugins/OpenID/User_openid_trustroot.php';
|
||||||
return false;
|
return false;
|
||||||
default:
|
default:
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sensitive actions
|
||||||
|
*
|
||||||
|
* These actions should use https when SSL support is 'sometimes'
|
||||||
|
*
|
||||||
|
* @param Action $action Action to form an URL for
|
||||||
|
* @param boolean &$ssl Whether to mark it for SSL
|
||||||
|
*
|
||||||
|
* @return boolean hook return
|
||||||
|
*/
|
||||||
|
|
||||||
function onSensitiveAction($action, &$ssl)
|
function onSensitiveAction($action, &$ssl)
|
||||||
{
|
{
|
||||||
switch ($action)
|
switch ($action)
|
||||||
|
@ -177,6 +241,17 @@ class OpenIDPlugin extends Plugin
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Login actions
|
||||||
|
*
|
||||||
|
* These actions should be visible even when the site is marked private
|
||||||
|
*
|
||||||
|
* @param Action $action Action to show
|
||||||
|
* @param boolean &$login Whether it's a login action
|
||||||
|
*
|
||||||
|
* @return boolean hook return
|
||||||
|
*/
|
||||||
|
|
||||||
function onLoginAction($action, &$login)
|
function onLoginAction($action, &$login)
|
||||||
{
|
{
|
||||||
switch ($action)
|
switch ($action)
|
||||||
|
@ -192,15 +267,17 @@ class OpenIDPlugin extends Plugin
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* We include a <meta> element linking to the publicxrds page, for OpenID
|
* We include a <meta> element linking to the userxrds page, for OpenID
|
||||||
* client-side authentication.
|
* client-side authentication.
|
||||||
*
|
*
|
||||||
|
* @param Action $action Action being shown
|
||||||
|
*
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
|
|
||||||
function onEndShowHeadElements($action)
|
function onEndShowHeadElements($action)
|
||||||
{
|
{
|
||||||
if($action instanceof ShowstreamAction){
|
if ($action instanceof ShowstreamAction) {
|
||||||
$action->element('link', array('rel' => 'openid2.provider',
|
$action->element('link', array('rel' => 'openid2.provider',
|
||||||
'href' => common_local_url('openidserver')));
|
'href' => common_local_url('openidserver')));
|
||||||
$action->element('link', array('rel' => 'openid2.local_id',
|
$action->element('link', array('rel' => 'openid2.local_id',
|
||||||
|
@ -216,6 +293,9 @@ class OpenIDPlugin extends Plugin
|
||||||
/**
|
/**
|
||||||
* Redirect to OpenID login if they have an OpenID
|
* Redirect to OpenID login if they have an OpenID
|
||||||
*
|
*
|
||||||
|
* @param Action $action Action being executed
|
||||||
|
* @param User $user User doing the action
|
||||||
|
*
|
||||||
* @return boolean whether to continue
|
* @return boolean whether to continue
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
@ -228,6 +308,14 @@ class OpenIDPlugin extends Plugin
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Show some extra instructions for using OpenID
|
||||||
|
*
|
||||||
|
* @param Action $action Action being executed
|
||||||
|
*
|
||||||
|
* @return boolean hook value
|
||||||
|
*/
|
||||||
|
|
||||||
function onEndShowPageNotice($action)
|
function onEndShowPageNotice($action)
|
||||||
{
|
{
|
||||||
$name = $action->trimmed('action');
|
$name = $action->trimmed('action');
|
||||||
|
@ -258,10 +346,18 @@ class OpenIDPlugin extends Plugin
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Load our document if requested
|
||||||
|
*
|
||||||
|
* @param string &$title Title to fetch
|
||||||
|
* @param string &$output HTML to output
|
||||||
|
*
|
||||||
|
* @return boolean hook value
|
||||||
|
*/
|
||||||
|
|
||||||
function onStartLoadDoc(&$title, &$output)
|
function onStartLoadDoc(&$title, &$output)
|
||||||
{
|
{
|
||||||
if ($title == 'openid')
|
if ($title == 'openid') {
|
||||||
{
|
|
||||||
$filename = INSTALLDIR.'/plugins/OpenID/doc-src/openid';
|
$filename = INSTALLDIR.'/plugins/OpenID/doc-src/openid';
|
||||||
|
|
||||||
$c = file_get_contents($filename);
|
$c = file_get_contents($filename);
|
||||||
|
@ -272,10 +368,18 @@ class OpenIDPlugin extends Plugin
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Add our document to the global menu
|
||||||
|
*
|
||||||
|
* @param string $title Title being fetched
|
||||||
|
* @param string &$output HTML being output
|
||||||
|
*
|
||||||
|
* @return boolean hook value
|
||||||
|
*/
|
||||||
|
|
||||||
function onEndLoadDoc($title, &$output)
|
function onEndLoadDoc($title, &$output)
|
||||||
{
|
{
|
||||||
if ($title == 'help')
|
if ($title == 'help') {
|
||||||
{
|
|
||||||
$menuitem = '* [OpenID](%%doc.openid%%) - what OpenID is and how to use it with this service';
|
$menuitem = '* [OpenID](%%doc.openid%%) - what OpenID is and how to use it with this service';
|
||||||
|
|
||||||
$output .= common_markup_to_html($menuitem);
|
$output .= common_markup_to_html($menuitem);
|
||||||
|
@ -284,7 +388,16 @@ class OpenIDPlugin extends Plugin
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
function onCheckSchema() {
|
/**
|
||||||
|
* Data definitions
|
||||||
|
*
|
||||||
|
* Assure that our data objects are available in the DB
|
||||||
|
*
|
||||||
|
* @return boolean hook value
|
||||||
|
*/
|
||||||
|
|
||||||
|
function onCheckSchema()
|
||||||
|
{
|
||||||
$schema = Schema::get();
|
$schema = Schema::get();
|
||||||
$schema->ensureTable('user_openid',
|
$schema->ensureTable('user_openid',
|
||||||
array(new ColumnDef('canonical', 'varchar',
|
array(new ColumnDef('canonical', 'varchar',
|
||||||
|
@ -307,6 +420,15 @@ class OpenIDPlugin extends Plugin
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Add our tables to be deleted when a user is deleted
|
||||||
|
*
|
||||||
|
* @param User $user User being deleted
|
||||||
|
* @param array &$tables Array of table names
|
||||||
|
*
|
||||||
|
* @return boolean hook value
|
||||||
|
*/
|
||||||
|
|
||||||
function onUserDeleteRelated($user, &$tables)
|
function onUserDeleteRelated($user, &$tables)
|
||||||
{
|
{
|
||||||
$tables[] = 'User_openid';
|
$tables[] = 'User_openid';
|
||||||
|
@ -314,6 +436,14 @@ class OpenIDPlugin extends Plugin
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Add our version information to output
|
||||||
|
*
|
||||||
|
* @param array &$versions Array of version-data arrays
|
||||||
|
*
|
||||||
|
* @return boolean hook value
|
||||||
|
*/
|
||||||
|
|
||||||
function onPluginVersion(&$versions)
|
function onPluginVersion(&$versions)
|
||||||
{
|
{
|
||||||
$versions[] = array('name' => 'OpenID',
|
$versions[] = array('name' => 'OpenID',
|
||||||
|
|
Loading…
Reference in New Issue
Block a user