Changeset 393936

Timestamp:

06/06/2011 06:30:37 PM (15 years ago)

Author:

GeertDD

Message:

Version 2.0

Location:

speedy-page-redirect/trunk

Files:

• readme.txt (modified) (2 diffs)
• speedy-page-redirect.php (modified) (8 diffs)

speedy-page-redirect/trunk/readme.txt

@@ -12 +12 @@
 This plugin adds a meta box to your page and post screens. You can enter a new destination URL to which the page will be redirected.
 
-**Features**
-
+= Features =
 * Choose between permanent and temporary redirects.
 * Support for custom post types out of the box.
@@ -31 +30 @@
 == Changelog ==
 
+= 0.2 =
+* Relative URLs are now supported (start with a slash).
+* Entering a protocol only is considered empty input.
+
 = 0.1 =
-* First version.
+* Initial release.

speedy-page-redirect/trunk/speedy-page-redirect.php

@@ -4 +4 @@
 Plugin URI: http://wordpress.org/extend/plugins/speedy-page-redirect/
 Description: Redirect pages and posts to other locations.
-Version: 0.1
+Version: 0.2
 Author: Geert De Deckere
 Author URI: http://www.geertdedeckere.be/
@@ -26 +26 @@
 */
 
+// Start your engines!
+new GDD_Speedy_Page_Redirect;
+
 class GDD_Speedy_Page_Redirect {
 
@@ -33 +36 @@
      * @var string
      */
-    const VERSION = '0.1';
+    const VERSION = '0.2';
 
     /**
@@ -185 +188 @@
         echo '<p>';
         echo '<label for="gdd_spr_url">'.__('Destination URL:', 'page-redirect').'</label> ';
-        echo '<input id="gdd_spr_url" name="gdd_spr_url" type="text" value="'.esc_url($values['url']).'" size="50" style="width:80%">';
+        echo '<input id="gdd_spr_url" name="gdd_spr_url" type="text" value="'.esc_url($values['url_raw']).'" size="50" style="width:80%">';
         echo '</p>';
 
@@ -220 +223 @@
         $url = (isset($_POST['gdd_spr_url'])) ? trim((string) $_POST['gdd_spr_url']) : '';
 
-        // A URL was entered
-        if ($url !== '' && $url !== 'http://')
+        // A URL was entered (standalone protocols like "http://" are considered emtpy)
+        if ($url !== '' && ! preg_match('~^[-a-z0-9+.]++://$~i', $url))
         {
             // Prepare data array to store in the database
@@ -260 +263 @@
         $post_id = (isset($post->ID)) ? $post->ID : $post;
 
-        // If redirection data is found, only return the destination URL in case of a permanent redirect
-        if (($data = $this->get_post_data($post_id)) && $data['status'] == 301)
-            return $data['url'];
-
-        // Return the original URL
-        return $url;
+        // No redirection data found
+        if ( ! $data = $this->get_post_data($post_id))
+            return $url;
+
+        // Only hard-code the destionation URL in case of a permanent redirect
+        if ($data['status'] != 301)
+            return $url;
+
+        // Return the destination URL
+        return $data['url'];
     }
 
@@ -325 +332 @@
             foreach ($rows as $row)
             {
+                // Unserialize data
+                $data = unserialize($row->meta_value);
+
+                // Store the originally saved URL as raw_url
+                $data['url_raw'] = $data['url'];
+
+                // Generate the full URL in case a relative URL is stored in the database
+                if (substr($data['url'], 0, 1) === '/')
+                {
+                    $data['url'] = trailingslashit(get_bloginfo('url')).ltrim($data['url'], '/');
+                }
+
                 // Cache redirection data in object property
-                $this->data[$blog_id][(int) $row->post_id] = unserialize($row->meta_value);
+                $this->data[$blog_id][(int) $row->post_id] = $data;
             }
         }
@@ -335 +354 @@
 
 }
-
-// Start your engines!
-new GDD_Speedy_Page_Redirect;