summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSarven Capadisli <csarven@status.net>2009-11-17 20:50:43 +0000
committerSarven Capadisli <csarven@status.net>2009-11-17 20:50:43 +0000
commita42e128c1532c45fd930d98c985f9a8d98ff6868 (patch)
tree8523a267f0c48442c92df2e7ede021b37ab992d6
parent14082ada6b1ef4dbe5ddc92d307e570b2012f889 (diff)
parentf3a074ad22dcd9fe0c770562ff93b9975a099359 (diff)
Merge branch '0.9.x-mobile' into 0.9.x
-rw-r--r--plugins/Mobile/WAP20Plugin.php56
-rw-r--r--plugins/MobileProfile/MobileProfilePlugin.php424
-rw-r--r--plugins/MobileProfile/mp-handheld.css1
-rw-r--r--plugins/MobileProfile/mp-screen.css248
4 files changed, 729 insertions, 0 deletions
diff --git a/plugins/Mobile/WAP20Plugin.php b/plugins/Mobile/WAP20Plugin.php
new file mode 100644
index 000000000..aae48a520
--- /dev/null
+++ b/plugins/Mobile/WAP20Plugin.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Superclass for WAP 2.0 support
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category Plugin
+ * @package StatusNet
+ * @author Sarven Capadisli <csarven@status.net>
+ * @copyright 2009 StatusNet, Inc.
+ * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link http://status.net/
+ */
+
+if (!defined('STATUSNET') && !defined('LACONICA')) {
+ exit(1);
+}
+
+
+/**
+ * Superclass for plugin to output XHTML Mobile Profile
+ *
+ * @category Plugin
+ * @package StatusNet
+ * @author Sarven Capadisli <csarven@status.net>
+ * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link http://status.net/
+ */
+
+class WAP20Plugin extends Plugin
+{
+
+ function onStartShowHTML($action)
+ {
+
+ }
+
+}
+
+
+?>
diff --git a/plugins/MobileProfile/MobileProfilePlugin.php b/plugins/MobileProfile/MobileProfilePlugin.php
new file mode 100644
index 000000000..4bbdb3541
--- /dev/null
+++ b/plugins/MobileProfile/MobileProfilePlugin.php
@@ -0,0 +1,424 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * XHTML Mobile Profile plugin that uses WAP 2.0 Plugin
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category Plugin
+ * @package StatusNet
+ * @author Sarven Capadisli <csarven@status.net>
+ * @copyright 2009 StatusNet, Inc.
+ * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link http://status.net/
+ */
+
+if (!defined('STATUSNET') && !defined('LACONICA')) {
+ exit(1);
+}
+
+define('PAGE_TYPE_PREFS',
+ 'application/vnd.wap.xhtml+xml, application/xhtml+xml, text/html;q=0.9');
+
+require_once INSTALLDIR.'/plugins/Mobile/WAP20Plugin.php';
+
+
+/**
+ * Superclass for plugin to output XHTML Mobile Profile
+ *
+ * @category Plugin
+ * @package StatusNet
+ * @author Sarven Capadisli <csarven@status.net>
+ * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link http://status.net/
+ */
+
+class MobileProfilePlugin extends WAP20Plugin
+{
+ public $DTD = null;
+ public $serveMobile = false;
+ public $mobileFeatures = array();
+
+ function __construct($DTD='http://www.wapforum.org/DTD/xhtml-mobile10.dtd')
+ {
+ $this->DTD = $DTD;
+
+ parent::__construct();
+ }
+
+
+ function onStartShowHTML($action)
+ {
+
+ if (!$type) {
+ $httpaccept = isset($_SERVER['HTTP_ACCEPT']) ?
+ $_SERVER['HTTP_ACCEPT'] : null;
+
+ $cp = common_accept_to_prefs($httpaccept);
+ $sp = common_accept_to_prefs(PAGE_TYPE_PREFS);
+
+ $type = common_negotiate_type($cp, $sp);
+
+ if (!$type) {
+ throw new ClientException(_('This page is not available in a '.
+ 'media type you accept'), 406);
+ }
+ }
+
+ // XXX: This should probably graduate to WAP20Plugin
+
+ // If they are on the mobile site, serve them MP
+ if ((common_config('site', 'mobileserver').'/'.
+ common_config('site', 'path').'/' ==
+ $_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'])) {
+
+ $this->serveMobile = true;
+ } else {
+ // If they like the WAP 2.0 mimetype, serve them MP
+ if (strstr('application/vnd.wap.xhtml+xml', $type) !== false) {
+ $this->serveMobile = true;
+ } else {
+ // If they are a mobile device that supports WAP 2.0,
+ // serve them MP
+
+ // XXX: Browser sniffing sucks
+
+ // I really don't like going through this every page,
+ // perhaps use $_SESSION or cookies
+
+ // May be better to group the devices in terms of
+ // low,mid,high-end
+
+ // Or, detect the mobile devices based on their support for
+ // MP 1.0, 1.1, or 1.2 may be ideal. Possible?
+
+ $this->mobiledevices = array(
+ 'alcatel',
+ 'android',
+ 'audiovox',
+ 'au-mic,',
+ 'avantgo',
+ 'blackberry',
+ 'blazer',
+ 'cldc-',
+ 'danger',
+ 'epoc',
+ 'ericsson',
+ 'ericy',
+ 'iphone',
+ 'ipaq',
+ 'ipod',
+ 'j2me',
+ 'lg',
+ 'midp-',
+ 'mobile',
+ 'mot',
+ 'netfront',
+ 'nitro',
+ 'nokia',
+ 'opera mini',
+ 'palm',
+ 'palmsource',
+ 'panasonic',
+ 'philips',
+ 'pocketpc',
+ 'portalmmm',
+ 'rover',
+ 'samsung',
+ 'sanyo',
+ 'series60',
+ 'sharp',
+ 'sie-',
+ 'smartphone',
+ 'sony',
+ 'symbian',
+ 'up.browser',
+ 'up.link',
+ 'up.link',
+ 'vodafone',
+ 'wap1',
+ 'wap2',
+ 'windows ce'
+ );
+
+ $httpuseragent = strtolower($_SERVER['HTTP_USER_AGENT']);
+
+ foreach ($this->mobiledevices as $md) {
+ if (strstr($httpuseragent, $md) !== false) {
+ $this->setMobileFeatures($httpuseragent);
+
+ $this->serveMobile = true;
+ 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
+ header("Location: ".$this->_common_path(''));
+ exit();
+ }
+ }
+
+ if (!$this->serveMobile) {
+ return true;
+ }
+
+ header('Content-Type: '.$type);
+
+ $action->extraHeaders();
+
+ $action->startXML('html',
+ '-//WAPFORUM//DTD XHTML Mobile 1.0//EN',
+ $this->DTD);
+
+ $language = $action->getLanguage();
+
+ $action->elementStart('html', array('xmlns' => 'http://www.w3.org/1999/xhtml',
+ 'xml:lang' => $language));
+
+ return false;
+ }
+
+
+ function setMobileFeatures($useragent)
+ {
+ $mobiledeviceInputFileType = array(
+ 'nokia'
+ );
+
+ $this->mobileFeatures['inputfiletype'] = false;
+
+ foreach ($mobiledeviceInputFileType as $md) {
+ if (strstr($useragent, $md) !== false) {
+ $this->mobileFeatures['inputfiletype'] = true;
+ break;
+ }
+ }
+ }
+
+
+ function onStartShowHeadElements($action)
+ {
+ if (!$action->serveMobile) {
+ return true;
+ }
+
+ $action->showTitle();
+ $action->showShortcutIcon();
+ $action->showStylesheets();
+ $action->showFeeds();
+ $action->showDescription();
+ $action->extraHead();
+ }
+
+
+ function onStartShowStatusNetStyles($action)
+ {
+ if (!$this->serveMobile) {
+ return true;
+ }
+
+ if (file_exists(theme_file('css/mp-screen.css'))) {
+ $action->cssLink('css/mp-screen.css', null, 'screen');
+ } else {
+ $action->element('link', array('rel' => 'stylesheet',
+ 'type' => 'text/css',
+ 'href' => common_path('plugins/MobileProfile/mp-screen.css') . '?version=' . STATUSNET_VERSION,
+ 'media' => 'screen'));
+ }
+
+ if (file_exists(theme_file('css/mp-handheld.css'))) {
+ $action->cssLink('css/mp-handheld.css', null, 'handheld');
+ } else {
+ $action->element('link', array('rel' => 'stylesheet',
+ 'type' => 'text/css',
+ 'href' => common_path('plugins/MobileProfile/mp-handheld.css') . '?version=' . STATUSNET_VERSION,
+ 'media' => 'handheld'));
+ }
+
+ return false;
+ }
+
+
+ function onStartShowHeader($action)
+ {
+ if (!$this->serveMobile) {
+ return true;
+ }
+
+ $action->elementStart('div', array('id' => 'header'));
+ $this->_showLogo($action);
+ $this->_showPrimaryNav($action);
+ if (common_logged_in()) {
+ $action->showNoticeForm();
+ }
+ $action->elementEnd('div');
+
+ return false;
+ }
+
+
+ function _showLogo($action)
+ {
+ $action->elementStart('address', 'vcard');
+ $action->elementStart('a', array('class' => 'url home bookmark',
+ 'href' => common_local_url('public')));
+ if (common_config('site', 'mobilelogo') ||
+ file_exists(theme_file('logo.png')) ||
+ file_exists(theme_file('mobilelogo.gif'))) {
+
+ $action->element('img', array('class' => 'photo',
+ 'src' => (common_config('site', 'mobilelogo')) ? common_config('site', 'mobilelogo') :
+ ((file_exists(theme_file('mobilelogo.png'))) ? (theme_path('mobilelogo.png')) : theme_path('logo.png')),
+ 'alt' => common_config('site', 'name')));
+ }
+ $action->element('span', array('class' => 'fn org'), common_config('site', 'name'));
+ $action->elementEnd('a');
+ $action->elementEnd('address');
+ }
+
+
+ function _showPrimaryNav($action)
+ {
+ $user = common_current_user();
+ $connect = '';
+ if (common_config('xmpp', 'enabled')) {
+ $connect = 'imsettings';
+ } else if (common_config('sms', 'enabled')) {
+ $connect = 'smssettings';
+ } else if (common_config('twitter', 'enabled')) {
+ $connect = 'twittersettings';
+ }
+
+ $action->elementStart('ul', array('id' => 'site_nav_global_primary'));
+ if ($user) {
+ $action->menuItem(common_local_url('all', array('nickname' => $user->nickname)),
+ _('Home'));
+ $action->menuItem(common_local_url('profilesettings'),
+ _('Account'));
+ if ($connect) {
+ $action->menuItem(common_local_url($connect),
+ _('Connect'));
+ }
+ if (common_config('invite', 'enabled')) {
+ $action->menuItem(common_local_url('invite'),
+ _('Invite'));
+ }
+ $action->menuItem(common_local_url('logout'),
+ _('Logout'));
+ } else {
+ if (!common_config('site', 'closed')) {
+ $action->menuItem(common_local_url('register'),
+ _('Register'));
+ }
+ $action->menuItem(common_local_url('login'),
+ _('Login'));
+ }
+ if ($user || !common_config('site', 'private')) {
+ $action->menuItem(common_local_url('peoplesearch'),
+ _('Search'));
+ }
+ $action->elementEnd('ul');
+ }
+
+
+ function onStartShowNoticeFormData($form)
+ {
+ if (!$this->serveMobile) {
+ return true;
+ }
+
+ $form->out->element('textarea', array('id' => 'notice_data-text',
+ 'cols' => 15,
+ 'rows' => 4,
+ 'name' => 'status_textarea'),
+ ($form->content) ? $form->content : '');
+
+ $contentLimit = Notice::maxContent();
+
+ $form->out->element('script', array('type' => 'text/javascript'),
+ 'maxLength = ' . $contentLimit . ';');
+
+ if ($contentLimit > 0) {
+ $form->out->element('div', array('id' => 'notice_text-count'),
+ $contentLimit);
+ }
+
+ if (common_config('attachments', 'uploads')) {
+ if ($this->mobileFeatures['inputfiletype']) {
+ $form->out->element('label', array('for' => 'notice_data-attach'), _('Attach'));
+ $form->out->element('input', array('id' => 'notice_data-attach',
+ 'type' => 'file',
+ 'name' => 'attach',
+ 'title' => _('Attach a file')));
+ $form->out->hidden('MAX_FILE_SIZE', common_config('attachments', 'file_quota'));
+ }
+ }
+ if ($form->action) {
+ $form->out->hidden('notice_return-to', $form->action, 'returnto');
+ }
+ $form->out->hidden('notice_in-reply-to', $form->inreplyto, 'inreplyto');
+
+ return false;
+ }
+
+
+ function onStartShowAside($action)
+ {
+ if ($this->serveMobile) {
+ return false;
+ }
+ }
+
+
+ function onStartShowScripts($action)
+ {
+
+ }
+
+
+ function _common_path($relative, $ssl=false)
+ {
+ $pathpart = (common_config('site', 'path')) ? common_config('site', 'path')."/" : '';
+
+ if (($ssl && (common_config('site', 'ssl') === 'sometimes'))
+ || common_config('site', 'ssl') === 'always') {
+ $proto = 'https';
+ if (is_string(common_config('site', 'sslserver')) &&
+ mb_strlen(common_config('site', 'sslserver')) > 0) {
+ $serverpart = common_config('site', 'sslserver');
+ } else {
+ $serverpart = common_config('site', 'mobileserver');
+ }
+ } else {
+ $proto = 'http';
+ $serverpart = common_config('site', 'mobileserver');
+ }
+
+ return $proto.'://'.$serverpart.'/'.$pathpart.$relative;
+ }
+}
+
+
+?>
diff --git a/plugins/MobileProfile/mp-handheld.css b/plugins/MobileProfile/mp-handheld.css
new file mode 100644
index 000000000..e0ea823d5
--- /dev/null
+++ b/plugins/MobileProfile/mp-handheld.css
@@ -0,0 +1 @@
+@import url(mp-screen.css);
diff --git a/plugins/MobileProfile/mp-screen.css b/plugins/MobileProfile/mp-screen.css
new file mode 100644
index 000000000..1bb0248ec
--- /dev/null
+++ b/plugins/MobileProfile/mp-screen.css
@@ -0,0 +1,248 @@
+@import url(../../theme/base/css/display.css);
+@import url(../../theme/identica/css/display.css);
+
+#wrap {
+min-width:0;
+max-width:100%;
+}
+
+#header {
+margin:0;
+padding:0.7em 2%;
+width:96%;
+}
+
+address {
+margin:1em 0 0 0;
+float:left;
+width:100%;
+}
+address .vcard .photo {
+margin-right:0;
+}
+
+address img + .fn {
+display:block;
+margin-top:1em;
+float:left;
+}
+
+.vcard .photo {
+margin-right:7px;
+}
+
+
+.form_settings fieldset {
+margin-bottom:7px;
+}
+
+.form_settings label {
+width:auto;
+display:block;
+float:none;
+}
+.form_settings .form_data li {
+margin-bottom:7px;
+}
+
+.form_settings .form_data textarea,
+.form_settings .form_data select,
+.form_settings .form_data input {
+margin-left:0;
+display:block;
+}
+.form_settings .form_data textarea {
+width:96.41%;
+}
+
+.form_settings .form_data label {
+float:none;
+}
+
+.form_settings .form_data p.form_guide {
+width:auto;
+margin-left:0;
+}
+
+
+
+#site_nav_global_primary {
+margin:0;
+width:100%;
+list-style-type:none;
+position:absolute;
+top:0;
+left:0;
+}
+#site_nav_global_primary li {
+margin-left:0;
+margin-right:4%;
+float:left;
+font-size:0.9em;
+}
+
+
+#form_notice {
+width:100%;
+}
+
+#form_notice textarea {
+width:60%;
+height:20px;
+}
+
+#notice_text-count {
+position:absolute;
+bottom:2px;
+right:40%;
+z-index:9;
+}
+
+/*input type=file no good in
+iPhone/iPod Touch, Android, Opera Mini Simulator
+*/
+#form_notice #notice_text-count + label,
+#form_notice label[for="notice_data-attach"] {
+display:none;
+}
+#form_notice #notice_data-attach {
+top:auto;
+bottom:0;
+left:0;
+right:auto;
+opacity:1;
+z-index:9;
+width:65%;
+}
+
+#form_notice #notice_action-submit {
+width:20%;
+right:2%;
+text-align:center;
+}
+
+
+#site_nav_local_views li {
+margin-left:0;
+margin-right:0;
+}
+#site_nav_local_views li:first-child {
+margin-left:0;
+}
+#site_nav_local_views a {
+padding:1px 3px;
+display:block;
+font-size:0.9em;
+}
+#site_nav_local_views .current a {
+text-shadow:none;
+}
+#site_nav_local_views li {
+-moz-box-shadow:none;
+-webkit-box-shadow:none;
+box-shadow:none;
+}
+
+
+#content {
+width:96.41%;
+min-height:auto;
+}
+#content,
+#site_nav_local_views a,
+#aside_primary {
+border:0;
+}
+
+.instructions p,
+.instructions ul {
+margin-bottom:4px;
+}
+
+h1 {
+margin-bottom:0;
+}
+
+.notice,
+.profile {
+padding-top:4px;
+padding-bottom:4px;
+}
+.notice .entry-title {
+
+}
+.notice div.entry-content {
+margin-left:0;
+width:65%;
+}
+.notice-options {
+width:30%;
+margin-right:2%;
+}
+
+
+
+.entity_profile {
+width:auto;
+}
+
+
+
+.entity_actions {
+margin-right:0;
+margin-left:0;
+clear:both;
+float:none;
+width:100%;
+max-width:9999px;
+}
+
+.entity_profile {
+margin-bottom:7px;
+min-height:0;
+}
+
+.entity_profile .entity_fn,
+.entity_profile .entity_nickname,
+.entity_profile .entity_location,
+.entity_profile .entity_url,
+.entity_profile .entity_note,
+.entity_profile .entity_tags,
+.entity_profile .entity_aliases {
+line-height:1.4;
+margin-left:0;
+}
+
+.entity_profile .entity_depiction {
+margin-bottom:1%;
+margin-right:7px;
+}
+
+.entity_actions {
+margin-bottom:1%;
+float:left;
+width:100%;
+}
+
+.entity_actions li {
+float:left;
+margin-right:1.5%;
+margin-bottom:0;
+height:29px;
+width:40%;
+}
+
+.user_in .entity_actions .entity_subscribe {
+margin-bottom:47px;
+width:auto;
+height:auto;
+margin-right:5%;
+}
+
+
+
+#footer {
+width:96%;
+padding:2%;
+}
+