Changeset 1066181

Timestamp:

01/12/2015 04:43:14 PM (11 years ago)

Author:

jonscaife

Message:

v1.16 fixed and updates

Location:

worldcurrency/trunk

Files:

• ip2c/ip-to-country.bin (modified) (previous)
• readme.txt (modified) (3 diffs)
• worldcurrency.php (modified) (19 diffs)
• yahoofinance.class.php (modified) (12 diffs)

worldcurrency/trunk/readme.txt

@@ -1 @@
-=== WorldCurrency ===
-Contributors: WhiteCubes
+=== WorldCurrency ===
+Contributors: WhiteCubes, JonScaife
 Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=6CUNDYFWV4NUW
 Tags: currency, exchange rates, currency converter, currency rates, travel, financial, eCommerce
 Requires at least: 2.8.0
-Tested up to: 3.3.2
-Stable tag: 1.15
+Tested up to: 4.1
+Stable tag: 1.16
 
 Recognises users by IP address and shows them converted values in their local currency, you can write post/pages in multiple currencies.
@@ -56 +56 @@
       
 = Compatibility: =
-* This plugin is written and tested on Wordpress 3.2.1 and Wordpress 3.3.1, but I think it will work on many other versions.
+* This plugin is tested on Wordpress 4.1, but I think it will work on many other versions.
 
 = Support: =
@@ -97 +97 @@
 
 == Changelog ==
+
+= 1.16 (12 January 2015) =
+* Fix: getting rates from yahoo has been fixed
+* Fix: Getting currency rates over SSL address had extra s (httpss), now correctly https
+* Added: Wrapper function for cases where jQuery is loaded defer or async
+* Change: by default a dot is now used for decimal, and comma for thousand separator
+* Change: by default jQuery is used in no conflict mode
+* Change: the default format of output is smaller and tidier with just symbol and value (e.g. $40)
+* Change: Updated the ip2c database from http://software77.net/geo-ip/
 
 = 1.15 (13 June 2012) =

worldcurrency/trunk/worldcurrency.php

@@ -4 +4 @@
 Plugin URI: http://www.cometicucinoilweb.it/blog/en/worldcurrency-plugin-for-wordpress/
 Description: Recognises users by IP address and shows them converted values in their local currency, you can write post/pages in multiple currencies.
-Version: 1.15
-Date: 13 June 2012
+Version: 1.16
+Date: 12 Jamuary 2015
 Author: Daniele Tieghi
 Author URI: www.cometicucinoilweb.it/blog/en/who-we-are/daniele-tieghi/
-   
+
    Copyright 2012 - 2012 Daniele Tieghi  (email: daniele.tieghi(at)gmail.com)
 
