From 57ebff701fccb12e0f24c9461d452851c1de4329 Mon Sep 17 00:00:00 2001 From: ipaterson Date: Mon, 24 Jul 2017 11:07:30 -0400 Subject: [PATCH 1/5] Prevent script errors throughout the admin panel when anonymous data metrics are disabled --- lib/WP_Auth0_Metrics.php | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/lib/WP_Auth0_Metrics.php b/lib/WP_Auth0_Metrics.php index 02f366c6..6fd21632 100644 --- a/lib/WP_Auth0_Metrics.php +++ b/lib/WP_Auth0_Metrics.php @@ -64,6 +64,15 @@ function metricsTrack(event, trackData, callback) { a0metricsLib.track(event, params, callback); } + + Date: Fri, 30 Jun 2017 11:31:34 -0400 Subject: [PATCH 2/5] =?UTF-8?q?Use=20literal=20=E2=80=98wp-auth0=E2=80=99?= =?UTF-8?q?=20rather=20than=20WPA0=5FLANG=20constant=20to=20support=20extr?= =?UTF-8?q?action=20of=20translatable=20text.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WP_Auth0.php | 2 +- lib/WP_Auth0_Api_Operations.php | 14 ++-- lib/WP_Auth0_EditProfile.php | 8 +-- lib/WP_Auth0_Embed_Widget.php | 4 +- lib/WP_Auth0_Settings_Section.php | 20 +++--- lib/admin/WP_Auth0_Admin.php | 16 ++--- lib/admin/WP_Auth0_Admin_Advanced.php | 72 +++++++++---------- lib/admin/WP_Auth0_Admin_Appearance.php | 38 +++++----- lib/admin/WP_Auth0_Admin_Basic.php | 46 ++++++------ lib/admin/WP_Auth0_Admin_Dashboard.php | 18 ++--- lib/admin/WP_Auth0_Admin_Features.php | 38 +++++----- lib/admin/WP_Auth0_Admin_Generic.php | 4 +- .../WP_Auth0_Dashboard_Widgets.php | 2 +- lib/initial-setup/WP_Auth0_InitialSetup.php | 20 +++--- templates/a0-error-log.php | 2 +- templates/a0-widget-setup-form.php | 22 +++--- templates/auth0-login-form-lock10.php | 2 +- templates/auth0-login-form.php | 2 +- templates/configure-jwt-auth.php | 2 +- templates/export-users.php | 2 +- templates/import_settings.php | 2 +- templates/initial-setup/admin-creation.php | 12 ++-- .../initial-setup/connection_profile.php | 28 ++++---- templates/initial-setup/connections.php | 10 +-- .../initial-setup/consent-disclaimer.php | 4 +- templates/initial-setup/data-migration.php | 6 +- templates/initial-setup/end.php | 4 +- .../initial-setup/enterprise_connections.php | 12 ++-- templates/initial-setup/rules.php | 22 +++--- templates/initial-setup/signup.php | 4 +- templates/settings.php | 2 +- templates/verify-email.php | 6 +- 32 files changed, 223 insertions(+), 223 deletions(-) diff --git a/WP_Auth0.php b/WP_Auth0.php index a6ddff29..f096cd33 100644 --- a/WP_Auth0.php +++ b/WP_Auth0.php @@ -9,7 +9,7 @@ define( 'WPA0_PLUGIN_FILE', __FILE__ ); define( 'WPA0_PLUGIN_DIR', trailingslashit( plugin_dir_path( __FILE__ ) ) ); define( 'WPA0_PLUGIN_URL', trailingslashit( plugin_dir_url( __FILE__ ) ) ); -define( 'WPA0_LANG', 'wp-auth0' ); +define( 'WPA0_LANG', 'wp-auth0' ); // deprecated; do not use for translations define( 'AUTH0_DB_VERSION', 14 ); define( 'WPA0_VERSION', '3.3.1' ); diff --git a/lib/WP_Auth0_Api_Operations.php b/lib/WP_Auth0_Api_Operations.php index 291346ba..407fb5a4 100644 --- a/lib/WP_Auth0_Api_Operations.php +++ b/lib/WP_Auth0_Api_Operations.php @@ -179,7 +179,7 @@ public function social_validation( $app_token, $old_options, $input, $strategy, $connections = WP_Auth0_Api_Client::search_connection( $domain, $app_token, $strategy ); // if ( ! $connections ) { - // $error = __( 'There was an error searching your active social connections.', WPA0_LANG ); + // $error = __( 'There was an error searching your active social connections.', 'wp-auth0' ); // $this->add_validation_error( $error ); // // $input[$main_key] = 0; @@ -229,7 +229,7 @@ public function social_validation( $app_token, $old_options, $input, $strategy, $response = WP_Auth0_Api_Client::update_connection($domain, $app_token, $selected_connection->id, $data); if ( false === $response ) { - $error = __( 'There was an error updating your social connection', WPA0_LANG ); + $error = __( 'There was an error updating your social connection', 'wp-auth0' ); throw new Exception( $error ); $input[$main_key] = 0; @@ -256,7 +256,7 @@ public function social_validation( $app_token, $old_options, $input, $strategy, $response = WP_Auth0_Api_Client::update_connection($domain, $app_token, $selected_connection->id, $data); if ( false === $response ) { - $error = __( 'There was an error updating your social connection', WPA0_LANG ); + $error = __( 'There was an error updating your social connection', 'wp-auth0' ); throw new Exception( $error ); $input[$main_key] = 0; @@ -277,7 +277,7 @@ public function social_validation( $app_token, $old_options, $input, $strategy, ); if ( false === WP_Auth0_Api_Client::create_connection($domain, $app_token, $data) ) { - $error = __( 'There was an error creating your social connection', WPA0_LANG ); + $error = __( 'There was an error creating your social connection', 'wp-auth0' ); throw new Exception( $error ); $input[$main_key] = 0; @@ -297,7 +297,7 @@ public function social_validation( $app_token, $old_options, $input, $strategy, } if ( false === $a = WP_Auth0_Api_Client::update_connection($domain, $app_token, $selected_connection->id, $data) ) { - $error = __( 'There was an error disabling your social connection for this app.', WPA0_LANG ); + $error = __( 'There was an error disabling your social connection for this app.', 'wp-auth0' ); throw new Exception( $error ); $input[$main_key] = 1; } @@ -319,7 +319,7 @@ public function toggle_rule($app_token, $rule_id, $rule_name, $rule_script) { $rule = WP_Auth0_Api_Client::create_rule( $domain, $app_token, $rule_name, $rule_script ); if ( $rule === false ) { - $error = __( 'There was an error creating the Auth0 rule. You can do it manually from your Auth0 dashboard.', WPA0_LANG ); + $error = __( 'There was an error creating the Auth0 rule. You can do it manually from your Auth0 dashboard.', 'wp-auth0' ); throw new Exception( $error ); } else { return $rule->id; @@ -327,7 +327,7 @@ public function toggle_rule($app_token, $rule_id, $rule_name, $rule_script) { } else { if ( false === WP_Auth0_Api_Client::delete_rule($domain, $app_token, $rule_id) ) { - $error = __( 'There was an error deleting the Auth0 rule. You can do it manually from your Auth0 dashboard.', WPA0_LANG ); + $error = __( 'There was an error deleting the Auth0 rule. You can do it manually from your Auth0 dashboard.', 'wp-auth0' ); throw new Exception( $error ); } return null; diff --git a/lib/WP_Auth0_EditProfile.php b/lib/WP_Auth0_EditProfile.php index 49e73cfa..cc45b9ea 100644 --- a/lib/WP_Auth0_EditProfile.php +++ b/lib/WP_Auth0_EditProfile.php @@ -38,7 +38,7 @@ public function validate_new_password( $errors, $update, $user ) { $auth0_repeat_password = isset( $_POST['auth0_repeat_password'] ) ? $_POST['auth0_repeat_password'] : null; if ( $auth0_password != $auth0_repeat_password ) { - $errors->add( 'auth0_password', __( 'ERROR: The password does not match' ), array( 'form-field' => 'auth0_password' ) ); + $errors->add( 'auth0_password', __( 'ERROR: The password does not match', 'wp-auth0' ), array( 'form-field' => 'auth0_password' ) ); } } @@ -296,17 +296,17 @@ public function override_email_update() { } if ( $connection === null ) { - $errors->add( 'user_email', __( "ERROR: You can't change your email if you are using a social connection." ), array( 'form-field' => 'email' ) ); + $errors->add( 'user_email', __( "ERROR: You can't change your email if you are using a social connection.", "wp-auth0" ), array( 'form-field' => 'email' ) ); return false; } if ( ! is_email( $_POST['email'] ) ) { - $errors->add( 'user_email', __( "ERROR: The email address isn’t correct." ), array( 'form-field' => 'email' ) ); + $errors->add( 'user_email', __( "ERROR: The email address isn’t correct.", "wp-auth0" ), array( 'form-field' => 'email' ) ); return false; } if ( $wpdb->get_var( $wpdb->prepare( "SELECT user_email FROM {$wpdb->users} WHERE user_email=%s", $_POST['email'] ) ) ) { - $errors->add( 'user_email', __( "ERROR: The email address is already used." ), array( 'form-field' => 'email' ) ); + $errors->add( 'user_email', __( "ERROR: The email address is already used.", "wp-auth0" ), array( 'form-field' => 'email' ) ); delete_option( $current_user->ID . '_new_email' ); return; } diff --git a/lib/WP_Auth0_Embed_Widget.php b/lib/WP_Auth0_Embed_Widget.php index e3807e28..82656e9c 100644 --- a/lib/WP_Auth0_Embed_Widget.php +++ b/lib/WP_Auth0_Embed_Widget.php @@ -32,8 +32,8 @@ public function form( $instance ) { wp_enqueue_script( 'wpa0_admin', WPA0_PLUGIN_URL . 'assets/js/admin.js', array( 'jquery' ) ); wp_enqueue_style( 'media' ); wp_localize_script( 'wpa0_admin', 'wpa0', array( - 'media_title' => __( 'Choose your icon', WPA0_LANG ), - 'media_button' => __( 'Choose icon', WPA0_LANG ), + 'media_title' => __( 'Choose your icon', 'wp-auth0' ), + 'media_button' => __( 'Choose icon', 'wp-auth0' ), ) ); require WPA0_PLUGIN_DIR . 'templates/a0-widget-setup-form.php'; } diff --git a/lib/WP_Auth0_Settings_Section.php b/lib/WP_Auth0_Settings_Section.php index b509a751..27200bbb 100644 --- a/lib/WP_Auth0_Settings_Section.php +++ b/lib/WP_Auth0_Settings_Section.php @@ -43,26 +43,26 @@ public function init_menu() { $main_menu = 'wpa0-setup'; } - add_menu_page( __( 'Auth0', WPA0_LANG ), __( 'Auth0', WPA0_LANG ), 'manage_options', $main_menu, + add_menu_page( __( 'Auth0', 'wp-auth0' ), __( 'Auth0', 'wp-auth0' ), 'manage_options', $main_menu, ( $show_initial_setup ? array( $this->initial_setup, 'render_setup_page' ) : array( $this->auth0_admin, 'render_settings_page' ) ), WP_Auth0::get_plugin_dir_url() . 'assets/img/a0icon.png', 85.55 ); if ( $show_initial_setup ) { - add_submenu_page( $main_menu, __( 'Auth0 for WordPress - Setup Wizard', WPA0_LANG ), __( 'Setup Wizard', WPA0_LANG ), 'manage_options', 'wpa0-setup', array( $this->initial_setup, 'render_setup_page' ) ); - add_submenu_page( $main_menu, __( 'Settings', WPA0_LANG ), __( 'Settings', WPA0_LANG ), 'manage_options', 'wpa0', array( $this->auth0_admin, 'render_settings_page' ) ); + add_submenu_page( $main_menu, __( 'Auth0 for WordPress - Setup Wizard', 'wp-auth0' ), __( 'Setup Wizard', 'wp-auth0' ), 'manage_options', 'wpa0-setup', array( $this->initial_setup, 'render_setup_page' ) ); + add_submenu_page( $main_menu, __( 'Settings', 'wp-auth0' ), __( 'Settings', 'wp-auth0' ), 'manage_options', 'wpa0', array( $this->auth0_admin, 'render_settings_page' ) ); } else { - add_submenu_page( $main_menu, __( 'Settings', WPA0_LANG ), __( 'Settings', WPA0_LANG ), 'manage_options', 'wpa0', array( $this->auth0_admin, 'render_settings_page' ) ); + add_submenu_page( $main_menu, __( 'Settings', 'wp-auth0' ), __( 'Settings', 'wp-auth0' ), 'manage_options', 'wpa0', array( $this->auth0_admin, 'render_settings_page' ) ); - add_submenu_page( $main_menu, __( 'Help', WPA0_LANG ), __( 'Help', WPA0_LANG ), 'manage_options', 'wpa0-help', array( $this, 'redirect_to_help' ) ); + add_submenu_page( $main_menu, __( 'Help', 'wp-auth0' ), __( 'Help', 'wp-auth0' ), 'manage_options', 'wpa0-help', array( $this, 'redirect_to_help' ) ); - add_submenu_page( $main_menu, __( 'Auth0 for WordPress - Setup Wizard', WPA0_LANG ), __( 'Setup Wizard', WPA0_LANG ), 'manage_options', 'wpa0-setup', array( $this->initial_setup, 'render_setup_page' ) ); + add_submenu_page( $main_menu, __( 'Auth0 for WordPress - Setup Wizard', 'wp-auth0' ), __( 'Setup Wizard', 'wp-auth0' ), 'manage_options', 'wpa0-setup', array( $this->initial_setup, 'render_setup_page' ) ); } - add_submenu_page( $main_menu, __( 'Export Users Data', WPA0_LANG ), __( 'Export Users Data', WPA0_LANG ), 'manage_options', 'wpa0-users-export', array( $this->users_exporter, 'render_export_users' ) ); - add_submenu_page( $main_menu, __( 'Error Log', WPA0_LANG ), __( 'Error Log', WPA0_LANG ), 'manage_options', 'wpa0-errors', array( $this->error_log, 'render_settings_page' ) ); - add_submenu_page( $main_menu, __( 'Import-Export settings', WPA0_LANG ), __( 'Import-Export settings', WPA0_LANG ), 'manage_options', 'wpa0-import-settings', array( $this->import_settings, 'render_import_settings_page' ) ); + add_submenu_page( $main_menu, __( 'Export Users Data', 'wp-auth0' ), __( 'Export Users Data', 'wp-auth0' ), 'manage_options', 'wpa0-users-export', array( $this->users_exporter, 'render_export_users' ) ); + add_submenu_page( $main_menu, __( 'Error Log', 'wp-auth0' ), __( 'Error Log', 'wp-auth0' ), 'manage_options', 'wpa0-errors', array( $this->error_log, 'render_settings_page' ) ); + add_submenu_page( $main_menu, __( 'Import-Export settings', 'wp-auth0' ), __( 'Import-Export settings', 'wp-auth0' ), 'manage_options', 'wpa0-import-settings', array( $this->import_settings, 'render_import_settings_page' ) ); if ( WP_Auth0_Configure_JWTAUTH::is_jwt_auth_enabled() ) { - add_submenu_page( $main_menu, __( 'JWT Auth integration', WPA0_LANG ), __( 'JWT Auth integration', WPA0_LANG ), 'manage_options', 'wpa0-jwt-auth', array( $this->configure_jwt_auth, 'render_settings_page' ) ); + add_submenu_page( $main_menu, __( 'JWT Auth integration', 'wp-auth0' ), __( 'JWT Auth integration', 'wp-auth0' ), 'manage_options', 'wpa0-jwt-auth', array( $this->configure_jwt_auth, 'render_settings_page' ) ); } } diff --git a/lib/admin/WP_Auth0_Admin.php b/lib/admin/WP_Auth0_Admin.php index 8eaeddfb..52619f43 100755 --- a/lib/admin/WP_Auth0_Admin.php +++ b/lib/admin/WP_Auth0_Admin.php @@ -89,8 +89,8 @@ public function admin_enqueue() { wp_enqueue_style( 'media' ); wp_localize_script( 'wpa0_admin', 'wpa0', array( - 'media_title' => __( 'Choose your icon', WPA0_LANG ), - 'media_button' => __( 'Choose icon', WPA0_LANG ), + 'media_title' => __( 'Choose your icon', 'wp-auth0' ), + 'media_button' => __( 'Choose icon', 'wp-auth0' ), ) ); } @@ -106,9 +106,9 @@ public function cant_connect_to_auth0() {

