Skip to content
This repository was archived by the owner on Dec 2, 2022. It is now read-only.

Commit 25a41c5

Browse files
dovydovy
committed
Pro install is done. About time!
1 parent 596c6ec commit 25a41c5

File tree

9 files changed

+57
-39
lines changed

9 files changed

+57
-39
lines changed

‎redux-core/appsero/Insights.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,6 @@ public function notice_dismissed() {
326326
* @return boolean
327327
*/
328328
private function is_local_server() {
329-
return false;
330329

331330
$is_local = false;
332331

‎redux-core/class-redux-core.php‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -245,9 +245,13 @@ private function init() {
245245
// Activate insights.
246246
self::$insights = self::$appsero->insights();
247247

248-
$metadata = array();
249-
if ( defined( 'RDX_MOKAMA' ) ) {
250-
self::$insights->add_extra( array( 'mokama' => RDX_MOKAMA ) );
248+
if ( class_exists( 'Redux_Pro' ) ) {
249+
self::$insights->add_extra(
250+
array(
251+
'pro' => Redux_Pro::$version,
252+
'mokama' => Redux_Helpers::mokama(),
253+
)
254+
);
251255
}
252256

253257
self::$insights->hide_notice()->init();

‎redux-templates/assets/js/redux-templates.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7828,7 +7828,7 @@ function ImportWizard(props) {
78287828
};
78297829

78307830
const toPluginStep = () => {
7831-
setCurrentStep(PLUGIN_STEP);
7831+
setCurrentStep(PRO_STEP);
78327832
};
78337833

78347834
const onCloseWizard = () => {

‎redux-templates/assets/js/redux-templates.js.map‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎redux-templates/assets/js/redux-templates.min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎redux-templates/assets/js/redux-templates.min.js.map‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎redux-templates/classes/class-api.php‎

Lines changed: 44 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -966,31 +966,13 @@ public function plugin_install( \WP_REST_Request $request ) {
966966
}
967967
wp_send_json_success( $status );
968968
}
969-
/*
970-
*
971-
972-
'license-validate' => array(
973-
'method' => 'GET',
974-
'callback' => 'validate_license',
975-
),
976-
'license-activate' => array(
977-
'method' => 'GET',
978-
'callback' => 'activate_license',
979-
),
980-
'license-deactivate' => array(
981-
'method' => 'GET',
982-
'callback' => 'deactivate_license',
983-
),
984-
'get-pro-url' => array(
985-
'method' => 'GET',
986-
'callback' => 'get_pro_url',
987-
),
988-
'opt_out' => array(
989-
'method' => 'GET',
990-
'callback' => 'opt_out_account',
991-
),
992-
*/
993969

970+
/**
971+
* Check the license key.
972+
*
973+
* @since 4.1.18
974+
* @return bool|array
975+
*/
994976
protected function check_license_key() {
995977
$lic = get_option( 'redux_pro_license_key' );
996978
if ( empty( $lic ) ) {
@@ -1004,6 +986,12 @@ protected function check_license_key() {
1004986
return true;
1005987
}
1006988

989+
/**
990+
* Run the license API calls.
991+
*
992+
* @param \WP_REST_Request $request WP Rest request.
993+
* @since 4.1.18
994+
*/
1007995
public function license( \WP_REST_Request $request ) {
1008996
$data = $request->get_params();
1009997

@@ -1022,7 +1010,7 @@ public function license( \WP_REST_Request $request ) {
10221010
);
10231011
$response = $this->do_license_request( $array );
10241012

1025-
if ( isset( $response['license'] ) && in_array( $response['license'], array( 'valid', 'site_inactive' ) ) ) {
1013+
if ( isset( $response['license'] ) && in_array( $response['license'], array( 'valid', 'site_inactive' ), true ) ) {
10261014
update_option( 'redux_pro_license_key', $data['key'] );
10271015
if ( 'valid' === $response['license'] ) {
10281016
wp_send_json_success( array( 'status' => 'success' ) );
@@ -1041,6 +1029,7 @@ public function license( \WP_REST_Request $request ) {
10411029
$request = $this->do_license_request( $array );
10421030

10431031
if ( isset( $request['license'] ) && 'valid' === $request['license'] ) {
1032+
Redux_Functions_Ex::set_activated();
10441033
wp_send_json_success( $request );
10451034
}
10461035
}
@@ -1054,6 +1043,12 @@ public function license( \WP_REST_Request $request ) {
10541043
);
10551044
}
10561045

1046+
/**
1047+
* Validate a license key.
1048+
*
1049+
* @param \WP_REST_Request $request WP Rest request.
1050+
* @since 4.1.18
1051+
*/
10571052
public function validate_license( \WP_REST_Request $request ) {
10581053

10591054
$data = $request->get_params();
@@ -1074,7 +1069,7 @@ public function validate_license( \WP_REST_Request $request ) {
10741069
);
10751070
$response = $this->do_license_request( $array );
10761071

1077-
if ( isset( $response['license'] ) && in_array( $response['license'], array( 'valid', 'site_inactive' ) ) ) {
1072+
if ( isset( $response['license'] ) && in_array( $response['license'], array( 'valid', 'site_inactive' ), true ) ) {
10781073
update_option( 'redux_pro_license_status', $data['license'] );
10791074
wp_send_json_success( $response );
10801075
} else {
@@ -1084,6 +1079,12 @@ public function validate_license( \WP_REST_Request $request ) {
10841079
}
10851080
}
10861081

1082+
/**
1083+
* Activate a license key.
1084+
*
1085+
* @param \WP_REST_Request $request WP Rest request.
1086+
* @since 4.1.18
1087+
*/
10871088
public function activate_license( \WP_REST_Request $request ) {
10881089
$check = $this->check_license_key();
10891090
if ( is_array( $check ) ) {
@@ -1118,14 +1119,18 @@ public function activate_license( \WP_REST_Request $request ) {
11181119
);
11191120
}
11201121

1122+
/**
1123+
* Deactivate a license key.
1124+
*
1125+
* @since 4.1.18
1126+
*/
11211127
public function deactivate_license() {
11221128
$check = $this->check_license_key();
11231129
if ( is_array( $check ) ) {
11241130
wp_send_json_error( $check );
11251131
}
11261132
$lic = get_option( 'redux_pro_license_key' );
11271133
if ( empty( $lic ) ) {
1128-
// delete_option( 'redux_pro_license_status' );
11291134
wp_send_json_error(
11301135
array(
11311136
'success' => 'false',
@@ -1152,6 +1157,11 @@ public function deactivate_license() {
11521157
);
11531158
}
11541159

1160+
/**
1161+
* Get the Redux Pro download URL.
1162+
*
1163+
* @since 4.1.18
1164+
*/
11551165
public function get_pro_url() {
11561166
$lic_status = get_option( 'redux_pro_license_status', 'inactive' );
11571167

@@ -1181,10 +1191,15 @@ public function get_pro_url() {
11811191
'message_types' => 'error',
11821192
)
11831193
);
1184-
11851194
}
11861195

1187-
1196+
/**
1197+
* Run the license API calls.
1198+
*
1199+
* @param array $args Array of args.
1200+
* @since 4.1.18
1201+
* @return mixed
1202+
*/
11881203
private function do_license_request( $args ) {
11891204

11901205
$defaults = array(

‎redux-templates/classes/class-init.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ public function editor_assets() {
132132
'i18n' => 'redux-framework',
133133
'plugin' => REDUXTEMPLATES_DIR_URL,
134134
'mokama' => \Redux_Helpers::mokama(),
135-
'key' => \base64_encode( \Redux_Functions::gs() ),
135+
'key' => \base64_encode( \Redux_Functions::gs() ), // phpcs:ignore WordPress.PHP.DiscouragedPHPFunctions.obfuscation_base64_encode
136136
'version' => \Redux_Core::$version,
137137
'supported_plugins' => array(), // Load the supported plugins.
138138
'tos' => \Redux_Connection_Banner::tos_blurb( 'import_wizard' ),

‎redux-templates/src/modal-import-wizard/index.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ function ImportWizard(props) {
105105
};
106106

107107
const toPluginStep = () => {
108-
setCurrentStep(PLUGIN_STEP);
108+
setCurrentStep(PRO_STEP);
109109
};
110110

111111
const onCloseWizard = () => {

0 commit comments

Comments
 (0)