Merge branch 'master' into testing

[quix0rs-gnu-social.git] / plugins / MobileProfile / MobileProfilePlugin.php

diff --git a/plugins/MobileProfile/MobileProfilePlugin.php b/plugins/MobileProfile/MobileProfilePlugin.php
index 2b1ccf520ad3970179a07258f721132fc0d81d4c..5c913836dccd7db6f6375e88bf24626ee596c8d2 100644 (file)
--- a/plugins/MobileProfile/MobileProfilePlugin.php
+++ b/plugins/MobileProfile/MobileProfilePlugin.php
@@ -31,7 +31,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
-define('PAGE_TYPE_PREFS',
+define('PAGE_TYPE_PREFS_MOBILEPROFILE',
        'application/vnd.wap.xhtml+xml, application/xhtml+xml, text/html;q=0.9');
 
 require_once INSTALLDIR.'/plugins/Mobile/WAP20Plugin.php';
@@ -63,21 +63,6 @@ class MobileProfilePlugin extends WAP20Plugin
 
     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
@@ -97,9 +82,9 @@ class MobileProfilePlugin extends WAP20Plugin
                 // XXX: Browser sniffing sucks
 
                 // I really don't like going through this every page, 
-                // find a better way
+                // perhaps use $_SESSION or cookies
 
-                // May be better to categorize the devices in terms of 
+                // May be better to group the devices in terms of 
                 // low,mid,high-end
 
                 // Or, detect the mobile devices based on their support for 
@@ -158,7 +143,7 @@ class MobileProfilePlugin extends WAP20Plugin
 
                 foreach ($this->mobiledevices as $md) {
                     if (strstr($httpuseragent, $md) !== false) {
-                        setMobileFeatures($httpuseragent);
+                        $this->setMobileFeatures($httpuseragent);
 
                         $this->serveMobile = true;
                         break;
@@ -174,8 +159,7 @@ class MobileProfilePlugin extends WAP20Plugin
                     common_config('site', 'server'))) {
 
                 // FIXME: Redirect to equivalent page on mobile site instead
-                header("Location: ".$this->_common_path(''));
-                exit();
+                common_redirect($this->_common_path(''), 302);
             }
         }
 
@@ -183,11 +167,29 @@ class MobileProfilePlugin extends WAP20Plugin
             return true;
         }
 
+        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_MOBILEPROFILE);
+
+            $type = common_negotiate_type($cp, $sp);
+
+            if (!$type) {
+                throw new ClientException(_('This page is not available in a '.
+                                            'media type you accept'), 406);
+            }
+        }
+
         header('Content-Type: '.$type);
 
         $action->extraHeaders();
-
-        $action->startXML('html',
+        if (preg_match("/.*\/.*xml/", $type)) {
+            // Required for XML documents
+            $action->xw->startDocument('1.0', 'UTF-8');
+        }
+        $action->xw->writeDTD('html',
                         '-//WAPFORUM//DTD XHTML Mobile 1.0//EN',
                         $this->DTD);
 
@@ -238,22 +240,16 @@ class MobileProfilePlugin extends WAP20Plugin
             return true;
         }
 
-        if (file_exists(theme_file('css/mp-screen.css'))) {
+        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'));
+            $action->cssLink('plugins/MobileProfile/mp-screen.css',null,'screen');
         }
 
-        if (file_exists(theme_file('css/mp-handheld.css'))) {
+        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'));
+            $action->cssLink('plugins/MobileProfile/mp-handheld.css',null,'handheld');
         }
 
         return false;
@@ -284,12 +280,12 @@ class MobileProfilePlugin extends WAP20Plugin
         $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'))) {
+            file_exists(Theme::file('logo.png')) || 
+            file_exists(Theme::file('mobilelogo.png'))) {
 
             $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')),
+                            ((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'));
@@ -320,6 +316,10 @@ class MobileProfilePlugin extends WAP20Plugin
                 $action->menuItem(common_local_url($connect),
                                 _('Connect'));
             }
+            if ($user->hasRight(Right::CONFIGURESITE)) {
+                $action->menuItem(common_local_url('siteadminpanel'),
+                                _('Admin'), _('Change site configuration'), false, 'nav_admin');
+            }
             if (common_config('invite', 'enabled')) {
                 $action->menuItem(common_local_url('invite'),
                                 _('Invite'));
@@ -349,16 +349,13 @@ class MobileProfilePlugin extends WAP20Plugin
         }
 
         $form->out->element('textarea', array('id' => 'notice_data-text',
-                                              'cols' => 35,
+                                              '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);
@@ -417,7 +414,15 @@ class MobileProfilePlugin extends WAP20Plugin
 
         return $proto.'://'.$serverpart.'/'.$pathpart.$relative;
     }
-}
 
-
-?>
+    function onPluginVersion(&$versions)
+    {
+        $versions[] = array('name' => 'MobileProfile',
+                            'version' => STATUSNET_VERSION,
+                            'author' => 'Sarven Capadisli',
+                            'homepage' => 'http://status.net/wiki/Plugin:MobileProfile',
+                            'rawdescription' =>
+                            _m('XHTML MobileProfile output for supporting user agents.'));
+        return true;
+    }
+}