Changeset 773028

Timestamp:

09/16/2013 02:25:10 AM (13 years ago)

Author:

codebykat

Message:

fixed option validation and detection of unconfigured/error states

Location:

post-by-email/trunk

Files:

• class-post-by-email-admin.php (modified) (3 diffs)
• class-post-by-email.php (modified) (1 diff)
• views/admin.php (modified) (1 diff)

post-by-email/trunk/class-post-by-email-admin.php

@@ -84 +84 @@
         $default_options = Post_By_Email::$default_options;
 
-        $mailserver_url = trim( $input['mailserver_url'] );
-        if ( $mailserver_url != $default_options['mailserver_url'] ) {
-            $options['mailserver_url'] = $mailserver_url;
-        }
+        $options['mailserver_url'] = trim( $input['mailserver_url'] );
 
         $mailserver_protocol = trim( $input['mailserver_protocol'] );
-        if ( in_array( $options['mailserver_protocol'], array( 'POP3', 'IMAP' ) ) ) {
+        if ( in_array( $mailserver_protocol, array( 'POP3', 'IMAP' ) ) ) {
             $options['mailserver_protocol'] = $mailserver_protocol;
         }
@@ -100 +97 @@
         }
 
-        $mailserver_login = trim( $input['mailserver_login'] );
-        if ( $mailserver_login != $default_options['mailserver_login'] ) {
-            $options['mailserver_login'] = $mailserver_login;
-        }
-
-        $mailserver_pass = trim( $input['mailserver_pass'] );
-        if ( '' != $mailserver_pass ) {
-            $options['mailserver_pass'] = $mailserver_pass;
-        }
+        $options['mailserver_login'] = trim( $input['mailserver_login'] );
+        $options['mailserver_pass'] = trim( $input['mailserver_pass'] );
 
         // default email category must be the ID of a real category
@@ -119 +109 @@
         $options['delete_messages'] = isset( $input['delete_messages'] ) && '' != $input['delete_messages'];
 
-        if ( $options['mailserver_url'] && $options['mailserver_port']
-            && $options['mailserver_login'] && $options['mailserver_pass'] ) {
-
-            // clear the transient and any error conditions if options have been updated
+        $options['pin_required'] = isset( $input['pin_required'] ) && '' != $input['pin_required'];
+        $options['pin'] = trim( $input['pin'] );
+
+        // this is ridiculous
+        if ( isset ( $input['status'] ) && in_array( $input['status'], array( 'unconfigured', 'error', '') ) ) {
+            // maintain saved state
+            $options['status'] = $input['status'];
+        }
+        elseif ( ( $options['mailserver_url'] == $default_options['mailserver_url'] )
+            || ( '' == $options['mailserver_url'] )
+            || ( $options['mailserver_login'] == $default_options['mailserver_login'] )
+            || ( '' == $options['mailserver_login'] )
+            || ( '' == $options['mailserver_pass'] )
+            || ( '' == $options['mailserver_port'] )
+            || ( '' == $options['mailserver_protocol' ] )
+            ) {
+            // detect if settings are blank or defaults
+            $options['status'] = 'unconfigured';
+        }
+        else {
+            // clear the transient and any error conditions if we have good options now
             delete_transient( 'mailserver_last_checked' );
             $options['status'] = '';
         }
-
-        $options['pin_required'] = isset( $input['pin_required'] ) && '' != $input['pin_required'];
-        $options['pin'] = trim( $input['pin'] );
 
         return $options;

post-by-email/trunk/class-post-by-email.php

@@ -236 +236 @@
 
         $options = get_option( 'post_by_email_options' );
+
+        // if options aren't set, there's nothing to do, move along
+        if ( 'unconfigured' == $options['status'] ) {
+            return;
+        }
+
         $options['last_checked'] = current_time( 'timestamp' );
         $options['status'] = '';
         update_option( 'post_by_email_options', $options );
-
-        // if options aren't set, there's nothing to do, move along
-        if ( 'unconfigured' == $options['status'] ) {
-            return;
-        }
 
         $this->connection = $this->open_mailbox_connection( $options );

post-by-email/trunk/views/admin.php

@@ -242 +242 @@
         </p>
         <p>
-            <a href="<?php echo add_query_arg( 'check_mail', true ); ?>" class="button-secondary">
+            <a href="<?php echo add_query_arg( 'check_mail', true ); ?>" class="button-secondary"
+                <?php if ( 'unconfigured' == $options['status'] ) { echo 'disabled'; } ?> >
                 <?php _e( 'Check now', 'post-by-email' ); ?>
             </a>