Changeset 2223674

Timestamp:

01/07/2020 04:16:15 PM (6 years ago)

Author:

256hax

Message:

fix: failed to save pw to DB when first activated plugin

Location:

wp-similar-basic-auth/trunk

Files:

• includes/admin/admin-plugins-page.php (modified) (2 diffs)
• includes/public/login-page.php (modified) (1 diff)
• wp-similar-basic-auth.php (modified) (1 diff)

wp-similar-basic-auth/trunk/includes/admin/admin-plugins-page.php

@@ -10 +10 @@
     function __construct() {
         add_filter( 'plugin_action_links', array( $this, 'plugin_settings_link' ) );
+        add_action( 'activated_plugin', array($this, 'action_activated_plugin') );
     }
 
+    // Add Settings menu in plugins page
     function plugin_settings_link( $link ) {
         global $hax_wsba_config;
@@ -20 +22 @@
         array_unshift( $link, $url ); // Settings link first For order
         return $link;
+    }
+
+    public function action_activated_plugin() {
+        global $hax_wsba_config;
+
+        // It need wp_options what use in DB.
+        // register_settings sanitize callback will be launched twice if no wp_options.
+        $init_options = array(
+            $hax_wsba_config->register_settings_title,
+            $hax_wsba_config->register_settings_message,
+            $hax_wsba_config->register_settings_user_name,
+            $hax_wsba_config->register_settings_password
+        );
+
+        foreach( $init_options as $value) {
+            if ( !get_option( $value ) ) {
+                add_option($value);
+            }
+        }
     }
 

wp-similar-basic-auth/trunk/includes/public/login-page.php

@@ -67 +67 @@
         $hax_wsba_cookie = new Hax_Wsba_Cookie();
 
-        // [Pass] If not set User Name and Password, pass WSBA page.
+        // [Pass] If no set User Name and Password, pass WSBA page.
         // It suppose just activate plugin or forget set User Name or Password.
-        if ( $saved_user_name === false || $saved_password === false ) {
-            return 'data_does_not_exist'; // For phpunit
+        if ( $saved_user_name === false || $saved_password === false || $saved_user_name === '' || $saved_password === '' ) {
+            return 'no_data'; // For phpunit
         }
 

wp-similar-basic-auth/trunk/wp-similar-basic-auth.php

@@ -56 +56 @@
 
         if ( is_admin() ) {
+            include_once( $hax_wsba_config->path_admin . 'admin-plugins-page.php' );
             include_once( $hax_wsba_config->path_admin . 'admin-options-page.php' );
-            include_once( $hax_wsba_config->path_admin . 'admin-plugins-page.php' );
         }
     }