X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=plugins%2FMobileProfile%2FMobileProfilePlugin.php;h=5d0fd2ddb9a041ed6666c262155448e4d5f35b4b;hb=e8d1bb25469fe1ef0cbcb32c3022010997aca4b0;hp=0eb57035d1290155db75a2d90d11fd857ba5d372;hpb=8205c56e25da078e84a8e1cb0a27755339ce43b2;p=quix0rs-gnu-social.git

diff --git a/plugins/MobileProfile/MobileProfilePlugin.php b/plugins/MobileProfile/MobileProfilePlugin.php
index 0eb57035d1..5d0fd2ddb9 100644
--- a/plugins/MobileProfile/MobileProfilePlugin.php
+++ b/plugins/MobileProfile/MobileProfilePlugin.php
@@ -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?
@@ -209,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',
@@ -292,27 +292,26 @@ class MobileProfilePlugin extends WAP20Plugin
 
     function _showLogo($action)
     {
-        $action->elementStart('address', 'vcard');
+        $action->elementStart('address');
         if (common_config('singleuser', 'enabled')) {
             $user = User::singleUser();
-            $url = common_local_url('showstream', array('nickname' => $user->nickname));
+            $url = common_local_url('showstream', array('nickname' => $user->getNickname()));
         } else {
             $url = common_local_url('public');
         }
 
-        $action->elementStart('a', array('class' => 'url home bookmark',
+        $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');
     }
@@ -333,7 +332,7 @@ class MobileProfilePlugin extends WAP20Plugin
         }
     }
 
-    function onEndShowScripts($action)
+    function onEndShowScripts(Action $action)
     {
         // @todo FIXME: "Show Navigation" / "Hide Navigation" needs i18n
         $action->inlineScript('
@@ -407,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' =>