Changeset 50701

Timestamp:

04/12/2021 06:32:39 PM (4 years ago)

Author:

SergeyBiryukov

Message:

Coding Standards: Rewrite a fragment in request_filesystem_credentials() for clarity and to avoid repetition.

Follow-up to [8540], [8865].

See #52627.

File:

• trunk/src/wp-admin/includes/file.php (modified) (1 diff)

trunk/src/wp-admin/includes/file.php

@@ -2160 +2160 @@
     }
 
-    // If defined, set it to that. Else, if POST'd, set it to that. If not, set it to whatever it previously was (saved details in option).
-    $credentials['hostname'] = defined( 'FTP_HOST' ) ? FTP_HOST : ( ! empty( $submitted_form['hostname'] ) ? $submitted_form['hostname'] : $credentials['hostname'] );
-    $credentials['username'] = defined( 'FTP_USER' ) ? FTP_USER : ( ! empty( $submitted_form['username'] ) ? $submitted_form['username'] : $credentials['username'] );
-    $credentials['password'] = defined( 'FTP_PASS' ) ? FTP_PASS : ( ! empty( $submitted_form['password'] ) ? $submitted_form['password'] : '' );
-
-    // Check to see if we are setting the public/private keys for ssh.
-    $credentials['public_key']  = defined( 'FTP_PUBKEY' ) ? FTP_PUBKEY : ( ! empty( $submitted_form['public_key'] ) ? $submitted_form['public_key'] : '' );
-    $credentials['private_key'] = defined( 'FTP_PRIKEY' ) ? FTP_PRIKEY : ( ! empty( $submitted_form['private_key'] ) ? $submitted_form['private_key'] : '' );
+    $ftp_constants = array(
+        'hostname'    => 'FTP_HOST',
+        'username'    => 'FTP_USER',
+        'password'    => 'FTP_PASS',
+        'public_key'  => 'FTP_PUBKEY',
+        'private_key' => 'FTP_PRIKEY',
+    );
+
+    // If defined, set it to that. Else, if POST'd, set it to that. If not, set it to an empty string.
+    // Otherwise, keep it as it previously was (saved details in option).
+    foreach ( $ftp_constants as $key => $constant ) {
+        if ( defined( $constant ) ) {
+            $credentials[ $key ] = constant( $constant );
+        } elseif ( ! empty( $submitted_form[ $key ] ) ) {
+            $credentials[ $key ] = $submitted_form[ $key ];
+        } elseif ( ! isset( $credentials[ $key ] ) ) {
+            $credentials[ $key ] = '';
+        }
+    }
 
     // Sanitize the hostname, some people might pass in odd data.