X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=plugins%2FMobileProfile%2FMobileProfilePlugin.php;h=21eaa124e71178ae8d8e3669bb6dfe695c123837;hb=e36c9523383769313b11a67aa3859cb09b20ec52;hp=cd88a6f7b7383f7897bb06f8e55b659a3cb6492f;hpb=5ebed4d24de2898d4803eeed6ca11076c938c68d;p=quix0rs-gnu-social.git

diff --git a/plugins/MobileProfile/MobileProfilePlugin.php b/plugins/MobileProfile/MobileProfilePlugin.php
index cd88a6f7b7..21eaa124e7 100644
--- a/plugins/MobileProfile/MobileProfilePlugin.php
+++ b/plugins/MobileProfile/MobileProfilePlugin.php
@@ -49,7 +49,7 @@ require_once INSTALLDIR.'/plugins/Mobile/WAP20Plugin.php';
 
 class MobileProfilePlugin extends WAP20Plugin
 {
-    public $DTD      = null;
+    public $DTD             = null;
     public $serveMobile     = false;
 
     function __construct($DTD='http://www.wapforum.org/DTD/xhtml-mobile10.dtd')
@@ -131,13 +131,20 @@ class MobileProfilePlugin extends WAP20Plugin
             // 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') !== false &&
+                (common_config('site', 'mobileserver') != 
+                    common_config('site', 'server'))) {
 
-                header("Location: ".common_config('site', 'mobileserver'));
+                // 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();
@@ -155,10 +162,179 @@ class MobileProfilePlugin extends WAP20Plugin
     }
 
 
+    function onStartShowHeadElements($action)
+    {
+        if (!$action->serveMobile) {
+            return true;
+        }
 
-    function onStartShowAside($action)
+        $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.gif'))) ? (theme_path('mobilelogo.gif')): 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'));
+        }
+        $action->menuItem(common_local_url('doc', array('title' => 'help')),
+                        _('Help'));
+        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' => 35,
+                                              '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')) {
+            $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;
+        }
     }
 
 
@@ -167,6 +343,27 @@ class MobileProfilePlugin extends WAP20Plugin
 
     }
 
+
+    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;
+    }
 }