Merge branch 'master' into social-master

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

diff --git a/plugins/MobileProfile/MobileProfilePlugin.php b/plugins/MobileProfile/MobileProfilePlugin.php
index 5d84c28dc7bba5edf6c013318d3e40a4ed6e0071..9d7075a3a267750560922a399da57575e60ececc 100644 (file)
--- a/plugins/MobileProfile/MobileProfilePlugin.php
+++ b/plugins/MobileProfile/MobileProfilePlugin.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET') && !defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
@@ -59,7 +59,7 @@ class MobileProfilePlugin extends WAP20Plugin
         parent::__construct();
     }
 
-    function onStartShowHTML($action)
+    function onStartShowHTML(Action $action)
     {
         // XXX: This should probably graduate to WAP20Plugin
 
@@ -72,7 +72,7 @@ class MobileProfilePlugin extends WAP20Plugin
         } else if (isset($_COOKIE['MobileOverride'])) {
             // Cookie override is controlled by link at bottom.
             $this->serveMobile = (bool)$_COOKIE['MobileOverride'];
-        } else {
+        } elseif (array_key_exists('HTTP_USER_AGENT', $_SERVER)) {
             // If they like the WAP 2.0 mimetype, serve them MP
             // @fixme $type is undefined, making this if case useless and spewing errors.
             // What's the intent?
@@ -111,6 +111,7 @@ class MobileProfilePlugin extends WAP20Plugin
                     'ipod',
                     'j2me',
                     'lg',
+                    'maemo',
                     'midp-',
                     'mobile',
                     'mot',
@@ -208,7 +209,7 @@ class MobileProfilePlugin extends WAP20Plugin
            $action->extraHeaders();
            if (preg_match("/.*\/.*xml/", $type)) {
                // Required for XML documents
-               $action->xw->startDocument('1.0', 'UTF-8');
+               $action->startXML();
            }
            $action->xw->writeDTD('html',
                            '-//WAPFORUM//DTD XHTML Mobile 1.0//EN',
@@ -243,7 +244,7 @@ class MobileProfilePlugin extends WAP20Plugin
         }
     }
 
-    function onStartShowStatusNetStyles($action)
+    public function onStartShowStylesheets(Action $action)
     {
         if (!$this->serveMobile) {
             return true;
@@ -251,21 +252,18 @@ class MobileProfilePlugin extends WAP20Plugin
 
         $action->primaryCssLink();
 
+        $action->cssLink($this->path('mp-screen.css'),null,'screen');
         if (file_exists(Theme::file('css/mp-screen.css'))) {
             $action->cssLink('css/mp-screen.css', null, 'screen');
-        } else {
-            $action->cssLink($this->path('mp-screen.css'),null,'screen');
         }
 
+        $action->cssLink($this->path('mp-handheld.css'),null,'handheld');
         if (file_exists(Theme::file('css/mp-handheld.css'))) {
             $action->cssLink('css/mp-handheld.css', null, 'handheld');
-        } else {
-            $action->cssLink($this->path('mp-handheld.css'),null,'handheld');
         }
 
         // Allow other plugins to load their styles.
-        Event::handle('EndShowStatusNetStyles', array($action));
-        Event::handle('EndShowLaconicaStyles', array($action));
+        Event::handle('EndShowStylesheets', array($action));
 
         return false;
     }
@@ -294,31 +292,38 @@ class MobileProfilePlugin extends WAP20Plugin
 
     function _showLogo($action)
     {
-        $action->elementStart('address', 'vcard');
-        $action->elementStart('a', array('class' => 'url home bookmark',
-                                       'href' => common_local_url('public')));
+        $action->elementStart('address');
+        if (common_config('singleuser', 'enabled')) {
+            $user = User::singleUser();
+            $url = common_local_url('showstream', array('nickname' => $user->getNickname()));
+        } else {
+            $url = common_local_url('public');
+        }
+
+        $action->elementStart('a', array('class' => 'h-card home bookmark',
+                                         'href' => $url));
+
         if (common_config('site', 'mobilelogo') ||
             file_exists(Theme::file('logo.png')) ||
             file_exists(Theme::file('mobilelogo.png'))) {
 
-            $action->element('img', array('class' => 'photo',
+            $action->element('img', array('class' => 'u-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 onStartShowAside($action)
+    function onStartShowAside(Action $action)
     {
         if ($this->serveMobile) {
             return false;
         }
     }
 
-    function onStartShowLocalNavBlock($action)
+    function onStartShowLocalNavBlock(Action $action)
     {
         if ($this->serveMobile) {
             // @todo FIXME: "Show Navigation" / "Hide Navigation" needs i18n
@@ -327,7 +332,7 @@ class MobileProfilePlugin extends WAP20Plugin
         }
     }
 
-    function onEndShowScripts($action)
+    function onEndShowScripts(Action $action)
     {
         // @todo FIXME: "Show Navigation" / "Hide Navigation" needs i18n
         $action->inlineScript('
@@ -401,10 +406,10 @@ class MobileProfilePlugin extends WAP20Plugin
         return $proto.'://'.$serverpart.'/'.$pathpart.$relative;
     }
 
-    function onPluginVersion(&$versions)
+    function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'MobileProfile',
-                            'version' => STATUSNET_VERSION,
+                            'version' => GNUSOCIAL_VERSION,
                             'author' => 'Sarven Capadisli',
                             'homepage' => 'http://status.net/wiki/Plugin:MobileProfile',
                             'rawdescription' =>