Changes in trunk/wp-admin/includes/file.php [14924:15156]

File:

• trunk/wp-admin/includes/file.php (modified) (5 diffs)

trunk/wp-admin/includes/file.php

@@ -586 +586 @@
     // PHP4-compat - php4 classes can't contain constants
     $zopen = $z->open($file, /* ZIPARCHIVE::CHECKCONS */ 4);
-    if ( true !== $zopen && /* ZIPARCHIVE::ZIP_ER_OK */ 0 !== $zopen ) // may return true, or (int)0 ZIP_ER_OK under certain versions
+    if ( true !== $zopen )
         return new WP_Error('incompatible_archive', __('Incompatible Archive.'));
 
@@ -607 +607 @@
         if ( untrailingslashit($to) == $dir ) // Skip over the working directory, We know this exists (or will exist)
             continue;
+        if ( strpos($dir, $to) === false ) // If the directory is not within the working directory, Skip it
+            continue;
 
         $parent_folder = dirname($dir);
@@ -685 +687 @@
         // Check the parent folders of the folders all exist within the creation array.
         if ( untrailingslashit($to) == $dir ) // Skip over the working directory, We know this exists (or will exist)
+            continue;
+        if ( strpos($dir, $to) === false ) // If the directory is not within the working directory, Skip it
             continue;
 
@@ -965 +969 @@
 <?php screen_icon(); ?>
 <h2><?php _e('Connection Information') ?></h2>
-<p><?php _e('To perform the requested action, connection information is required.') ?></p>
-
+<p><?php
+    $label_user = __('Username');
+    $label_pass = __('Password');
+    _e('To perform the requested action, WordPress needs to access to your web server.');
+    echo ' ';
+    if ( ( isset( $types['ftp'] ) || isset( $types['ftps'] ) ) ) {
+        if ( isset( $types['ssh'] ) ) {
+            _e('Please enter your FTP or SSH credentials to proceed.');
+            $label_user = __('FTP/SSH Username');
+            $label_pass = __('FTP/SSH Password');
+        } else {
+            _e('Please enter your FTP credentials to proceed.');
+            $label_user = __('FTP Username');
+            $label_pass = __('FTP Password');
+        }
+        echo ' ';
+    }
+    _e('If you do not remember your credentials, you should contact your web host.');
+?></p>
 <table class="form-table">
 <tr valign="top">
@@ -974 +995 @@
 
 <tr valign="top">
-<th scope="row"><label for="username"><?php _e('Username') ?></label></th>
+<th scope="row"><label for="username"><?php echo $label_user; ?></label></th>
 <td><input name="username" type="text" id="username" value="<?php echo esc_attr($username) ?>"<?php disabled( defined('FTP_USER') ); ?> size="40" /></td>
 </tr>
 
 <tr valign="top">
-<th scope="row"><label for="password"><?php _e('Password') ?></label></th>
+<th scope="row"><label for="password"><?php echo $label_pass; ?></label></th>
 <td><input name="password" type="password" id="password" value="<?php if ( defined('FTP_PASS') ) echo '*****'; ?>"<?php disabled( defined('FTP_PASS') ); ?> size="40" /></td>
 </tr>