Changeset 186967

Timestamp:

12/25/2009 04:55:52 AM (16 years ago)

Author:

Phoenixheart

Message:

+ Version 1.1.2

• Fix bug with custom ports

Location:

free-cdn

Files:

• tags/1.1.2 (added)
• tags/1.1.2/admin.js (added)
• tags/1.1.2/free_cdn.php (added)
• tags/1.1.2/readme.txt (added)
• tags/1.1.2/screenshot-1.png (added)
• tags/1.1.2/screenshot-2.png (added)
• tags/1.1.2/simple_html_dom.php (added)
• tags/1.1.2/uninstall.php (added)
• trunk/free_cdn.php (modified) (5 diffs)
• trunk/readme.txt (modified) (1 diff)

free-cdn/trunk/free_cdn.php

@@ -4 +4 @@
 Plugin URI: http://www.phoenixheart.net/wp-plugins/free-cdn
 Description: This plugin rewrites your static files' URL's (JavaScripts, CSS, images etc.) so that they are served from <a href="http://www.coralcdn.org/">CoralCDN</a> - a free P2P Content Delivery Network - instead of your own server, thus saves lots of bandwidth and improves availability. REQUIRES PHP >= 5
-Version: 1.1.1
+Version: 1.1.2
 Author: Phoenixheart
 Author URI: http://www.phoenixheart.net
@@ -14 +14 @@
     {
         var $name = 'free-cdn';
-        var $version = '1.0.0';
+        var $version = '1.0.2';
         var $default_options = array(
-            'version'   => '1.0.1',
+            'version'   => '1.0.2',
             'apply' => array(
                 'css'   => true,
@@ -278 +278 @@
             {
                 // a candidate to rewrite
-                $current_domain = $this->get_url_domain($rewritten_url);
-                list($domain, $rest) = explode($current_domain, $rewritten_url, 2);
+                $parts = parse_url($rewritten_url);
+    
+                if (isset($parts['port']))
+                {
+                    $parts['host'] .= ".$parts[port].nyud.net";
+                    unset($parts['port']);
+                }
+                else
+                {
+                    $parts['host'] .= '.nyud.net';
+                }
                 
-                $rewritten_url = "$current_domain.nyud.net$rest";
+                $rewritten_url = $this->glue_url($parts);
+                
                 if ($this->options['debug'])
                 {
@@ -294 +304 @@
                         
             return $original_url; // the url is not a candidate
-        }
-        
-        /**
-        * @desc     Gets the domain (http://www.example.com)
-        *           from an url (http:///www.example.com/dir/file.html?q)
-        */
-        function get_url_domain($url)
-        {
-            $parts = parse_url($url);
-            return $parts['scheme'] . '://' . $parts['host'];
         }
         
@@ -357 +357 @@
             return $url;
         }
+        
+        /**
+        * @author ilja at radusch dot com
+        * @param mixed $parsed
+        */
+        function glue_url($parsed) 
+        {
+            if (!is_array($parsed)) 
+            {
+                return false;
+            }
+
+            $uri = isset($parsed['scheme']) ? $parsed['scheme'].':'.((strtolower($parsed['scheme']) == 'mailto') ? '' : '//') : '';
+            $uri .= isset($parsed['user']) ? $parsed['user'].(isset($parsed['pass']) ? ':'.$parsed['pass'] : '').'@' : '';
+            $uri .= isset($parsed['host']) ? $parsed['host'] : '';
+            $uri .= isset($parsed['port']) ? ':'.$parsed['port'] : '';
+
+            if (isset($parsed['path'])) 
+            {
+                $uri .= (substr($parsed['path'], 0, 1) == '/') ?
+                    $parsed['path'] : ((!empty($uri) ? '/' : '' ) . $parsed['path']);
+            }
+
+            $uri .= isset($parsed['query']) ? '?'.$parsed['query'] : '';
+            $uri .= isset($parsed['fragment']) ? '#'.$parsed['fragment'] : '';
+
+            return $uri;
+        } 
         
         /**

free-cdn/trunk/readme.txt

@@ -5 +5 @@
 Requires at least: 2.2
 Tested up to: 3.0
-Stable tag: 1.1.1
+Stable tag: 1.1.2