eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

MobileProfile plugin cleanup

Browse Source
This commit is contained in:
Mikael Nordfeldth 2015-04-22 19:50:56 +02:00
parent f642da201d
commit 4210096a6f
1 changed files with 114 additions and 152 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

114
plugins/MobileProfile/MobileProfilePlugin.php
View File

@ -27,9 +27,7 @@
* @link http://status.net/ * @link http://status.net/
*/ */
if (!defined('STATUSNET')) { if (!defined('GNUSOCIAL')) { exit(1); }
exit(1);
}
define('PAGE_TYPE_PREFS_MOBILEPROFILE', define('PAGE_TYPE_PREFS_MOBILEPROFILE',
'application/vnd.wap.xhtml+xml, application/xhtml+xml, text/html;q=0.9'); 'application/vnd.wap.xhtml+xml, application/xhtml+xml, text/html;q=0.9');
@ -59,26 +57,34 @@ class MobileProfilePlugin extends WAP20Plugin
parent::__construct(); parent::__construct();
} }
function onStartShowHTML($action) public function onStartShowHTML(Action $action)
{ {
// XXX: This should probably graduate to WAP20Plugin // TODO: A lot of this should probably graduate to WAP20Plugin
$httpaccept = isset($_SERVER['HTTP_ACCEPT']) ? $_SERVER['HTTP_ACCEPT'] : null;
$cp = common_accept_to_prefs($httpaccept);
$sp = common_accept_to_prefs(PAGE_TYPE_PREFS_MOBILEPROFILE);
$type = common_negotiate_type($cp, $sp);
if (!$type) {
// TRANS: Client exception thrown when requesting a not supported media type.
throw new ClientException(_m('This page is not available in a '.
'media type you accept.'), 406);
}
// If they are on the mobile site, serve them MP // If they are on the mobile site, serve them MP
if ((common_config('site', 'mobileserver').'/'. if ((common_config('site', 'mobileserver').'/'.common_config('site', 'path').'/'
common_config('site', 'path').'/' == == $_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'])) {
$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'])) {
$this->serveMobile = true; $this->serveMobile = true;
} elseif (isset($_COOKIE['MobileOverride'])) { } elseif (isset($_COOKIE['MobileOverride'])) {
// Cookie override is controlled by link at bottom. // Cookie override is controlled by link at bottom.
$this->serveMobile = (bool)$_COOKIE['MobileOverride']; $this->serveMobile = (bool)$_COOKIE['MobileOverride'];
} elseif (array_key_exists('HTTP_USER_AGENT', $_SERVER)) { } elseif (strstr('application/vnd.wap.xhtml+xml', $type) !== false) {
// If they like the WAP 2.0 mimetype, serve them MP // If they like the WAP 2.0 mimetype, serve them MP
// @fixme $type is undefined, making this if case useless and spewing errors. $this->serveMobile = true;
// What's the intent? } elseif (array_key_exists('HTTP_USER_AGENT', $_SERVER)) {
//if (strstr('application/vnd.wap.xhtml+xml', $type) !== false) {
// $this->serveMobile = true;
//} else {
// If they are a mobile device that supports WAP 2.0, // If they are a mobile device that supports WAP 2.0,
// serve them MP // serve them MP
@ -166,68 +172,31 @@ class MobileProfilePlugin extends WAP20Plugin
break; break;
} }
} }
//}
// If they are okay with MP, and the site has a mobile server,
// redirect there
if ($this->serveMobile &&
common_config('site', 'mobileserver') !== false &&
(common_config('site', 'mobileserver') !=
common_config('site', 'server'))) {
// FIXME: Redirect to equivalent page on mobile site instead
common_redirect($this->_common_path(''), 302);
}
} }
if (!$this->serveMobile) { if (!$this->serveMobile) {
return true; return true;
} }
// @fixme $type is undefined, making this if case useless and spewing errors. // If they are okay with MP, and the site has a mobile server,
// What's the intent? // redirect there
//if (!$type) { if (common_config('site', 'mobileserver') !== false &&
$httpaccept = isset($_SERVER['HTTP_ACCEPT']) ? common_config('site', 'mobileserver') != common_config('site', 'server')) {
$_SERVER['HTTP_ACCEPT'] : null;
$cp = common_accept_to_prefs($httpaccept); // FIXME: Redirect to equivalent page on mobile site instead
$sp = common_accept_to_prefs(PAGE_TYPE_PREFS_MOBILEPROFILE); common_redirect($this->_common_path(''), 302);
$type = common_negotiate_type($cp, $sp);
if (!$type) {
// TRANS: Client exception thrown when requesting a not supported media type.
throw new ClientException(_m('This page is not available in a '.
'media type you accept.'), 406);
} }
//}
header('Content-Type: '.$type); header('Content-Type: '.$type);
if ($this->reallyMobile) { if ($this->reallyMobile) {
$action->setDTD('html', '-//WAPFORUM//DTD XHTML Mobile 1.0//EN', $this->DTD);
$action->extraHeaders();
if (preg_match("/.*\/.*xml/", $type)) {
// Required for XML documents
$action->startXML();
} }
$action->xw->writeDTD('html',
'-//WAPFORUM//DTD XHTML Mobile 1.0//EN',
$this->DTD);
$language = $action->getLanguage(); // continue
$action->elementStart('html', array('xmlns' => 'http://www.w3.org/1999/xhtml',
'xml:lang' => $language));
return false;
} else {
return true; return true;
} }
}
function setMobileFeatures($useragent) function setMobileFeatures($useragent)
{ {
$mobiledeviceInputFileType = array( $mobiledeviceInputFileType = array(
@ -268,7 +237,7 @@ class MobileProfilePlugin extends WAP20Plugin
return false; return false;
} }
function onStartShowUAStyles($action) { public function onStartShowUAStyles(Action $action) {
if (!$this->serveMobile) { if (!$this->serveMobile) {
return true; return true;
} }
@ -276,7 +245,7 @@ class MobileProfilePlugin extends WAP20Plugin
return false; return false;
} }
function onStartShowHeader($action) public function onStartShowHeader(Action $action)
{ {
if (!$this->serveMobile) { if (!$this->serveMobile) {
return true; return true;
@ -290,7 +259,7 @@ class MobileProfilePlugin extends WAP20Plugin
return false; return false;
} }
function _showLogo($action) protected function _showLogo(Action $action)
{ {
$action->elementStart('address'); $action->elementStart('address');
if (common_config('singleuser', 'enabled')) { if (common_config('singleuser', 'enabled')) {
@ -316,23 +285,22 @@ class MobileProfilePlugin extends WAP20Plugin
$action->elementEnd('address'); $action->elementEnd('address');
} }
function onStartShowAside($action) public function onStartShowAside(Action $action)
{ {
if ($this->serveMobile) { if ($this->serveMobile) {
return false; return false;
} }
} }
function onStartShowLocalNavBlock($action) public function onStartShowLocalNavBlock(Action $action)
{ {
if ($this->serveMobile) { if ($this->serveMobile) {
// @todo FIXME: "Show Navigation" / "Hide Navigation" needs i18n // @todo FIXME: "Show Navigation" / "Hide Navigation" needs i18n
$action->element('a', array('href' => '#', 'id' => 'navtoggle'), 'Show Navigation'); $action->element('a', array('href' => '#', 'id' => 'navtoggle'), 'Show Navigation');
return true;
} }
} }
function onEndShowScripts($action) public function onEndShowScripts(Action $action)
{ {
// @todo FIXME: "Show Navigation" / "Hide Navigation" needs i18n // @todo FIXME: "Show Navigation" / "Hide Navigation" needs i18n
$action->inlineScript(' $action->inlineScript('
@ -357,18 +325,12 @@ class MobileProfilePlugin extends WAP20Plugin
); );
if ($this->serveMobile) { if ($this->serveMobile) {
$action->inlineScript(' $action->inlineScript('$(function() { $(".checkbox-wrapper").unbind("click"); });');
$(function() { }
$(".checkbox-wrapper").unbind("click");
});'
);
} }
} public function onEndShowInsideFooter(Action $action)
function onEndShowInsideFooter($action)
{ {
if ($this->serveMobile) { if ($this->serveMobile) {
// TRANS: Link to switch site layout from mobile to desktop mode. Appears at very bottom of page. // TRANS: Link to switch site layout from mobile to desktop mode. Appears at very bottom of page.