enmi-conf.org: comparison wp/wp-admin/includes/class-wp-filesystem-ftpsockets.php

equal deleted inserted replaced

-:7b1b88e27a20
+:48c4eec2b7e6
 	public function __construct( $opt = '' ) {
 		$this->method = 'ftpsockets';
 		$this->errors = new WP_Error();
 		// Check if possible to use ftp functions.
-		if ( ! include_once ABSPATH . 'wp-admin/includes/class-ftp.php' ) {
+		if ( ! require_once ABSPATH . 'wp-admin/includes/class-ftp.php' ) {
 			return;
 		}
 		$this->ftp = new ftp();
 		return $this->put_contents( $destination, $content, $mode );
 	}
 	/**
-	 * Moves a file.
+	 * Moves a file or directory.
 	 *
-	 * @since 2.5.0
+	 * After moving files or directories, OPcache will need to be invalidated.
 	 *
-	 * @param string $source      Path to the source file.
+	 * If moving a directory fails, `copy_dir()` can be used for a recursive copy.
-	 * @param string $destination Path to the destination file.
+	 *
-	 * @param bool   $overwrite   Optional. Whether to overwrite the destination file if it exists.
+	 * Use `move_dir()` for moving directories with OPcache invalidation and a
+	 * fallback to `copy_dir()`.
+	 *
+	 * @since 2.5.0
+	 *
+	 * @param string $source      Path to the source file or directory.
+	 * @param string $destination Path to the destination file or directory.
+	 * @param bool   $overwrite   Optional. Whether to overwrite the destination if it exists.
 	 *                            Default false.
 	 * @return bool True on success, false on failure.
 	 */
 	public function move( $source, $destination, $overwrite = false ) {
 		return $this->ftp->rename( $source, $destination );
 	/**
 	 * Checks if a file or directory exists.
 	 *
 	 * @since 2.5.0
-	 *
+	 * @since 6.3.0 Returns false for an empty path.
-	 * @param string $file Path to file or directory.
+	 *
-	 * @return bool Whether $file exists or not.
+	 * @param string $path Path to file or directory.
-	 */
+	 * @return bool Whether $path exists or not.
-	public function exists( $file ) {
+	 */
-		$list = $this->ftp->nlist( $file );
+	public function exists( $path ) {
+		/*
-		if ( empty( $list ) && $this->is_dir( $file ) ) {
+		 * Check for empty path. If ftp::nlist() receives an empty path,
+		 * it checks the current working directory and may return true.
+		 *
+		 * See https://core.trac.wordpress.org/ticket/33058.
+		 */
+		if ( '' === $path ) {
+			return false;
+		}
+		$list = $this->ftp->nlist( $path );
+		if ( empty( $list ) && $this->is_dir( $path ) ) {
 			return true; // File is an empty directory.
 		}
 		return ! empty( $list ); // Empty list = no file, so invert.
 		// Return $this->ftp->is_exists($file); has issues with ABOR+426 responses on the ncFTPd server.
 	/**
 	 * Checks if a file or directory is writable.
 	 *
 	 * @since 2.5.0
 	 *
-	 * @param string $file Path to file or directory.
+	 * @param string $path Path to file or directory.
-	 * @return bool Whether $file is writable.
+	 * @return bool Whether $path is writable.
 	 */
-	public function is_writable( $file ) {
+	public function is_writable( $path ) {
 		return true;
 	}
 	/**
 	 * Gets the file's last access time.
 	 * @param bool   $include_hidden Optional. Whether to include details of hidden ("." prefixed) files.
 	 *                               Default true.
 	 * @param bool   $recursive      Optional. Whether to recursively include file details in nested directories.
 	 *                               Default false.
 	 * @return array|false {
-	 *     Array of files. False if unable to list directory contents.
+	 *     Array of arrays containing file information. False if unable to list directory contents.
 	 *
-	 *     @type string $name        Name of the file or directory.
+	 *     @type array ...$0 {
-	 *     @type string $perms       *nix representation of permissions.
+	 *         Array of file information. Note that some elements may not be available on all filesystems.
-	 *     @type string $permsn      Octal representation of permissions.
+	 *
-	 *     @type string $owner       Owner name or ID.
+	 *         @type string           $name        Name of the file or directory.
-	 *     @type int    $size        Size of file in bytes.
+	 *         @type string           $perms       *nix representation of permissions.
-	 *     @type int    $lastmodunix Last modified unix timestamp.
+	 *         @type string           $permsn      Octal representation of permissions.
-	 *     @type mixed  $lastmod     Last modified month (3 letter) and day (without leading 0).
+	 *         @type int|string|false $number      File number. May be a numeric string. False if not available.
-	 *     @type int    $time        Last modified time.
+	 *         @type string|false     $owner       Owner name or ID, or false if not available.
-	 *     @type string $type        Type of resource. 'f' for file, 'd' for directory.
+	 *         @type string|false     $group       File permissions group, or false if not available.
-	 *     @type mixed  $files       If a directory and `$recursive` is true, contains another array of files.
+	 *         @type int|string|false $size        Size of file in bytes. May be a numeric string.
+	 *                                             False if not available.
+	 *         @type int|string|false $lastmodunix Last modified unix timestamp. May be a numeric string.
+	 *                                             False if not available.
+	 *         @type string|false     $lastmod     Last modified month (3 letters) and day (without leading 0), or
+	 *                                             false if not available.
+	 *         @type string|false     $time        Last modified time, or false if not available.
+	 *         @type string           $type        Type of resource. 'f' for file, 'd' for directory, 'l' for link.
+	 *         @type array|false      $files       If a directory and `$recursive` is true, contains another array of
+	 *                                             files. False if unable to list directory contents.
+	 *     }
 	 * }
 	 */
 	public function dirlist( $path = '.', $include_hidden = true, $recursive = false ) {
 		if ( $this->is_file( $path ) ) {
 			$limit_file = basename( $path );
 			reset_mbstring_encoding();
 			return false;
 		}
-		$ret = array();
+		$path = trailingslashit( $path );
+		$ret  = array();
 		foreach ( $list as $struc ) {
 			if ( '.' === $struc['name'] || '..' === $struc['name'] ) {
 				continue;
 				continue;
 			}
 			if ( 'd' === $struc['type'] ) {
 				if ( $recursive ) {
-					$struc['files'] = $this->dirlist( $path . '/' . $struc['name'], $include_hidden, $recursive );
+					$struc['files'] = $this->dirlist( $path . $struc['name'], $include_hidden, $recursive );
 				} else {
 					$struc['files'] = array();
 				}
 			}

changeset 21	48c4eec2b7e6
parent 19	3d72ae0968f4