Notify limits (#484)

* Fix typo
* Move get_tos_choice
* Report API limits exceeded

Author: cssjoe

Extension_ImageService_Plugin_Admin.js

@@ -435,6 +435,18 @@
 				) {
 					message = response.responseJSON.data.message;
 					rebindBuyClick = true;
+
+					if ( 'accept' === w3tcData.tos_choice && w3tcData.track_usage ) {
+						(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+							(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+							m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+							})(window,document,'script','https://api.w3-edge.com/v1/analytics','w3tc_ga');
+
+						if ( window.w3tc_ga ) {
+							w3tc_ga( 'create', w3tcData.ga_profile, 'auto' );
+							w3tc_ga( 'send', 'event', 'w3tc_error', 'imageservice', response.responseJSON.data.code );
+						}
+					}
 				} else {
 					message = w3tcData.lang.ajaxFail;
 				}

Extension_ImageService_Plugin_Admin.php

@@ -498,6 +498,9 @@ public function admin_menu() {
 	 * Runs on the "admin_enqueue_scripts" action.
 	 *
 	 * @since 2.2.0
+	 *
+	 * @see Util_Ui::admin_url()
+	 * @see Licensing_Core::get_tos_choice()
 	 */
 	public function admin_enqueue_scripts() {
 		// Enqueue JavaScript for the Media Library (upload) and extension settings admin pages.
@@ -561,6 +564,9 @@ public function admin_enqueue_scripts() {
 							'</a>'
 						),
 					),
+					'tos_choice'  => Licensing_Core::get_tos_choice(),
+					'track_usage' => $this->config->get_boolean( 'common.track_usage' ),
+					'ga_profile'  => ( defined( 'W3TC_DEBUG' ) && W3TC_DEBUG ) ? 'UA-2264433-7' : 'UA-2264433-8',
 					'settings'    => $this->config->get_array( 'imageservice' ),
 					'settingsUrl' => esc_url( Util_Ui::admin_url( 'upload.php?page=w3tc_extension_page_imageservice' ) ),
 				)

Licensing_Core.php

@@ -131,4 +131,32 @@ static public function purchase_url( $data_src = '', $renew_key = '', $client_id
 			( empty( $renew_key ) ? '' : '&renew_key=' . urlencode( $renew_key ) ) .
 			( empty( $client_id ) ? '' : '&client_id=' . urlencode( $client_id ) );
 	}
+
+	/**
+	 * Get the terms of service choice.
+	 *
+	 * @since X.X.X
+	 *
+	 * @static
+	 *
+	 * @see \W3TC\Util_Environment::is_w3tc_pro()
+	 * @see \W3TC\Dispatcher::config_state()
+	 * @see \W3TC\Dispatcher::config_state_master()
+	 * @see \W3TC\ConfigState::get_string()
+	 *
+	 * @return string
+	 */
+	public static function get_tos_choice() {
+		$config = Dispatcher::config();
+
+		if ( Util_Environment::is_w3tc_pro( $config ) ) {
+			$state = Dispatcher::config_state();
+			$terms = $state->get_string( 'license.terms' );
+		} else {
+			$state_master = Dispatcher::config_state_master();
+			$terms        = $state_master->get_string( 'license.community_terms' );
+		}
+
+		return $terms;
+	}
 }

SetupGuide_Plugin_Admin.php

@@ -813,39 +813,13 @@ public function config_lazyload() {
 		}
 	}
 
-	/**
-	 * Get the terms of service choice.
-	 *
-	 * @since 2.0.0
-	 *
-	 * @see \W3TC\Util_Environment::is_w3tc_pro()
-	 * @see \W3TC\Dispatcher::config_state()
-	 * @see \W3TC\Dispatcher::config_state_master()
-	 * @see \W3TC\ConfigState::get_string()
-	 *
-	 * @return string
-	 */
-	private function get_tos_choice() {
-		$config = new Config();
-
-		if ( Util_Environment::is_w3tc_pro( $config ) ) {
-			$state = Dispatcher::config_state();
-			$terms = $state->get_string( 'license.terms' );
-		} else {
-			$state_master = Dispatcher::config_state_master();
-			$terms        = $state_master->get_string( 'license.community_terms' );
-		}
-
-		return $terms;
-	}
-
 	/**
 	 * Display the terms of service dialog if needed.
 	 *
 	 * @since  2.0.0
 	 * @access private
 	 *
-	 * @see self::get_tos_choice()
+	 * @see Licensing_Core::get_tos_choice()
 	 *
 	 * @return bool
 	 */
@@ -854,7 +828,7 @@ private function maybe_ask_tos() {
 			return false;
 		}
 
-		$terms = $this->get_tos_choice();
+		$terms = Licensing_Core::get_tos_choice();
 
 		return 'accept' !== $terms && 'decline' !== $terms && 'postpone' !== $terms;
 	}
@@ -871,6 +845,7 @@ private function maybe_ask_tos() {
 	 * @see \W3TC\Config::get_boolean()
 	 * @see \W3TC\Util_Request::get_string()
 	 * @see \W3TC\Dispatcher::config_state()
+	 * @see \W3TC\Licensing_Core::get_tos_choice()
 	 * @see \W3TC\Util_Environment::home_url_host()
 	 * @see \W3TC\Util_Environment::w3tc_edition()
 	 * @see \W3TC\Util_Widget::list_widgets()
@@ -914,7 +889,7 @@ private function get_config() {
 							'w3tc_edition'      => esc_attr( Util_Environment::w3tc_edition( $config ) ),
 							'list_widgets'      => esc_attr( Util_Widget::list_widgets() ),
 							'ga_profile'        => ( defined( 'W3TC_DEBUG' ) && W3TC_DEBUG ) ? 'UA-2264433-7' : 'UA-2264433-8',
-							'tos_choice'        => $this->get_tos_choice(),
+							'tos_choice'        => Licensing_Core::get_tos_choice(),
 							'track_usage'       => $config->get_boolean( 'common.track_usage' ),
 							'test_complete_msg' => __(
 								'Testing complete.  Click Next to advance to the section and see the results.',

inc/wizard/template.php

@@ -245,7 +245,7 @@ public function enqueue_scripts() {
 			'w3tc_wizard',
 			'W3TC_Wizard',
 			array(
-				'beforeunloadText' => __( 'Are you sure that you want to leve this page?', 'w3-total-cache' ),
+				'beforeunloadText' => __( 'Are you sure that you want to leave this page?', 'w3-total-cache' ),
 			)
 		);