- - - + + +

@@ -164,9 +164,9 @@ public function create_account_message() {

- - - + + +

diff --git a/lib/admin/WP_Auth0_Admin_Advanced.php b/lib/admin/WP_Auth0_Admin_Advanced.php index 8db3c450..f94c69e2 100644 --- a/lib/admin/WP_Auth0_Admin_Advanced.php +++ b/lib/admin/WP_Auth0_Admin_Advanced.php @@ -95,8 +95,8 @@ public function render_passwordless_method() {
- - + +
render_a0_switch( "wpa0_jwt_auth_integration", "jwt_auth_integration", 1, 1 == $v ); ?>
- +
- +
options->get_options_name(); ?>[extra_conf]" id="wpa0_extra_conf">
- - - + + +
options->get_options_name(); ?>[custom_signup_fields]" id="wpa0_custom_signup_fields">
- - + + 
[
   {
@@ -174,7 +174,7 @@ public function render_link_auth0_users() {
     echo $this->render_a0_switch( "wpa0_link_auth0_users", "link_auth0_users", 1, ! empty( $v ) );
 ?>
       

-        
+        
       

     
 
       

-        
+        
         

     
 
       

-        
+        
       

     
 
       

-         General).', WPA0_LANG ); ?>
+         General).', 'wp-auth0' ); ?>
       

     
 
       

-        
+        
       

     
 
       

-        
+        
       

     
       

-        
+        
         

-        
+        
         
       

     
       

-        HERE.
+        HERE.
       

     
       

         
-        
+        
       

     
 
     

-      
+      
     

     
 
     

-      
+      
     

     
     
     

-       [Connection Type] (eg. Social or Enterprise). Click the "down arrow" to expand the wanted method, and use the value in the "Name"-field. Example: google-oauth2', WPA0_LANG ); ?>
+       [Connection Type] (eg. Social or Enterprise). Click the "down arrow" to expand the wanted method, and use the value in the "Name"-field. Example: google-oauth2', 'wp-auth0' ); ?>
     

     
     
     

-      
+      
       xx.xx.xx.xx - yy.yy.yy.yy
     

     
     
     

-      
+      
     

     options->get_options_name(); ?>[wpa0_passwordless_cdn_url]" id="wpa0_passwordless_cdn_url" value="" style=""/>
 
       

-        
+        
       

     options->get_options_name(); ?>[auth0_server_domain]" id="wpa0_auth0_server_domain" value="" />
 
       

-        
+        
       

     options->get_options_name(); ?>[lock_connections]" id="wpa0_connections" value="" />
 
       

-        
+        
       

     
         
-          
+
render_a0_switch( "wpa0_verified_email", "requires_verified_email", 1, 1 == $v ); ?>
- +
HERE.'; $this->add_validation_error( $error ); // } @@ -518,7 +518,7 @@ public function migration_ws_validation( $old_options, $input ) { } if ( $response === false ) { - $error = __( 'There was an error disabling your custom database. Check how to do it manually ', WPA0_LANG ); + $error = __( 'There was an error disabling your custom database. Check how to do it manually ', 'wp-auth0' ); $error .= 'HERE.'; $this->add_validation_error( $error ); } @@ -588,7 +588,7 @@ public function connections_validation( $old_options, $input ) { $matching = array_intersect($enabled_connections, $check_if_enabled); if (array_diff($matching, $check_if_enabled) !== array_diff($check_if_enabled, $matching)) { - $error = __( 'The passwordless connection is not enabled. Please go to the Auth0 Dashboard and configure it.', WPA0_LANG ); + $error = __( 'The passwordless connection is not enabled. Please go to the Auth0 Dashboard and configure it.', 'wp-auth0' ); $this->add_validation_error( $error ); } @@ -606,7 +606,7 @@ public function loginredirection_validation( $old_options, $input ) { if ( strpos( $input['default_login_redirection'], $home_url ) !== 0 ) { if ( strpos( $input['default_login_redirection'], 'http' ) === 0 ) { $input['default_login_redirection'] = $home_url; - $error = __( "The 'Login redirect URL' cannot point to a foreign page.", WPA0_LANG ); + $error = __( "The 'Login redirect URL' cannot point to a foreign page.", "wp-auth0" ); $this->add_validation_error( $error ); } } @@ -614,7 +614,7 @@ public function loginredirection_validation( $old_options, $input ) { if ( strpos( $input['default_login_redirection'], 'action=logout' ) !== false ) { $input['default_login_redirection'] = $home_url; - $error = __( "The 'Login redirect URL' cannot point to the logout page. ", WPA0_LANG ); + $error = __( "The 'Login redirect URL' cannot point to the logout page. ", "wp-auth0" ); $this->add_validation_error( $error ); } } diff --git a/lib/admin/WP_Auth0_Admin_Appearance.php b/lib/admin/WP_Auth0_Admin_Appearance.php index 88e4465e..0c05f006 100644 --- a/lib/admin/WP_Auth0_Admin_Appearance.php +++ b/lib/admin/WP_Auth0_Admin_Appearance.php @@ -34,8 +34,8 @@ public function render_remember_last_login() { ?>
- - + +
- +
- +
- +
- +
- +
- +
options->get( 'username_style' ); ?> /> - + /> - + /> - +
- - + +
- - + + options->get( 'icon_url' ); ?> - +
- +
add_validation_error( $error ); $input['language'] = $old_options['language']; } @@ -181,7 +181,7 @@ public function basic_validation( $old_options, $input ) { // if ( trim( $input['extra_conf'] ) !== '' ) { // if ( json_decode( $input['extra_conf'] ) === null ) { - // $error = __( 'The Extra settings parameter should be a valid json object.', WPA0_LANG ); + // $error = __( 'The Extra settings parameter should be a valid json object.', 'wp-auth0' ); // $this->add_validation_error( $error ); // } // } diff --git a/lib/admin/WP_Auth0_Admin_Basic.php b/lib/admin/WP_Auth0_Admin_Basic.php index 2565f3d2..9a436450 100644 --- a/lib/admin/WP_Auth0_Admin_Basic.php +++ b/lib/admin/WP_Auth0_Admin_Basic.php @@ -31,7 +31,7 @@ public function render_client_id() { ?>
- Auth0 dashboard. + Auth0 dashboard.
options->get_options_name(); ?>[auth0_app_token]" id="wpa0_auth0_app_token" autocomplete="off" placeholder="Not visible" />
- - - + + + $actions ) { $a++;?> () placeholder="Not visible" />
- Auth0 dashboard. + Auth0 dashboard.
+ " when this is not encoded.', 'wp-auth0' ); ?>
- Auth0 dashboard + Auth0 dashboard
options->is_wp_registration_enabled(); ?> - + - - + + - - + + - Network Admin > Settings > Network Settings > Allow new registrations (you need to set it up to User accounts may be registered or Both sites and user accounts can be registered depending on your preferences).', WPA0_LANG ); ?> + Network Admin > Settings > Network Settings > Allow new registrations (you need to set it up to User accounts may be registered or Both sites and user accounts can be registered depending on your preferences).', 'wp-auth0' ); ?> options->is_wp_registration_enabled(); ?> - + - - + + - - + + - Settings > General > Membership, Anyone can register', WPA0_LANG ); ?> + Settings > General > Membership, Anyone can register', 'wp-auth0' ); ?> render_a0_switch( "wpa0_wp_login_enabled", "wordpress_login_enabled", 1, 1 == $v ); ?>
- +
add_validation_error( $error ); $completeBasicData = false; } if ( empty( $input['client_id'] ) ) { - $error = __( 'You need to specify a client id', WPA0_LANG ); + $error = __( 'You need to specify a client id', 'wp-auth0' ); $this->add_validation_error( $error ); $completeBasicData = false; } if ( empty( $input['client_secret'] ) && empty( $old_options['client_secret'] ) ) { - $error = __( 'You need to specify a client secret', WPA0_LANG ); + $error = __( 'You need to specify a client secret', 'wp-auth0' ); $this->add_validation_error( $error ); $completeBasicData = false; } diff --git a/lib/admin/WP_Auth0_Admin_Dashboard.php b/lib/admin/WP_Auth0_Admin_Dashboard.php index b6f99f4a..c4d17646 100644 --- a/lib/admin/WP_Auth0_Admin_Dashboard.php +++ b/lib/admin/WP_Auth0_Admin_Dashboard.php @@ -65,13 +65,13 @@ public function render_age_chart_type() { ?> /> - + /> - +   /> - + /> - + /> - +   /> - + /> - + /> - +   /> - + options->get_options_name(); ?>[password_policy]" id="wpa0_password_policy_excellent" value="excellent" />
- +
- - . + + .
- - . + + . - - . - - . - + + . + + . + - + render_a0_switch( "wpa0_income_rule", "income_rule", 1, !empty( $v ) ); ?>
- +
- +
render_a0_switch( "wpa0_override_wp_avatars", "override_wp_avatars", 1, !empty( $v ) ); ?>
- +
- - - + + + HERE.'; $this->add_validation_error( $error ); @@ -207,7 +207,7 @@ public function security_validation( $old_options, $input ) { if ( false === WP_Auth0_Api_Client::update_connection($input['domain'], $input['auth0_app_token'], $connection_id, $connection ) ) { - $error = __( 'There was an error updating your Auth0 DB Connection. To do it manually, change it ', WPA0_LANG ); + $error = __( 'There was an error updating your Auth0 DB Connection. To do it manually, change it ', 'wp-auth0' ); $error .= 'HERE.'; $this->add_validation_error( $error ); diff --git a/lib/admin/WP_Auth0_Admin_Generic.php b/lib/admin/WP_Auth0_Admin_Generic.php index 58df69b6..279c7c00 100644 --- a/lib/admin/WP_Auth0_Admin_Generic.php +++ b/lib/admin/WP_Auth0_Admin_Generic.php @@ -15,7 +15,7 @@ protected function init_option_section( $sectionName, $id, $settings ) { add_settings_section( "wp_auth0_{$id}_settings_section", - __( $sectionName, WPA0_LANG ), + __( $sectionName, 'wp-auth0' ), array( $this, "render_{$id}_description" ), $options_name ); @@ -23,7 +23,7 @@ protected function init_option_section( $sectionName, $id, $settings ) { foreach ( $settings as $setting ) { add_settings_field( $setting['id'], - __( $setting['name'], WPA0_LANG ), + __( $setting['name'], 'wp-auth0' ), array( $this, $setting['function'] ), $options_name, "wp_auth0_{$id}_settings_section", diff --git a/lib/dashboard-widgets/WP_Auth0_Dashboard_Widgets.php b/lib/dashboard-widgets/WP_Auth0_Dashboard_Widgets.php index aeca19ba..b3e846a1 100644 --- a/lib/dashboard-widgets/WP_Auth0_Dashboard_Widgets.php +++ b/lib/dashboard-widgets/WP_Auth0_Dashboard_Widgets.php @@ -31,7 +31,7 @@ public function show_admin_notice() { if ( ! get_user_meta( $user_id, 'a0_ignore_widgets_explanation' ) ) { echo '

'; - printf( __( 'Auth0 tip: You can filter the data by clicking on the charts. Click again to clear the selection. | Hide' ), '?a0_ignore_widgets_explanation=0' ); + printf( __( 'Auth0 tip: You can filter the data by clicking on the charts. Click again to clear the selection. | Hide', 'wp-auth0' ), '?a0_ignore_widgets_explanation=0' ); echo "

"; } } diff --git a/lib/initial-setup/WP_Auth0_InitialSetup.php b/lib/initial-setup/WP_Auth0_InitialSetup.php index a20624a3..831062c1 100644 --- a/lib/initial-setup/WP_Auth0_InitialSetup.php +++ b/lib/initial-setup/WP_Auth0_InitialSetup.php @@ -150,11 +150,11 @@ public function cant_create_client_message() {

- - - - - + + + + +

@@ -167,9 +167,9 @@ public function cant_exchange_token_message() {

- - - + + +

@@ -182,7 +182,7 @@ public function rejected_message() {

- +

@@ -194,7 +194,7 @@ public function access_denied() {

- + https://manage.auth0.com

diff --git a/templates/a0-error-log.php b/templates/a0-error-log.php index 2c02b260..0a03be91 100644 --- a/templates/a0-error-log.php +++ b/templates/a0-error-log.php @@ -2,7 +2,7 @@ -

+

diff --git a/templates/a0-widget-setup-form.php b/templates/a0-widget-setup-form.php index b57c0b90..f3f29b66 100644 --- a/templates/a0-widget-setup-form.php +++ b/templates/a0-widget-setup-form.php @@ -115,12 +115,12 @@ class="button-secondary">
- - + +
- : - + : + @@ -132,12 +132,12 @@ class="button-secondary">
- - + +
- : - + : + @@ -149,8 +149,8 @@ class="button-secondary">
- - + +

@@ -161,5 +161,5 @@ class="button-secondary">
- +

diff --git a/templates/auth0-login-form-lock10.php b/templates/auth0-login-form-lock10.php index 8cae533e..2ae41ad0 100644 --- a/templates/auth0-login-form-lock10.php +++ b/templates/auth0-login-form-lock10.php @@ -4,7 +4,7 @@ if ( ! $lock_options->can_show() ) { ?> -

+

can_show() ) { ?> -

+

-

+

diff --git a/templates/export-users.php b/templates/export-users.php index 50b1d22f..e08b4e16 100644 --- a/templates/export-users.php +++ b/templates/export-users.php @@ -4,7 +4,7 @@
-

+

diff --git a/templates/import_settings.php b/templates/import_settings.php index 7a6d4073..447be2bd 100644 --- a/templates/import_settings.php +++ b/templates/import_settings.php @@ -5,7 +5,7 @@
-

+

You can import and export your Auth0 WordPress plugin settings here. This allows you to either backup the data, or to move your settings to a new WordPress instance.

diff --git a/templates/initial-setup/admin-creation.php b/templates/initial-setup/admin-creation.php index 882c83a0..1fbbdf0d 100644 --- a/templates/initial-setup/admin-creation.php +++ b/templates/initial-setup/admin-creation.php @@ -6,17 +6,17 @@
-

+

-

+

- - " target="_blank"> - + + " target="_blank"> +

@@ -34,7 +34,7 @@
- +
diff --git a/templates/initial-setup/connection_profile.php b/templates/initial-setup/connection_profile.php index 5fc9d09b..15555689 100644 --- a/templates/initial-setup/connection_profile.php +++ b/templates/initial-setup/connection_profile.php @@ -4,14 +4,14 @@
-

-

our help documentation

+

+

our help documentation

Important: - + Sign up for free @@ -26,9 +26,9 @@
-

+

-

+

@@ -40,9 +40,9 @@
-

+

-

+

@@ -60,13 +60,13 @@
-

-

+

+

Note: - +
@@ -88,14 +88,14 @@

- +



- - - + + +

diff --git a/templates/initial-setup/connections.php b/templates/initial-setup/connections.php index 2f1e94fa..028dc0b1 100644 --- a/templates/initial-setup/connections.php +++ b/templates/initial-setup/connections.php @@ -11,24 +11,24 @@

-

+

-

+

-

+

/>
-

+

-

+

diff --git a/templates/initial-setup/consent-disclaimer.php b/templates/initial-setup/consent-disclaimer.php index cfc61363..64cba50f 100644 --- a/templates/initial-setup/consent-disclaimer.php +++ b/templates/initial-setup/consent-disclaimer.php @@ -2,9 +2,9 @@
-

+

-

+

diff --git a/templates/initial-setup/data-migration.php b/templates/initial-setup/data-migration.php index efbb5f61..af00402c 100644 --- a/templates/initial-setup/data-migration.php +++ b/templates/initial-setup/data-migration.php @@ -1,7 +1,7 @@
-

+

This will create a new database connections, expose 2 endpoints and will pupulate the custom scripts to call this endpoints to migrate the users to auth0. the users will not be changed in wordpress.

@@ -9,8 +9,8 @@ />
- - + +

This action will create a new Database connection with the custom scrits required to import your Wordpress Users.

diff --git a/templates/initial-setup/end.php b/templates/initial-setup/end.php index 945fc651..4e30968c 100644 --- a/templates/initial-setup/end.php +++ b/templates/initial-setup/end.php @@ -6,9 +6,9 @@ -

+

-

+

GO TO PLUG-IN SETTINGS diff --git a/templates/initial-setup/enterprise_connections.php b/templates/initial-setup/enterprise_connections.php index e3fd0340..7e111a74 100644 --- a/templates/initial-setup/enterprise_connections.php +++ b/templates/initial-setup/enterprise_connections.php @@ -4,13 +4,13 @@
-

+

-

+

-

+

@@ -20,7 +20,7 @@

- +   @@ -30,8 +30,8 @@
- - + +
diff --git a/templates/initial-setup/rules.php b/templates/initial-setup/rules.php index 3193abee..80f11ec8 100644 --- a/templates/initial-setup/rules.php +++ b/templates/initial-setup/rules.php @@ -1,7 +1,7 @@
-

+

This will create a new database connections, expose 2 endpoints and will pupulate the custom scripts to call this endpoints to migrate the users to auth0. the users will not be changed in wordpress.

@@ -12,10 +12,10 @@ MFA: />
- - . - - . + + . + + .
@@ -24,7 +24,7 @@ GEO: />
- +
@@ -33,10 +33,10 @@
Income: />
- +
- +
@@ -50,9 +50,9 @@
- - - + + +
diff --git a/templates/initial-setup/signup.php b/templates/initial-setup/signup.php index 5f526e75..fb872948 100644 --- a/templates/initial-setup/signup.php +++ b/templates/initial-setup/signup.php @@ -4,8 +4,8 @@
-

-

+

+

diff --git a/templates/settings.php b/templates/settings.php index 8e1ae675..7e3e9ad4 100644 --- a/templates/settings.php +++ b/templates/settings.php @@ -5,7 +5,7 @@
-

+

For your Auth0 dashboard with more settings click here. diff --git a/templates/verify-email.php b/templates/verify-email.php index 799c5eb0..d26bc659 100644 --- a/templates/verify-email.php +++ b/templates/verify-email.php @@ -1,8 +1,8 @@ - +
- +

- +