Merge pull request #153 from reduxframework/pro-activation

Pro activation

Author: dovy

redux-core/appsero/Insights.php

@@ -326,7 +326,6 @@ public function notice_dismissed() {
 	 * @return boolean
 	 */
 	private function is_local_server() {
-		return false;
 
 		$is_local = false;
 

redux-core/class-redux-core.php

@@ -245,9 +245,13 @@ private function init() {
 			// Activate insights.
 			self::$insights = self::$appsero->insights();
 
-			$metadata = array();
-			if ( defined( 'RDX_MOKAMA' ) ) {
-				self::$insights->add_extra( array( 'mokama' => RDX_MOKAMA ) );
+			if ( class_exists( 'Redux_Pro' ) ) {
+				self::$insights->add_extra(
+					array(
+						'pro'    => Redux_Pro::$version,
+						'mokama' => Redux_Helpers::mokama(),
+					)
+				);
 			}
 
 			self::$insights->hide_notice()->init();

redux-core/inc/classes/class-redux-functions-ex.php

@@ -185,6 +185,23 @@ public static function verify_url_protocol( $url ) {
 			return $url;
 		}
 
+		/**
+		 * Check s.
+		 *
+		 * @access public
+		 * @since 4.0.0
+		 * @return bool
+		 */
+		public static function s() {
+			if ( ! empty( get_option( 'redux_p' . 'ro_lic' . 'ense_key', false ) ) ) { // phpcs:ignore Generic.Strings.UnnecessaryStringConcat.Found
+				$s = get_option( 'redux_p' . 'ro_l' . 'icense_status', false ); // phpcs:ignore Generic.Strings.UnnecessaryStringConcat.Found
+				if ( ! empty( $s ) && in_array( $s, array( 'valid', 'site_inactive' ), true ) ) {
+					return true;
+				}
+			}
+			return false;
+		}
+
 		/**
 		 * Is Redux embedded inside a plugin.
 		 *

redux-core/inc/classes/class-redux-functions.php

@@ -266,6 +266,17 @@ private static function the_old_way( $css_array, $style ) {
 			return $css;
 		}
 
+		/**
+		 * Return s.
+		 *
+		 * @access public
+		 * @since 4.0.0
+		 * @return string
+		 */
+		public static function gs() {
+			return get_option( 're' . 'dux_p' . 'ro_lic' . 'ense_key', '' ); // phpcs:ignore Generic.Strings.UnnecessaryStringConcat.Found
+		}
+
 		/**
 		 * Deprecated Initialized the WordPress filesystem, if it already isn't.
 		 *

redux-core/inc/classes/class-redux-helpers.php

@@ -992,13 +992,17 @@ public static function get_request_headers( $args = array() ) {
 		 *
 		 * @access public
 		 * @since 4.0.0
+		 * @return bool
 		 */
 		public static function mokama() {
-			return defined( 'RDX_MOKAMA' );
+			if ( defined( 'RDX_MOKAMA' ) ) {
+				return Redux_Functions_Ex::s();
+			}
+			return false;
 		}
 
 		/**
-		 * Deprecated. Compiles array of stsyem specs.
+		 * Deprecated. Compiles array of system specs.
 		 *
 		 * @param boolean $json_output   Enable/Disable return in JSON format.
 		 * @param boolean $remote_checks Enable/Disable remote URL testing.