Changeset 37002

Timestamp:

03/31/08 05:20:39 (4 months ago)

Author:

alexkingorg

Message:

updates to try to help people that don't RTFM

Location:

wordpress-mobile-edition/trunk

Files:

• README.txt (modified) (2 diffs)
• wp-mobile.php (modified) (4 diffs)

wordpress-mobile-edition/trunk/README.txt

@@ -3 +3 @@
 Contributors: alexkingorg
 Minimum version: 1.5
-Tested with: 2.0.5
-Stable tag: 2.0
+Tested with: 2.5
+Stable tag: 2.1
 
 WordPress Mobile Edition is a plugin that shows an interface designed for a mobile device when visitors come to your site on a mobile device.
@@ -29 +29 @@
 
 
-= I visited the site in a mobile browser and my theme was reset to default, why? =
+= Can I create a link that forces someone to see the mobile version? =
 
-Probably because you missed step 2 in the installation directions above. If the requested theme is not available, WordPress will reset your theme to the default.
+Yes, this is included as an experimental feature in version 2.1. The link can be added to your theme by using the akm_mobile_link() template tag:
+
+`<?php akm_mobile_link(); ?>`
 
 

wordpress-mobile-edition/trunk/wp-mobile.php

@@ -3 +3 @@
 // WordPress Mobile Edition
 //
-// Copyright (c) 2002-2006 Alex King
+// Copyright (c) 2002-2008 Alex King
 // http://alexking.org/projects/wordpress
 //
@@ -21 +21 @@
 Author: Alex King
 Author URI: http://alexking.org
-Version: 2.1dev
+Version: 2.1
 */ 
+
+if (!function_exists('is_admin_page')) {
+      function is_admin_page() {
+            if (function_exists('is_admin')) {
+                  return is_admin();
+            }
+            if (function_exists('check_admin_referer')) {
+                  return true;
+            }
+            else {
+                  return false;
+            }
+      }
+}
 
 $_SERVER['REQUEST_URI'] = ( isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : $_SERVER['SCRIPT_NAME'] . (( isset($_SERVER['QUERY_STRING']) ? '?' . $_SERVER['QUERY_STRING'] : '')));
@@ -109 +123 @@
 
 function akm_template($theme) {
-      return apply_filters('akm_template', 'wp-mobile');
+      if (akm_installed()) {
+            return apply_filters('akm_template', 'wp-mobile');
+      }
+      else {
+            return $theme;
+      }
+}
+
+function akm_installed() {
+      return is_dir(ABSPATH.'/wp-content/themes/wp-mobile');
+}
+
+function akm_misinstalled($content) {
+      return $content.'<p>WordPress Mobile Edition has been incorrectly installed. Please follow the steps in the README to install it correctly or disable the plugin.</p>';
+}
+
+if (is_admin_page() && !akm_installed()) {
+      global $wp_version;
+      if (isset($wp_version) && version_compare($wp_version, '2.5', '>=')) {
+            add_action('admin_notices', create_function( '', "echo '<div class=\"error\">WP Mobile is incorrectly installed. Please check the <a href=\"http://alexking.org/projects/wordpress/readme?project=wordpress-mobile-edition\">README</a>.</div>';" ) );
+      }
 }
 
 function akm_mobile_available($content) {
-      return $content.'<p><a href="'.get_bloginfo('wpurl').'/wp-admin/options-general.php?ak_action=accept_mobile">Return to the Mobile Edition</a>.</p>';
+      return $content.'<p><a href="'.get_bloginfo('wpurl').'/index.php?ak_action=accept_mobile">Return to the Mobile Edition</a>.</p>';
+}
+
+function akm_mobile_link() {
+      echo '<a href="'.get_bloginfo('wpurl').'/index.php?ak_action=force_mobile">Mobile Edition</a>';
 }
 
@@ -159 +197 @@
 }
 
-if (isset($_GET['ak_action'])) {
-      $url = parse_url(get_bloginfo('home'));
-      $domain = $url['host'];
-      if (!empty($url['path'])) {
-            $path = $url['path'];
-      }
-      else {
-            $path = '/';
-      }
-      $redirect = false;
-      switch ($_GET['ak_action']) {
-            case 'reject_mobile':
-                  setcookie(
-                        'akm_mobile'
-                        , 'false'
-                        , time() + 300000
-                        , $path
-                        , $domain
-                  );
-                  $redirect = true;
-                  break;
-            case 'force_mobile':
-            case 'accept_mobile':
-                  setcookie(
-                        'akm_mobile'
-                        , 'true'
-                        , time() + 300000
-                        , $path
-                        , $domain
-                  );
-                  $redirect = true;
-                  break;
-      }
-      if ($redirect) {
-            if (!empty($_SERVER['HTTP_REFERER'])) {
-                  $go = $_SERVER['HTTP_REFERER'];
+function akm_request_handler() {
+      if (isset($_GET['ak_action'])) {
+            $url = parse_url(get_bloginfo('home'));
+            $domain = $url['host'];
+            if (!empty($url['path'])) {
+                  $path = $url['path'];
             }
             else {
-                  $go = get_bloginfo('home');
-            }
-            header('Location: '.$go);
-            die();
-      }
-}
+                  $path = '/';
+            }
+            $redirect = false;
+            switch ($_GET['ak_action']) {
+                  case 'reject_mobile':
+                        setcookie(
+                              'akm_mobile'
+                              , 'false'
+                              , time() + 300000
+                              , $path
+                              , $domain
+                        );
+                        $redirect = true;
+                        break;
+                  case 'force_mobile':
+                  case 'accept_mobile':
+                        setcookie(
+                              'akm_mobile'
+                              , 'true'
+                              , time() + 300000
+                              , $path
+                              , $domain
+                        );
+                        $redirect = true;
+                        break;
+            }
+            if ($redirect) {
+                  if (!empty($_SERVER['HTTP_REFERER'])) {
+                        $go = $_SERVER['HTTP_REFERER'];
+                  }
+                  else {
+                        $go = get_bloginfo('home');
+                  }
+                  header('Location: '.$go);
+                  die();
+            }
+      }
+}
+add_action('init', 'akm_request_handler');
 
 if (akm_check_mobile()) {