Merge branch 'master' of gitorious.org:statusnet/mainline into testing

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

diff --git a/plugins/MobileProfile/MobileProfilePlugin.php b/plugins/MobileProfile/MobileProfilePlugin.php
index 0dcbad9e8924f3f3a39fab9877a0d52a1436b8cc..cd2531fa727a8f3b7d4d2fd41ed645a8f3d4dc7d 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,9 +63,6 @@ class MobileProfilePlugin extends WAP20Plugin
 
     function onStartShowHTML($action)
     {
-
-
-
         // XXX: This should probably graduate to WAP20Plugin
 
         // If they are on the mobile site, serve them MP
@@ -162,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);
             }
         }
 
@@ -176,7 +172,7 @@ class MobileProfilePlugin extends WAP20Plugin
               $_SERVER['HTTP_ACCEPT'] : null;
 
             $cp = common_accept_to_prefs($httpaccept);
-            $sp = common_accept_to_prefs(PAGE_TYPE_PREFS);
+            $sp = common_accept_to_prefs(PAGE_TYPE_PREFS_MOBILEPROFILE);
 
             $type = common_negotiate_type($cp, $sp);
 
@@ -244,28 +240,32 @@ class MobileProfilePlugin extends WAP20Plugin
             return true;
         }
 
+        $action->cssLink('css/display.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'))) {
             $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;
     }
 
 
+    function onStartShowUAStyles($action) {
+        if (!$this->serveMobile) {
+            return true;
+        }
+
+        return false;
+    }
+
     function onStartShowHeader($action)
     {
         if (!$this->serveMobile) {
@@ -291,7 +291,7 @@ class MobileProfilePlugin extends WAP20Plugin
                                        '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('mobilelogo.png'))) {
 
             $action->element('img', array('class' => 'photo',
                 'src' => (common_config('site', 'mobilelogo')) ? common_config('site', 'mobilelogo') : 
@@ -326,6 +326,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'));
@@ -362,9 +366,6 @@ class MobileProfilePlugin extends WAP20Plugin
 
         $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);
@@ -423,7 +424,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;
+    }
+}