@@ -24 +24 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-    
+
 Built on ideas and small code portions from LocalCurrency (http://www.jobsinchina.com/resources/wordpress-plugin-localcurrency)
 Uses IP2C (http://firestats.cc/wiki/ip2c) to determine user's country
 Uses Yahoo! Finance (http://finance.yahoo.com) for conversion rates
+Updates since version 1.16 by Jon Scaife (https://jonscaife.com, https://diymediahome.org)
 */
     // Loads currency infos
@@ -44 +45 @@
         add_shortcode('worldcurrencybox', 'dt_wc_shortcode_box');
         add_filter('the_content', 'dt_wc_content', $dt_wc_options['plugin_priority']);
-        
+
         add_action( 'wp_ajax_nopriv_worldcurrency', 'dt_wc_ajaxGetExchangeRate' );
-        add_action( 'wp_ajax_worldcurrency', 'dt_wc_ajaxGetExchangeRate' );     
+        add_action( 'wp_ajax_worldcurrency', 'dt_wc_ajaxGetExchangeRate' );
         add_action( 'wp_ajax_nopriv_worldcurrencybox', 'dt_wc_ajaxGetCurrencySelectionBox' );
-        add_action( 'wp_ajax_worldcurrencybox', 'dt_wc_ajaxGetCurrencySelectionBox' );      
-        
+        add_action( 'wp_ajax_worldcurrencybox', 'dt_wc_ajaxGetCurrencySelectionBox' );
+
     // Register Widget
         require_once 'worldcurrency.widget.php';
@@ -55 +56 @@
     // Create options on Activation
         function dt_wc_createOptions($force = false) {
-            
+
             $dt_wc_options = get_option('$dt_wc_options');
-    
+
             if ($force || !isset($dt_wc_options['plugin_link']))            $dt_wc_options['plugin_link'] = 'true';
             if ($force || !isset($dt_wc_options['yahoo_link']))             $dt_wc_options['yahoo_link'] = 'true';
@@ -64 +65 @@
             if ($force || !isset($dt_wc_options['historic_rates']))         $dt_wc_options['historic_rates'] = 'false';
             if ($force || !isset($dt_wc_options['hide_if_same']))           $dt_wc_options['hide_if_same'] = 'true';
-            if ($force || !isset($dt_wc_options['output_format']))          $dt_wc_options['output_format'] = '(~%to_value%%to_symbol% %to_code%)';
-            if ($force || !isset($dt_wc_options['thousands_separator']))    $dt_wc_options['thousands_separator'] = '.';
-            if ($force || !isset($dt_wc_options['decimal_separator']))      $dt_wc_options['decimal_separator'] = ',';
-            if ($force || !isset($dt_wc_options['output_format']))          $dt_wc_options['output_format'] = '(~%to_value%%to_symbol% %to_code%)';
+            if ($force || !isset($dt_wc_options['output_format']))          $dt_wc_options['output_format'] = ' (%to_symbol%%to_value%)';
+            if ($force || !isset($dt_wc_options['thousands_separator']))    $dt_wc_options['thousands_separator'] = ',';
+            if ($force || !isset($dt_wc_options['decimal_separator']))      $dt_wc_options['decimal_separator'] = '.';
             if ($force || !isset($dt_wc_options['bottom_select']))          $dt_wc_options['bottom_select'] = 'true';
             if ($force || !isset($dt_wc_options['include_jquery']))         $dt_wc_options['include_jquery'] = 'true';
             if ($force || !isset($dt_wc_options['include_always']))         $dt_wc_options['include_always'] = 'false';
-            if ($force || !isset($dt_wc_options['jquery_no_conflict']))     $dt_wc_options['jquery_no_conflict'] = 'false';
+            if ($force || !isset($dt_wc_options['jquery_no_conflict']))     $dt_wc_options['jquery_no_conflict'] = 'true';
             if ($force || !isset($dt_wc_options['ajax_over_ssl']))          $dt_wc_options['ajax_over_ssl'] = 'false';
             if ($force || !isset($dt_wc_options['plugin_priority']))        $dt_wc_options['plugin_priority'] = 10;
@@ -89 +89 @@
 }
 EOT;
-                
+
             update_option('dt_wc_options', $dt_wc_options);
         }
-        
+
     // Create the options page
         function dt_wc_adminPage() {
             require_once('worldcurrency-admin.php');
         }
-        
+
     // Add page scripts
         function dt_wc_head() {
             global $post;
-            
+
             $dt_wc_options = get_option('dt_wc_options');
-            
+
             $jQuerySymbol = $dt_wc_options['jquery_no_conflict'] == 'true' ? 'jQuery' : '$';
-            
+
             // Include the script only if necessary
             if ($dt_wc_options['include_always'] == 'true' || get_post_meta($post->ID, 'wc_force', true) == 1 || strpos($post->post_content, 'worldcurrency') !== false) {
-                
+
                 $usercurrency = dt_wc_userlocation();
                 if (!$usercurrency) {$usercurrency = 'EUR';}
-                
+
                 echo "\n<!-- DT WorldCurrency Code -->\n";
-                
+
                 // Include jQuery if needed
                 if ($dt_wc_options['include_jquery'] == 'true')
                     echo "<script type='text/javascript' src='http://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js'></script>\n";
-                    
+
                 if ($dt_wc_options['ajax_over_ssl'] == 'true') {
-                    $ajax_url = wp_nonce_url(str_replace('http','https', admin_url('admin-ajax.php')), 'worldcurrency_safe');
+                    $ajax_url = wp_nonce_url(str_replace('http:','https:', admin_url('admin-ajax.php')), 'worldcurrency_safe');
                 } else {
-                    $ajax_url = wp_nonce_url(str_replace('https','http', admin_url('admin-ajax.php')), 'worldcurrency_safe');
+                    $ajax_url = wp_nonce_url(str_replace('https:','http:', admin_url('admin-ajax.php')), 'worldcurrency_safe');
                 }
-                
+
                 ?>
                 <script type="text/javascript">
                 <!--
 
+                    function worldCurInit() {
+
                     <?php if ($dt_wc_options['jquery_no_conflict'] == 'true'): ?>
                         jQuery.noConflict();
                     <?php endif; ?>
-    
+
                     dt_worldCurrency_update = function(userCurrency) {
                         // For each worldcurrency <span> get the value
                         <?php echo $jQuerySymbol; ?>('.worldcurrency').each(function() {
-        
+
                             var theSpan = <?php echo $jQuerySymbol; ?>(this);
                             <?php echo $jQuerySymbol; ?>.ajax({
@@ -148 +150 @@
                                     alert(textStatus + ': ', + errorThrown);
                                 }
-                            });     
-                        }); 
+                            });
+                        });
 
                         // For each Currency selection box, chose the right value
                         <?php echo $jQuerySymbol; ?>('.worldcurrency_select').val(userCurrency);
-                        
+
                     }
-    
+
                     // When the page is loaded
                     <?php echo $jQuerySymbol; ?>(document).ready(function() {
@@ -166 +168 @@
                         // Render Currency selection boxes
                         <?php echo $jQuerySymbol; ?>('.worldcurrency_selection_box_placeholder').each(function() {
-        
+
                             var theDiv = <?php echo $jQuerySymbol; ?>(this);
                             <?php echo $jQuerySymbol; ?>.ajax({
@@ -187 +189 @@
                                     alert(textStatus + ': ', + errorThrown);
                                 }
-                            });     
-                        }); 
+                            });
+                        });
 
                         dt_worldCurrency_update('<?php echo $usercurrency; ?>');
