[v0.9.4.x] referral/edge display removal (#286)

extensions/CloudFlareAdmin.php

@@ -101,7 +101,7 @@ function extension($extensions, $config) {
             'author' => 'W3 EDGE',
             'description' =>  sprintf( __('CloudFlare protects and accelerates websites. <a href="%s" target="_blank">Sign up now for free</a> to get started,
         	or if you have an account simply log in to obtain your <abbr title="Application Programming Interface">API</abbr> key from the <a target="_blank" href="https://www.cloudflare.com/my-account">account page</a> to enter it on the General Settings box that appears after plugin activation.
-        	Contact the CloudFlare <a href="http://www.cloudflare.com/help.html" target="_blank">support team</a> with any questions.', 'w3-total-cache'), 'https://www.cloudflare.com/sign-up.html?affiliate=w3edge&amp;seed_domain=' . w3_get_host() . '&amp;email=' . htmlspecialchars($cloudflare_signup_email) . '&amp;username=' . htmlspecialchars($cloudflare_signup_user) ),
+        	Contact the CloudFlare <a href="http://www.cloudflare.com/help.html" target="_blank">support team</a> with any questions.', 'w3-total-cache'), 'https://www.cloudflare.com/sign-up.html?seed_domain=' . w3_get_host() . '&amp;email=' . htmlspecialchars($cloudflare_signup_email) . '&amp;username=' . htmlspecialchars($cloudflare_signup_user) ),
             'author uri' => 'http://www.w3-edge.com/',
             'extension uri' => 'http://www.w3-edge.com/',
             'extension id' => 'cloudflare',

inc/define.php

@@ -21,7 +21,7 @@
 define('W3TC_SUPPORT_US_TIMEOUT', 2592000);
 define('W3TC_SUPPORT_REQUEST_URL', 'https://www.w3-edge.com/w3tc/support/');
 define('W3TC_TRACK_URL', 'https://www.w3-edge.com/w3tc/track/');
-define('W3TC_MAILLINGLIST_SIGNUP_URL', 'https://www.w3-edge.com/w3tc/emailsignup/');
+define('W3TC_MAILLINGLIST_SIGNUP_URL', '');
 define('W3TC_MINIFY_VER_ID', '#MVER#');
 define("W3TC_CLI_PIDS", '.w3tc_cli_pids');
 define("W3TC_CLI_URLS", '.w3tc_cli_urls');
@@ -36,13 +36,13 @@
 define("W3TC_UPDATER_BANNER_URL", '//ps.w.org/w3-total-cache/assets/banner-772x250.jpg?rev=1041806');
 define("W3TC_UPDATER_CHANGELOG", 'changelog.txt');
 
-define('NEWRELIC_SIGNUP_URL', 'http://bit.ly/w3tc-partner-newrelic-signup');
-define('MAXCDN_SIGNUP_URL', 'http://bit.ly/w3tc-cdn-maxcdn-create-account');
-define('MAXCDN_AUTHORIZE_URL', 'http://bit.ly/w3tc-cdn-maxcdn-authorize');
-define('NETDNA_AUTHORIZE_URL', 'https://cp.netdna.com/i/w3tc');
+define('NEWRELIC_SIGNUP_URL', 'https://newrelic.com/signup');
+define('MAXCDN_SIGNUP_URL', 'https://secure.maxcdn.com/');
+define('MAXCDN_AUTHORIZE_URL', 'https://cp.maxcdn.com/');
+define('NETDNA_AUTHORIZE_URL', 'https://cp.netdna.com/');
 // this is the URL our updater / license checker pings. This should be the URL of the site with EDD installed
-if (!defined('EDD_W3EDGE_STORE_URL')) define('EDD_W3EDGE_STORE_URL', 'https://www.w3-edge.com/' );
-if (!defined('EDD_W3EDGE_STORE_URL_PLUGIN')) define('EDD_W3EDGE_STORE_URL_PLUGIN', 'https://www.w3-edge.com/?w3tc_buy_pro_plugin' );
+if (!defined('EDD_W3EDGE_STORE_URL')) define('EDD_W3EDGE_STORE_URL', '' );
+if (!defined('EDD_W3EDGE_STORE_URL_PLUGIN')) define('EDD_W3EDGE_STORE_URL_PLUGIN', '' );
 
 // the name of your product. This should match the download name in EDD exactly
 define('EDD_W3EDGE_W3TC_NAME', 'W3 Total Cache Pro: Annual Subscription');

inc/options/cdn/maxcdn.php

@@ -9,9 +9,9 @@
     <tr>
         <th style="width: 300px;"><label><?php _e('Create account:', 'w3-total-cache')?></label></th>
         <td>
-            <a href="<?php esc_attr_e(wp_nonce_url(w3_admin_url('admin.php?page=w3tc_dashboard&w3tc_cdn_maxcdn_signup'), 'w3tc'))?>" target="_blank" id="netdna-maxcdn-create-account" class="button-primary"><?php _e('Sign Up Now and Save 25%', 'w3-total-cache') ?></a>
+            <a href="<?php esc_attr_e(wp_nonce_url(w3_admin_url('admin.php?page=w3tc_dashboard&w3tc_cdn_maxcdn_signup'), 'w3tc'))?>" target="_blank" id="netdna-maxcdn-create-account" class="button-primary"><?php _e('Create Account', 'w3-total-cache') ?></a>
             <br />
-            <span class="description"><?php _e('MaxCDN is a service that lets you speed up your site even more with W3 Total Cache. 100% Money Back Guarantee (30 Days)!', 'w3-total-cache')?></span>
+            <span class="description"><?php _e('MaxCDN is a service that lets you speed up your site even more with W3 Total Cache.', 'w3-total-cache')?></span>
         </td>
     </tr>
 <?php endif ?>

inc/options/cdn/netdna.php

@@ -11,7 +11,7 @@
         <td>
             <a href="<?php esc_attr_e(wp_nonce_url(w3_admin_url('admin.php?page=w3tc_dashboard&w3tc_cdn_maxcdn_signup'), 'w3tc'))?>" target="_blank" id="netdna-maxcdn-create-account" class="button-primary"><?php _e('Create Account', 'w3-total-cache') ?></a>
             <br />
-            <span class="description"><?php _e('Are you a new customer? Click the Create Account button to receive a discount on a new MaxCDN account.', 'w3-total-cache')?></span>
+            <span class="description"><?php _e('Are you a new customer? Click the Create Account button.', 'w3-total-cache')?></span>
         </td>
     </tr>
 <?php endif ?>

inc/options/general.php

@@ -327,9 +327,6 @@
 
         <?php echo $this->postbox_header(__('<acronym title="Content Delivery Network">CDN</acronym>', 'w3-total-cache'), '', 'cdn'); ?>
         <p><?php _e('Host static files with your content delivery network provider to reduce page load time.', 'w3-total-cache'); ?>
-        <?php if(!$cdn_enabled): ?>
-        <?php printf(__('If you do not have a <acronym title="Content Delivery Network">CDN</acronym> provider try MaxCDN. <a href="%s" target="_blank">Sign up and save 25&#37;</a>.', 'w3-total-cache'), wp_nonce_url(w3_admin_url('admin.php?page=w3tc_dashboard&w3tc_cdn_maxcdn_signup'), 'w3tc')); ?>
-        <?php endif ?>
         </p>
         <table class="form-table">
             <tr>
@@ -641,20 +638,6 @@ class="w3tc-ignore-change" type="text"
                     <br /><span class="description"><?php _e('Try this option if your hosting environment uses a network based file system for a possible performance improvement.', 'w3-total-cache'); ?></span>
                 </th>
             </tr>
-            <?php if (is_network_admin() || !w3_is_multisite()): ?>
-            <tr id="edge_mode">
-                <th colspan="2">
-                    <?php
-                    if (!w3tc_edge_mode()):
-                        echo '<a href="' . w3_admin_url('admin.php?page='. $this->_page .'&w3tc_edge_mode_enable').'"><strong>' . __('Enable Edge mode', 'w3-total-cache') . '</strong></a>';
-                    else:
-                        echo '<a href="' . w3_admin_url('admin.php?page='. $this->_page .'&w3tc_edge_mode_disable').'"><strong>' . __('Disable Edge mode', 'w3-total-cache') . '</strong></a>';
-                    endif;
-                    ?>
-                    <br /><span class="description"><?php _e('Enable this to try out new functionality under development. Might cause issues on some sites. If you have issues and can\'t access wp-admin, remove "define(\'W3TC_EDGE_MODE\', true);" from your wp-config.php file and edge mode features will be disabled.', 'w3-total-cache'); ?></span>
-                </th>
-            </tr>
-            <?php endif; ?>
         </table>
 
         <p class="submit">

inc/widget/maxcdn_signup.php

@@ -7,8 +7,7 @@
     <p><?php _e('Add the MaxCDN content delivery network to increase website speeds dramatically in just a few minutes!', 'w3-total-cache')?></p>
     <h4><?php _e('New customers', 'w3-total-cache')?></h4>
     <p><?php _e('MaxCDN is a service that lets you speed up your site even more with W3 Total Cache.', 'w3-total-cache')?></p>
-    <a class="button-primary" href="<?php echo wp_nonce_url(w3_admin_url('admin.php?page=w3tc_dashboard&w3tc_cdn_maxcdn_signup'), 'w3tc')?>" target="_blank"><?php _e('Sign Up Now and Save 25%', 'w3-total-cache')?></a>
-    <p><span class="desc"><?php _e('100% Money Back Guarantee (30 Days)', 'w3-total-cache')?></span></p>
+    <a class="button-primary" href="<?php echo wp_nonce_url(w3_admin_url('admin.php?page=w3tc_dashboard&w3tc_cdn_maxcdn_signup'), 'w3tc')?>" target="_blank"><?php _e('Create Account', 'w3-total-cache')?></a>
      <?php endif ?>
         <h4><?php _e('Current customers', 'w3-total-cache')?></h4>
         <p><?php _e("Once you've signed up or if you're an existing MaxCDN customer, to enable CDN:", 'w3-total-cache')?></p>

lib/W3/AdminActions/TestActionsAdmin.php

@@ -30,7 +30,6 @@ function action_test_use_edge_mode() {
         w3_require_once(W3TC_INC_FUNCTIONS_DIR . '/admin_ui.php');
         w3_require_once(W3TC_INC_FUNCTIONS_DIR . '/ui.php');
         $page = $this->_page;
-        include W3TC_INC_LIGHTBOX_DIR . '/edge.php';
     }
 
     /**