= 7.7.6 =

* Added bot and search engine support for the SEO redirection * Fixed RSS reads * Fixed link path
InfinitumForm · Aug 21, 2019 · ce60d78 · ce60d78
1 parent d0331d6
commit ce60d78
Show file tree

Hide file tree

Showing 11 changed files with 133 additions and 65 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -1,5 +1,10 @@
 == Changelog ==
 
+= 7.7.6 =
+* Added bot and search engine support for the SEO redirection
+* Fixed RSS reads
+* Fixed link path
+
 = 7.7.5 =
 * Added include/exclude attributes to `cfgeo_flag` shortcode for the display/hide flag
 * Fixed ID's on the missing attributes

diff --git a/admin/cf-geoplugin.php b/admin/cf-geoplugin.php
@@ -1,6 +1,6 @@
 <?php if ( ! defined( 'WPINC' ) ) { die( "Don't mess with us." ); }
 /**
- * Page CF GeoPlugin
+ * Page WordPress Geo Plugin
  *
  * @since      7.0.0
  * @package    CF_Geoplugin
@@ -14,7 +14,7 @@
 <div class="container-fluid">
 	<div class="row">
     	<div class="col-12">
-        	<h1 class="h5 mt-3"><i class="fa fa-map-marker"></i> <?php _e('CF GeoPlugin',CFGP_NAME); ?></h1>
+        	<h1 class="h5 mt-3"><i class="fa fa-map-marker"></i> <?php _e('WordPress Geo Plugin',CFGP_NAME); ?></h1>
             <hr>
         </div>
         <div class="col">
@@ -462,7 +462,7 @@
         &nbsp;&nbsp;[text* country placeholder "* Country"]<br><br>
         &lt;script&gt;<br>
         jQuery(document).ready(function(){<br>
-        &nbsp;&nbsp;// Get CF GeoPlugin Data<br>
+        &nbsp;&nbsp;// Get WordPress Geo Plugin Data<br>
         &nbsp;&nbsp;var city = \'[cfgeo return="city"]\';<br>
         &nbsp;&nbsp;var country = \'[cfgeo return="country"]\';<br><br>
         &nbsp;&nbsp;// Insert values inside input fields<br>
@@ -491,7 +491,7 @@
 
                                 <p class="manage-menus"><?php printf(__("Like you notice, this plugin have changed shortcode names but still support old <strong>deprecated</strong> shortcode name %s what you still can use but we strongly recommended to use new one %s.",CFGP_NAME), '<code>cg_geo</code>', '<code>cfgeo</code>'); ?></p>
                             <?php if($CF_GEOPLUGIN_OPTIONS['enable_beta'] && $CF_GEOPLUGIN_OPTIONS['enable_beta_shortcode']) : ?>
-                                <p class="manage-menus"><?php printf(__("Also we trying to made all works faster and more understandable and we also add <strong>experimental</strong> shortcode called %s that you can use insteand of %s like %s but if you have similar geo plugin installed beside CF GeoPlugin you can have a problems and interference.",CFGP_NAME), '<code>geo</code>', '<code>cfgeo</code>', '<code>[geo]</code>'); ?></p>
+                                <p class="manage-menus"><?php printf(__("Also we trying to made all works faster and more understandable and we also add <strong>experimental</strong> shortcode called %s that you can use insteand of %s like %s but if you have similar geo plugin installed beside WordPress Geo Plugin you can have a problems and interference.",CFGP_NAME), '<code>geo</code>', '<code>cfgeo</code>', '<code>[geo]</code>'); ?></p>
                             <?php endif; ?>
 
                             <?php do_action('page-cf-geoplugin-tab-info-end'); ?>

diff --git a/admin/debug.php b/admin/debug.php
@@ -110,10 +110,10 @@
             	<div role="tabpane" class="tab-pane fade in <?php echo $data; ?>" id="recived-data">
                     <div class="card text-body">
                         <div class="card-header bg-transparent">
-                            <h1 class="h5"><?php echo sprintf( __( 'Information that the CF GeoPlugin API ver.%s receives', CFGP_NAME ), CFGP_VERSION ); ?></h1>
+                            <h1 class="h5"><?php echo sprintf( __( 'Information that the WordPress Geo Plugin API ver.%s receives', CFGP_NAME ), CFGP_VERSION ); ?></h1>
                         </div>  
                         <div class="card-body">
-                        	<p><?php _e( 'This informations are from CF GEoPlugin API services.', CFGP_NAME ); ?></p>
+                        	<p><?php _e( 'This informations are from WordPress Geo Plugin API services.', CFGP_NAME ); ?></p>
                             <table class="table table-sm table-striped w-100"> 
                                 <thead>
                                     <tr>
@@ -266,10 +266,10 @@
                 <div role="tabpanel" class="tab-pane fade in" id="sent-data">
                     <div class="card text-body">
                         <div class="card-header bg-transparent">
-                            <h1 class="h5"><?php echo sprintf( __( 'Information that the plugin CF GeoPlugin API ver.%s sends', CFGP_NAME ), CFGP_VERSION ); ?></h1>
+                            <h1 class="h5"><?php echo sprintf( __( 'Information that the plugin WordPress Geo Plugin API ver.%s sends', CFGP_NAME ), CFGP_VERSION ); ?></h1>
                         </div>
                         <div class="card-body">
-                        	<p><?php _e('This information are sent to CF GeoPlugin API. All of this informations (hostname, IP and timezone) are available for general public, world wide and we only use them for API purpose which helps plugin to determine the exact location of the visitors and prevent accidental collapse between the IP address. Your IP and email address is also a guarantee that you\'re not a robot or some spamming software.',CFGP_NAME); ?><br><?php _e('If you are concerned about your private informations, please read the <a href="http://cfgeoplugin.com/privacy-policy" target="_blank">Privacy Policy</a>',CFGP_NAME); ?></p>
+                        	<p><?php _e('This information are sent to WordPress Geo Plugin API. All of this informations (hostname, IP and timezone) are available for general public, world wide and we only use them for API purpose which helps plugin to determine the exact location of the visitors and prevent accidental collapse between the IP address. Your IP and email address is also a guarantee that you\'re not a robot or some spamming software.',CFGP_NAME); ?><br><?php _e('If you are concerned about your private informations, please read the <a href="http://cfgeoplugin.com/privacy-policy" target="_blank">Privacy Policy</a>',CFGP_NAME); ?></p>
                             <table class="table table-sm table-striped w-100"> 
                                 <thead>
                                     <tr>
@@ -305,7 +305,7 @@
                                     <tr>
                                         <td><strong><?php _e( 'Version', CFGP_NAME ); ?></strong></td>
                                         <td><?php echo CFGP_VERSION; ?></td>
-                                        <td><?php _e( 'CF GeoPlugin Version', CFGP_NAME ); ?></td>
+                                        <td><?php _e( 'WordPress Geo Plugin Version', CFGP_NAME ); ?></td>
                                     </tr>
                                     <tr>
                                         <td><strong><?php _e( 'Email' ); ?></strong></td>
@@ -321,7 +321,7 @@
 												echo ( !empty( $CF_GEOPLUGIN_OPTIONS['license_key'] ) ? $CF_GEOPLUGIN_OPTIONS['license_key'] : '-' )
 										?></td>
                                         <td>
-											<?php _e( 'CF GeoPlugin License Key', CFGP_NAME ); ?>
+											<?php _e( 'WordPress Geo Plugin License Key', CFGP_NAME ); ?>
 											<?php
 											if(CFGP_DEFENDER_ACTIVATED)
 												_e( 'Lifetime', CFGP_NAME );

diff --git a/admin/license.php b/admin/license.php
@@ -153,7 +153,7 @@
                 <p class="lead"><?php printf(
     __('Thank you for using unlimited license. You license is active until %1$s. It would be great to expand your license by that date. After expiration date you will experience plugin limitations.<br><br>To review or deactivate your license, please go to your %2$s.',CFGP_NAME),
     '<strong>' . ($CF_GEOPLUGIN_OPTIONS['license_expire'] == 0 ? __('never',CFGP_NAME) : date(get_option('date_format') . ' ' . get_option('time_format'), (int)$CF_GEOPLUGIN_OPTIONS['license_expire'])) . '</strong>',
-	'<a href="' . $CF_GEOPLUGIN_OPTIONS['license_url'] . '" target="_blank">' . __('CF GeoPlugin account',CFGP_NAME) . '</a>'
+	'<a href="' . $CF_GEOPLUGIN_OPTIONS['license_url'] . '" target="_blank">' . __('WordPress Geo Plugin account',CFGP_NAME) . '</a>'
 ); ?></p>
                 <?php else : ?>
                 <h1 class="display-4"><?php _e('Activate Unlimited!',CFGP_NAME); ?></h1>

diff --git a/admin/settings.php b/admin/settings.php
@@ -1,6 +1,6 @@
 <?php if ( ! defined( 'WPINC' ) ) { die( "Don't mess with us." ); }
 /**
- * Settings Page CF GeoPlugin
+ * Settings Page WordPress Geo Plugin
  *
  * @since      7.0.0
  * @package    CF_Geoplugin
@@ -72,7 +72,7 @@
 <div class="container-fluid">
 	<div class="row">
         <div class="col-12">
-        	<h1 class="h5 mt-3"><i class="fa fa-cogs text-left"></i> <?php _e('CF GeoPlugin Settings',CFGP_NAME); ?></h1>
+        	<h1 class="h5 mt-3"><i class="fa fa-cogs text-left"></i> <?php _e('WordPress Geo Plugin Settings',CFGP_NAME); ?></h1>
             <hr>
         </div>
         <div class="col-12" id="alert"><?php echo $alert; ?></div>
@@ -107,7 +107,7 @@
                         	<?php
                             	$general = new CF_Geoplugin_Form;
 								$general->html('<h5 class="mt-3" id="WordPress_Settings">'.__('WordPress Settings',CFGP_NAME).'</h5>');
-								$general->html('<p>'.__('This settings only affect on CF Geo Plugin functionality and connection between plugin and WordPress setup. Use it smart and careful.',CFGP_NAME).'</p><hr>');
+								$general->html('<p>'.__('This settings only affect on WordPress Geo Plugin functionality and connection between plugin and WordPress setup. Use it smart and careful.',CFGP_NAME).'</p><hr>');
 
 								$general->radio(array(
 									'label'		=> __('Enable Plugin Auto Update',CFGP_NAME),
@@ -142,7 +142,7 @@
 										'value'	=> 0,
 										'id'	=> 'enable_dashboard_widget_false',
 									),
-									'info'		=> __('Enable CF Geo Plugin widget in the dashboard area.',CFGP_NAME)
+									'info'		=> __('Enable WordPress Geo Plugin widget in the dashboard area.',CFGP_NAME)
 								));
 
 								$general->radio(array(
@@ -354,7 +354,7 @@
 									'name'		=> 'enable_rest',
 									'class'		=> 'enable_rest',
 									'default'	=> (isset($CF_GEOPLUGIN_OPTIONS['enable_rest']) ? $CF_GEOPLUGIN_OPTIONS['enable_rest'] : 0),
-									'info'		=> __('The CF GeoPlugin REST API allows external apps to use geo informations.',CFGP_NAME) . (CF_Geoplugin_Global::access_level($CF_GEOPLUGIN_OPTIONS) < 4 ? '<br><span class="text-info">' . __('REST API is only functional for the Business License.',CFGP_NAME) . '</span>' : ''),
+									'info'		=> __('The WordPress Geo Plugin REST API allows external apps to use geo informations.',CFGP_NAME) . (CF_Geoplugin_Global::access_level($CF_GEOPLUGIN_OPTIONS) < 4 ? '<br><span class="text-info">' . __('REST API is only functional for the Business License.',CFGP_NAME) . '</span>' : ''),
 									array(
 										'text'	=> __('Enable',CFGP_NAME),
 										'value'	=> 1,
@@ -445,6 +445,23 @@
 								); 
 
 								if( !empty( $first_seo_options ) ) $this->update_option( 'enable_seo_posts', $first_seo_options );
+
+								$general->radio(array(
+									'label'		=> __('Disable redirection for the bots',CFGP_NAME),
+									'name'		=> 'redirect_disable_bots',
+									'default'	=> (isset($CF_GEOPLUGIN_OPTIONS['redirect_disable_bots']) ? $CF_GEOPLUGIN_OPTIONS['redirect_disable_bots'] : 1),
+									array(
+										'text'	=> __('Yes',CFGP_NAME),
+										'value'	=> 1,
+										'id'	=> 'redirect_disable_bots_true',
+									),
+									array(
+										'text'	=> __('No',CFGP_NAME),
+										'value'	=> 0,
+										'id'	=> 'redirect_disable_bots_false',
+									),
+									'info'		=> __('Disable SEO redirection for the bots, crawlers, spiders and social network bots. This can be a special case that is very important for the SEO.',CFGP_NAME)
+								));
 
 								$general->html( sprintf( '<button type="submit" class="btn btn-success pull-right cfgp_save_options">%s</button>', __( 'Update All Options', CFGP_NAME ) ) );
 								$general->html('<h5 class="mt-5" id="Spam_Protection">'.__('Spam Protection',CFGP_NAME).'</h5>');
@@ -613,7 +630,7 @@
 
 								$general->html( sprintf( '<button type="submit" class="btn btn-success pull-right cfgp_save_options">%s</button>', __( 'Update All Options', CFGP_NAME ) ) );
 								$general->html('<h5 class="mt-5" class="BETA_Testing">'.__('BETA Testing & Advanced Features',CFGP_NAME).'</h5>');
-								$general->html('<p>'.__('Here you can enable BETA functionality and test it. In many cases, normaly you should not have any problems but some functionality are new and experimental that mean if any conflict happen, you must be aware of this. If many users find this functionality useful we may keep this functionality and include it as standard functionality of CF GeoPlugin.',CFGP_NAME).'</p><hr>');
+								$general->html('<p>'.__('Here you can enable BETA functionality and test it. In many cases, normaly you should not have any problems but some functionality are new and experimental that mean if any conflict happen, you must be aware of this. If many users find this functionality useful we may keep this functionality and include it as standard functionality of WordPress Geo Plugin.',CFGP_NAME).'</p><hr>');
 
 								$general->radio(array(
 									'label'		=> __('Enable Advanced Features (BETA)',CFGP_NAME),
@@ -685,7 +702,7 @@
 									'id'		=> 'map_latitude',
 									'value'		=> (isset($CF_GEOPLUGIN_OPTIONS['map_latitude']) ? $CF_GEOPLUGIN_OPTIONS['map_latitude'] : ''),
 									'attr'		=> array('autocomplete'=>'off'),
-									'info'		=> __('Leave blank for CF Geo Plugin default support or place custom value.',CFGP_NAME),
+									'info'		=> __('Leave blank for WordPress Geo Plugin default support or place custom value.',CFGP_NAME),
 									'attr'		=> array('style'=>'max-width:200px;')
 								));
 
@@ -695,7 +712,7 @@
 									'id'		=> 'map_longitude',
 									'value'		=> (isset($CF_GEOPLUGIN_OPTIONS['map_longitude']) ? $CF_GEOPLUGIN_OPTIONS['map_longitude'] : ''),
 									'attr'		=> array('autocomplete'=>'off'),
-									'info'		=> __('Leave blank for CF Geo Plugin default support or place custom value.',CFGP_NAME),
+									'info'		=> __('Leave blank for WordPress Geo Plugin default support or place custom value.',CFGP_NAME),
 									'attr'		=> array('style'=>'max-width:200px;')
 								));
 
@@ -855,7 +872,7 @@
                             <?php if(CF_Geoplugin_Global::access_level($CF_GEOPLUGIN_OPTIONS) < 4): ?>
                             <h5 class="mt-3 text-danger"><?php _e('NOTE: The REST API is only functional for the Business License',CFGP_NAME) ?></h5>
                             <?php endif; ?>
-                            <p><?php _e('The CF GeoPlugin REST API allows external apps to use geo informations and made your WordPress like geo informations provider.',CFGP_NAME) ?></p>
+                            <p><?php _e('The WordPress Geo Plugin REST API allows external apps to use geo informations and made your WordPress like geo informations provider.',CFGP_NAME) ?></p>
                             <h5><?php _e('API KEY',CFGP_NAME) ?>:</h5>
                             <div><code style="font-size: large;width: 100%;text-align: center;font-weight: 800;padding: 10px"><?php echo $CF_GEOPLUGIN_OPTIONS['id']; ?></code></div>
                             <h5 class="mt-3"><?php _e('Secret API KEY',CFGP_NAME) ?>:</h5>
@@ -873,7 +890,7 @@
                                 <div class="col-sm-10 tab-content" id="cf-geo-rest-tabContent">
                                     <div class="tab-pane border border-secondary rounded pt-1 pb-1 pl-3 pr-3 fade show active" id="cf-geo-rest-info" role="tabpanel" aria-labelledby="cf-geo-rest-info-tab">
                                     	<h5 class="mt-3"><?php _e('Authentication endpoint',CFGP_NAME) ?>:</h5>
-                                        <p><?php _e('Endpoint used to authenticate connection between CF Geo Plugin on your site and your external app.',CFGP_NAME) ?></p>
+                                        <p><?php _e('Endpoint used to authenticate connection between WordPress Geo Plugin on your site and your external app.',CFGP_NAME) ?></p>
                                         <p><code><?php echo self_admin_url('admin-ajax.php?action=cf_geoplugin_authenticate'); ?></code></p>
                                         <p><?php _e('Expected GET or POST parameters.',CFGP_NAME) ?></p>
                                         <table class="table">

diff --git a/admin/settings/credits.php b/admin/settings/credits.php
@@ -1,14 +1,14 @@
 <h3 class="h5"><span class="fa fa-info-circle"></span> <?php _e('Credits',CFGP_NAME); ?></h3>
-<p><?php echo sprintf(__('%s, %s, %s and all this functionality is made by %s.',CFGP_NAME),'CF Geoplugin','CF Geoplugin API','CF Geo Banner','<a href="http://infinitumform.com" target="_blank"><em><strong>INFINITUM FORM</strong></em></a>'); ?></p>
+<p><?php echo sprintf(__('%s, %s, %s and all this functionality is made by %s.',CFGP_NAME),'WordPress Geo Plugin','WordPress Geo Plugin API','CF Geo Banner','<a href="http://infinitumform.com" target="_blank"><em><strong>INFINITUM FORM</strong></em></a>'); ?></p>
 <p><strong><?php _e('This plugin have purpose to help business people to reach own goals and made maximal conversions. Plugin is SEO optimized, user friendly, easy for use and very dynamic.',CFGP_NAME); ?></strong></p> 
 
-<p><?php echo sprintf(__('The %s allows you to attach geographic information and Google maps to posts, pages, widgets and custom templates by using shortcodes and user IP address. It also lets you to specify a default geographic location for your entire WordPress blog. Also you can place banners and content realated to user locations.',CFGP_NAME),'<strong>CF GeoPlugin</strong>'); ?></p>
-
+<p><?php echo sprintf(__('The %s allows you to attach geographic information and Google maps to posts, pages, widgets and custom templates by using shortcodes and user IP address. It also lets you to specify a default geographic location for your entire WordPress blog. Also you can place banners and content realated to user locations.',CFGP_NAME),'<strong>WordPress Geo Plugin</strong>'); ?></p>
+<hr>
 <h3 class="h5"><span class="fa fa-code"></span> <?php _e('For Developers and Contributors',CFGP_NAME); ?></h3>
 <p><?php _e('You are welcome to contribute to my plugin and help me in the development. Also you are welcome to use this plugin inside your projects like part of your own plugins and templates. All great new ideas will be taken into consideration and all together we can do something fantastic!',CFGP_NAME); ?></p>
-
+<hr>
 <h3 class="h5"><span class="fa fa-copyright"></span> <?php _e('Copyright',CFGP_NAME); ?></h3>
-<p>Copyright <span class="fa fa-copyright"></span> 2015 - <?php echo date("Y")?> <a href="http://cfgeoplugin.com" target="_blank"><em><strong>CF GeoPlugin</strong></em></a> by <a href="https://www.infinitumform.com" target="_blank"><em><strong>INFINITUM FORM</strong></em></a>. All Right Reserved.</p>
+<p>Copyright <span class="fa fa-copyright"></span> 2015 - <?php echo date("Y")?> <a href="http://cfgeoplugin.com" target="_blank"><em><strong>WordPress Geo Plugin</strong></em></a> by <a href="https://www.infinitumform.com" target="_blank"><em><strong>INFINITUM FORM</strong></em></a>. All Right Reserved.</p>
 <p>This program is free software; you can redistribute it and/or<br>
 modify it under the terms of the GNU General Public License<br>
 as published by the Free Software Foundation; either version 2<br>
@@ -19,4 +19,6 @@
 <a href="javascript:void(0);" onClick="cf_geoplugin_popup('<?php echo CFGP_URL; ?>/LICENSE.txt','GNU GENERAL PUBLIC LICENSE','550','450');">See the GNU General Public License for more details</a>.</p>
 <p>You should have received a copy of the GNU General Public License<br>
 along with this program; if not, write to the Free Software<br>
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</p>
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</p>
+<hr>
+<p>Also read about <a href="javascript:void(0);" onClick="cf_geoplugin_popup('<?php echo CFGP_URL; ?>/CHANGELOG.txt','GNU GENERAL PUBLIC LICENSE','550','450');">Changelog</a>, our <a href="https://cfgeoplugin.com/privacy-policy/" target="_blank">Privacy Policy</a> and <a href="https://cfgeoplugin.com/terms-and-conditions/" target="_blank">Terms And Conditions</a>.</p>