-                        
+
                     });
-                
+
+                    }
+
+                    function runWCWhenJQueryIsLoaded() {
+                        if (window.jQuery){
+                            worldCurInit();
+                        } else {
+                            setTimeout(runWCWhenJQueryIsLoaded, 5);
+                        }
+                    }
+
+                    runWCWhenJQueryIsLoaded();
+
                 -->
                 </script>
@@ -199 +213 @@
                 <?php echo $dt_wc_options['additional_css']; ?>
                 </style>
-                <!-- End of LocalCurrency DT Extension Code -->
+                <!-- End of WorldCurrency DT Extension Code -->
                 <?php
-                
-            } 
-        }
-        
+
+            }
+        }
+
     // Retrieve user location via IP2C
         function dt_wc_userlocation() {
             global $dt_wc_locationlist;
             require_once dirname(__FILE__).'/ip2c/ip2c.php';
-            
+
             $ip2c = new ip2country();
             $res = $ip2c->get_country($_SERVER['REMOTE_ADDR']);
-            
+
             if ($res == false) {
                 return false;
@@ -219 +233 @@
             }
         }
-        
+
     /**
      * Handler for [worldcurrency] shortcode
-     * 
+     *
      * USAGE:
-     * 
+     *
      *      [worldcurrency cur="EUR" value="25"]
-     *          in united states will show: 
+     *          in united states will show:
      *          30 USD
-     * 
+     *
      * Parameters:
-     * 
+     *
      *      curr="***"              -> the name of the value currency
      *      target="***"            -> the name of the target currency (if you want to force it)
      *      value="***"             -> the value used for exchange
      *      historic="true|false"   -> (optional) override main plugin setting
-     * 
+     *
      * @param array $attr
      */
     function dt_wc_shortcode($attr) {
         global $post;
-        
+
         if (!isset($attr['curr']) || !isset($attr['value']))
             return '[worldcurrency error: curr="" and value="" parameters needed]';
-        
+
         $out = '<span class="worldcurrency" postId="'.$post->ID.'" curr="'.$attr['curr'].'" value="'.$attr['value'].'" ';
-        
+
         if (isset($attr['historic']))   $out .= 'historic="'.$attr['historic'].'" ';
         if (isset($attr['target']))     $out .= 'target="'.$attr['target'].'" ';
 
         $out .= '></span>';
-            
+
         return $out;
     }
