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

equal deleted inserted replaced

-:3d4e9c994f10
+:a86126ab1dd4
 	 *                            Default false.
 	 * @return bool True on success, false on failure.
 	 */
 	public function put_contents( $file, $contents, $mode = false ) {
 		$fp = @fopen( $file, 'wb' );
 		if ( ! $fp ) {
 			return false;
 		}
 		mbstring_binary_safe_encoding();
 	 * @since 2.5.0
 	 *
 	 * @return string|false The current working directory on success, false on failure.
 	 */
 	public function cwd() {
-		return @getcwd();
+		return getcwd();
 	}
 	/**
 	 * Changes current directory.
 	 *
 	 */
 	public function chgrp( $file, $group, $recursive = false ) {
 		if ( ! $this->exists( $file ) ) {
 			return false;
 		}
 		if ( ! $recursive ) {
-			return @chgrp( $file, $group );
+			return chgrp( $file, $group );
 		}
 		if ( ! $this->is_dir( $file ) ) {
-			return @chgrp( $file, $group );
+			return chgrp( $file, $group );
 		}
-		// Is a directory, and we want recursive
+		// Is a directory, and we want recursive.
 		$file     = trailingslashit( $file );
 		$filelist = $this->dirlist( $file );
 		foreach ( $filelist as $filename ) {
 			$this->chgrp( $file . $filename, $group, $recursive );
 		}
 		return true;
 	 * @since 2.5.0
 	 *
 	 * @param string    $file      Path to the file.
 	 * @param int|false $mode      Optional. The permissions as octal number, usually 0644 for files,
 	 *                             0755 for directories. Default false.
-	 * @param bool      $recursive Optional. If set to true, changes file group recursively.
+	 * @param bool      $recursive Optional. If set to true, changes file permissions recursively.
 	 *                             Default false.
 	 * @return bool True on success, false on failure.
 	 */
 	public function chmod( $file, $mode = false, $recursive = false ) {
 		if ( ! $mode ) {
 				return false;
 			}
 		}
 		if ( ! $recursive || ! $this->is_dir( $file ) ) {
-			return @chmod( $file, $mode );
+			return chmod( $file, $mode );
 		}
-		// Is a directory, and we want recursive
+		// Is a directory, and we want recursive.
 		$file     = trailingslashit( $file );
 		$filelist = $this->dirlist( $file );
 		foreach ( (array) $filelist as $filename => $filemeta ) {
 			$this->chmod( $file . $filename, $mode, $recursive );
 		}
 		return true;
 	 */
 	public function chown( $file, $owner, $recursive = false ) {
 		if ( ! $this->exists( $file ) ) {
 			return false;
 		}
 		if ( ! $recursive ) {
-			return @chown( $file, $owner );
+			return chown( $file, $owner );
 		}
 		if ( ! $this->is_dir( $file ) ) {
-			return @chown( $file, $owner );
+			return chown( $file, $owner );
 		}
-		// Is a directory, and we want recursive
+		// Is a directory, and we want recursive.
 		$filelist = $this->dirlist( $file );
 		foreach ( $filelist as $filename ) {
 			$this->chown( $file . '/' . $filename, $owner, $recursive );
 		}
 		return true;
 	}
 	/**
 	 * Gets the file owner.
 	 * @param string $file Path to the file.
 	 * @return string|false Username of the owner on success, false on failure.
 	 */
 	public function owner( $file ) {
 		$owneruid = @fileowner( $file );
 		if ( ! $owneruid ) {
 			return false;
 		}
 		if ( ! function_exists( 'posix_getpwuid' ) ) {
 			return $owneruid;
 		}
 		$ownerarray = posix_getpwuid( $owneruid );
+		if ( ! $ownerarray ) {
+			return false;
+		}
 		return $ownerarray['name'];
 	}
 	/**
 	 * Gets the permissions of the specified file or filepath in their octal format.
 	 * @param string $file Path to the file.
 	 * @return string|false The group on success, false on failure.
 	 */
 	public function group( $file ) {
 		$gid = @filegroup( $file );
 		if ( ! $gid ) {
 			return false;
 		}
 		if ( ! function_exists( 'posix_getgrgid' ) ) {
 			return $gid;
 		}
 		$grouparray = posix_getgrgid( $gid );
+		if ( ! $grouparray ) {
+			return false;
+		}
 		return $grouparray['name'];
 	}
 	/**
 	 * Copies a file.
 		if ( ! $overwrite && $this->exists( $destination ) ) {
 			return false;
 		}
 		$rtval = copy( $source, $destination );
 		if ( $mode ) {
 			$this->chmod( $destination, $mode );
 		}
 		return $rtval;
 	}
 	/**
 	 * Moves a file.
 			return true;
 		}
 		if ( $this->copy( $source, $destination, $overwrite ) && $this->exists( $destination ) ) {
 			$this->delete( $source );
 			return true;
 		} else {
 			return false;
 		}
 	}
 	 * Deletes a file or directory.
 	 *
 	 * @since 2.5.0
 	 *
 	 * @param string       $file      Path to the file or directory.
-	 * @param bool         $recursive Optional. If set to true, changes file group recursively.
+	 * @param bool         $recursive Optional. If set to true, deletes files and folders recursively.
 	 *                                Default false.
 	 * @param string|false $type      Type of resource. 'f' for file, 'd' for directory.
 	 *                                Default false.
 	 * @return bool True on success, false on failure.
 	 */
 	public function delete( $file, $recursive = false, $type = false ) {
-		if ( empty( $file ) ) { // Some filesystems report this as /, which can cause non-expected recursive deletion of all files in the filesystem.
+		if ( empty( $file ) ) {
-			return false;
+			// Some filesystems report this as /, which can cause non-expected recursive deletion of all files in the filesystem.
-		}
+			return false;
-		$file = str_replace( '\\', '/', $file ); // for win32, occasional problems deleting files otherwise
+		}
-		if ( 'f' == $type || $this->is_file( $file ) ) {
+		$file = str_replace( '\\', '/', $file ); // For Win32, occasional problems deleting files otherwise.
+		if ( 'f' === $type || $this->is_file( $file ) ) {
 			return @unlink( $file );
 		}
 		if ( ! $recursive && $this->is_dir( $file ) ) {
 			return @rmdir( $file );
 		}
-		// At this point it's a folder, and we're in recursive mode
+		// At this point it's a folder, and we're in recursive mode.
 		$file     = trailingslashit( $file );
 		$filelist = $this->dirlist( $file, true );
 		$retval = true;
 		if ( is_array( $filelist ) ) {
 			foreach ( $filelist as $filename => $fileinfo ) {
 				if ( ! $this->delete( $file . $filename, $recursive, $fileinfo['type'] ) ) {
 					$retval = false;
 				}
 	 * @param int    $atime Optional. Access time to set for file.
 	 *                      Default 0.
 	 * @return bool True on success, false on failure.
 	 */
 	public function touch( $file, $time = 0, $atime = 0 ) {
-		if ( $time == 0 ) {
+		if ( 0 == $time ) {
 			$time = time();
 		}
-		if ( $atime == 0 ) {
+		if ( 0 == $atime ) {
 			$atime = time();
 		}
-		return @touch( $file, $time, $atime );
+		return touch( $file, $time, $atime );
 	}
 	/**
 	 * Creates a directory.
 	 *
 	 * @return bool True on success, false on failure.
 	 */
 	public function mkdir( $path, $chmod = false, $chown = false, $chgrp = false ) {
 		// Safe mode fails with a trailing slash under certain PHP versions.
 		$path = untrailingslashit( $path );
 		if ( empty( $path ) ) {
 			return false;
 		}
 		if ( ! $chmod ) {
 		}
 		if ( ! @mkdir( $path ) ) {
 			return false;
 		}
 		$this->chmod( $path, $chmod );
 		if ( $chown ) {
 			$this->chown( $path, $chown );
 		}
 		if ( $chgrp ) {
 			$this->chgrp( $path, $chgrp );
 		}
 		return true;
 	}
 	/**
 	 * Deletes a directory.
 			$path       = dirname( $path );
 		} else {
 			$limit_file = false;
 		}
-		if ( ! $this->is_dir( $path ) ) {
+		if ( ! $this->is_dir( $path ) || ! $this->is_readable( $path ) ) {
 			return false;
 		}
-		$dir = @dir( $path );
+		$dir = dir( $path );
 		if ( ! $dir ) {
 			return false;
 		}
 		$ret = array();
 		while ( false !== ( $entry = $dir->read() ) ) {
 			$struc         = array();
 			$struc['name'] = $entry;
-			if ( '.' == $struc['name'] || '..' == $struc['name'] ) {
+			if ( '.' === $struc['name'] || '..' === $struc['name'] ) {
 				continue;
 			}
-			if ( ! $include_hidden && '.' == $struc['name'][0] ) {
+			if ( ! $include_hidden && '.' === $struc['name'][0] ) {
 				continue;
 			}
 			if ( $limit_file && $struc['name'] != $limit_file ) {
 				continue;
 			$struc['number']      = false;
 			$struc['owner']       = $this->owner( $path . '/' . $entry );
 			$struc['group']       = $this->group( $path . '/' . $entry );
 			$struc['size']        = $this->size( $path . '/' . $entry );
 			$struc['lastmodunix'] = $this->mtime( $path . '/' . $entry );
-			$struc['lastmod']     = date( 'M j', $struc['lastmodunix'] );
+			$struc['lastmod']     = gmdate( 'M j', $struc['lastmodunix'] );
-			$struc['time']        = date( 'h:i:s', $struc['lastmodunix'] );
+			$struc['time']        = gmdate( 'h:i:s', $struc['lastmodunix'] );
 			$struc['type']        = $this->is_dir( $path . '/' . $entry ) ? 'd' : 'f';
-			if ( 'd' == $struc['type'] ) {
+			if ( 'd' === $struc['type'] ) {
 				if ( $recursive ) {
 					$struc['files'] = $this->dirlist( $path . '/' . $struc['name'], $include_hidden, $recursive );
 				} else {
 					$struc['files'] = array();
 				}
 			}
 			$ret[ $struc['name'] ] = $struc;
 		}
 		$dir->close();
 		unset( $dir );
 		return $ret;
 	}
 }

changeset 16	a86126ab1dd4
parent 9	177826044cd9
child 18	be944660c56a