-            
+
     /**
      * Handler for [worldcurrencybox] shortcode that shows the currency selection box
@@ -260 +274 @@
         return dt_wc_getCurrencySelectionBox();
     }
-    
+
     /**
      * On publishing/updating post/page saves the current currency conversion rates for future historic uses
@@ -266 +280 @@
     function dt_wc_publish() {
         global $post;
-        
+
         // Check if there are rates attached to the post or else saves them
         if (!($serializedQuotes = get_post_meta($post->ID, 'wc_rates', true))) {
-            
+
             // Include our Yahoo!Finance class
             require_once 'yahoofinance.class.php';
             $YahooFinance = new yahoofinance();
-            
+
             update_post_meta($post->ID, 'wc_rates', $serializedQuotes = $YahooFinance->getSerializedQuotes());
             update_post_meta($post->ID, 'wc_rates_date', time());
-            
-        }
-    }
-    
+
+        }
+    }
+
     /**
      * Adds a currecy selection box at the end of the page/post if needed
@@ -290 +304 @@
         return $theContent;
     }
-    
-    
+
+
     /**
      * Generate and returns the HTML for the currency selection box
@@ -297 +311 @@
     function dt_wc_getCurrencySelectionBox() {
         $out = '';
-        
+
         // Include our Yahoo!Finance class
             require_once 'currencies.inc.php';
             global $dt_wc_currencylist;
-        
+
         // Retrieve current WC saved options from Wordpress
             $dt_wc_options = get_option('dt_wc_options');
-    
+
         $out .= '<div class="worldcurrency_selection_box">';
-        
+
             // Renders the select box
                 $out .= '<div style="float:left;margin-right:4px;">Show currencies in:</div>';
@@ -315 +329 @@
                 }
                 $out .= '</select>';
-                
+
             // Renders the credits
                 if ($dt_wc_options['plugin_link'] == 'true' || $dt_wc_options['yahoo_link'] == 'true') $out .= '<div class="credits">Powered by';
@@ -321 +335 @@
                 if ($dt_wc_options['yahoo_link'] == 'true') $out .= ' <a href="http://finance.yahoo.com" title="Visit Yahoo! Finance" target="_blank">Yahoo! Finance</a> for the rates.';
                 if ($dt_wc_options['plugin_link'] == 'true' || $dt_wc_options['yahoo_link'] == 'true') $out .= '</div>';
-            
+
         $out .= '</div>'."\n";
-        
+
         return $out;
     }
-    
+
     function dt_wc_ajaxGetCurrencySelectionBox() {
         // Make sure there's nothing bad in the URL
-            foreach ($_GET as $key => $value) 
-                $_GET[$key] = htmlentities(stripslashes($value));   
-        
+            foreach ($_GET as $key => $value)
+                $_GET[$key] = htmlentities(stripslashes($value));
+
         // Don't proceed if we don't have enough info or if the nonce fails
-            if (!check_admin_referer('worldcurrency_safe')) 
+            if (!check_admin_referer('worldcurrency_safe'))
                 die();
-            
+
         echo dt_wc_getCurrencySelectionBox();
-        
+
         exit;
     }
-    
+
     function dt_wc_ajaxGetExchangeRate() {
-        
+
         // Make sure there's nothing bad in the URL
-            foreach ($_GET as $key => $value) 
-                $_GET[$key] = htmlentities(stripslashes($value));   
-        
+            foreach ($_GET as $key => $value)
+                $_GET[$key] = htmlentities(stripslashes($value));
+
         // Don't proceed if we don't have enough info or if the nonce fails
-            if (!isset($_GET['value']) || !isset($_GET['historic']) || !isset($_GET['from']) || !isset($_GET['to']) || !check_admin_referer('worldcurrency_safe')) 
+            if (!isset($_GET['value']) || !isset($_GET['historic']) || !isset($_GET['from']) || !isset($_GET['to']) || !check_admin_referer('worldcurrency_safe'))
                 exit;
-            
+
         // Include our Yahoo!Finance class
             require_once 'yahoofinance.class.php';
             global $dt_wc_currencylist;
             $YahooFinance = new yahoofinance();
-        
+
         // Retrieve current WC saved options from Wordpress
             $dt_wc_options = get_option('dt_wc_options');
-            
-        // Check if we need only historic rates 
+
+        // Check if we need only historic rates
         if ($_GET['historic'] == 'true' && isset($_GET['postId'])) {
-            
+
             // Check if there are rates attached to the post or else saves them
             if (!($serializedQuotes = get_post_meta($_GET['postId'], 'wc_rates', true))) {
@@ -367 +381 @@
                 update_post_meta($_GET['postId'], 'wc_rates_date', time());
             }
-            
+
         } else {
-            
-            // We need current rates, check if we have them stored in options       
+
+            // We need current rates, check if we have them stored in options
             if (!!$dt_wc_options['cache_rates'] && $dt_wc_options['cache_time'] >= (time() - 86400)) {
                 // Fetch Rates from options if they are fresh
@@ -380 +394 @@
                 update_option('dt_wc_options', $dt_wc_options);
             }
-            
-        }
-        
+
+        }
+
         // Get the separators format
         $thousands_separator = isset($dt_wc_options['thousands_separator']) ? $dt_wc_options['thousands_separator'] : '.';
         $decimals_separator = isset($dt_wc_options['decimal_separator']) ? $dt_wc_options['decimal_separator'] : ',';
 
-        
+
         // Load the quotes obtained
             $YahooFinance->loadSerializedQuotes($serializedQuotes);
-    
+
         // Fetch the desired exchange rate and prepare all the parameters
-        
+
             $exchange_rate  = $YahooFinance->getExchangeRate($_GET['from'], $_GET['to']);
-            
+
             $from_code      = $_GET['from'];
             $from_value     = $_GET['value'];
             $from_name      = $dt_wc_currencylist[$from_code]['name'];
             $from_symbol    = $dt_wc_currencylist[$from_code]['symbol'];
-            
+
             $to_code        = $_GET['to'];
             $to_value       = $from_value * $exchange_rate;
             $to_name        = $dt_wc_currencylist[$to_code]['name'];
             $to_symbol      = $dt_wc_currencylist[$to_code]['symbol'];
-            
+
         // Round the numbers
             $exchange_rate = number_format($exchange_rate,2,',','.');
             $from_value = $from_value > 100 ? number_format($from_value,0,$decimals_separator,$thousands_separator) : number_format($from_value, 2,$decimals_separator,$thousands_separator);
             $to_value = $to_value > 100 ? number_format($to_value,0,$decimals_separator,$thousands_separator) : number_format($to_value, 2,$decimals_separator,$thousands_separator);
-        
+
         // Do not show conversions to the same currency
             if ($dt_wc_options['hide_if_same'] == 'true' && $from_code == $to_code)
                 exit;
-            
+
         // Echo in the required format
             echo str_replace(array('%exchange_rate%','%from_code%','%from_value%','%from_name%','%from_symbol%','%to_code%','%to_value%','%to_name%','%to_symbol%'), array($exchange_rate,$from_code,$from_value,$from_name,$from_symbol,$to_code,$to_value,$to_name,$to_symbol), $dt_wc_options['output_format']);
-            
+
         exit;
     }
-    

worldcurrency/trunk/yahoofinance.class.php

@@ -2 +2 @@
 
     require_once 'currencies.inc.php';
-    
+
     /**
      * Class used to get informations from yahoo finance or to load them from a serialized string
      * Used by WordCurrency plugin for Wordpress
-     * 
+     *
      * @author Daniele Tieghi
      */
     class yahoofinance {
-        
+
         /**
          * Array with informations about all the currencies
@@ -17 +17 @@
          */
         private $currencyList = array();
-        
+
         /**
          * Array with quote couple names (ie: USDEUR, USDTHB)
@@ -23 +23 @@
          */
         private $quoteCouples = array();
-        
+
         /**
          * All the quotes received from Yahoo!Finance (or loaded from saved data)
@@ -29 +29 @@
          */
         private $quotes = array();
-        
-        
+
+
         //////////////////////////////////////////////////////////////////////////////////
         //////////////////////////////////////////////////////////////////////////////////
-        
+
         /**
          * Build basic data
@@ -42 +42 @@
             $this->buildUSDQuoteCouples();
         }
-        
+
         /**
          * Build all the quote couples (with USD as a base) that we need to get from Yahoo!Finance
@@ -55 +55 @@
             return $this->quoteCouples;
         }
-        
+
         /**
          * Calls the Yahoo!Finance service and gets the quotes for every quote couple we need
          */
         private function getCurrentQuotesFromYahooFinance() {
-            
+
             // Build the query parameters
             $parameters = array(
@@ -67 +67 @@
                 'e=.csv',                                       // The format we want (not needed)
             );
-            
+
             // Use a Socket connection to call Yahoo!Finance service
             $host="download.finance.yahoo.com";
             $fp = @fsockopen($host, 80, $errno, $errstr, 30);
-            
+
             // Check if the socket is working
             if (!$fp) {
                 return array();
             } else {
-                
+
                 // Send the request
                     $out = "GET /d/quotes.csv?".implode('&', $parameters)." HTTP/1.0\r\n";
-                    $out .= "Host: www.yahoo.com\r\n";
+                    $out .= "Host: download.finance.yahoo.com\r\n";
                     $out .= "Connection: Close\r\n\r\n";
                     @fputs($fp, $out);
-                
+
                 // Read the answer
                     $data = '';
@@ -89 +89 @@
                     }
                     @fclose($fp);
-                
+
                 // Parse the answer
                     $quotes = array();
@@ -97 +97 @@
                     }
                     $quotes['USDUSD'] = 1.0;    // Add conversion from USD to USD
-                
+
                 $this->quotes = $quotes;
                 return $quotes;
             }
         }
-        
+
         /**
          * Checks if there are quotes present
@@ -110 +110 @@
                 $this->getCurrentQuotesFromYahooFinance();
         }
-        
+
         /**
          * Returns a serialized version of the quotes for storing
@@ -119 +119 @@
             return serialize($this->quotes);
         }
-        
+
         /**
          * Load some stored serialized quotes
@@ -127 +127 @@
             $this->quotes = unserialize($serializedQuotes);
         }
-        
+
         public function getExchangeRate($from, $to) {
             $this->getQuotesIfNeeded();
-            
+
             // if currencies or rates are missing return 0
                 if (!isset($this->quotes['USD'.$from]) || $this->quotes['USD'.$from] == 0 || !isset($this->quotes['USD'.$to]) || $this->quotes['USD'.$to] == 0)
                     return 0;
-                    
+
             return $this->quotes['USD'.$to] / $this->quotes['USD'.$from];
         }
-        
+
     }
-    
-    
-    
+
+