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

equal deleted inserted replaced

-:3d4e9c994f10
+:a86126ab1dd4
 	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 ( ! include_once ABSPATH . 'wp-admin/includes/class-ftp.php' ) {
 			return;
 		}
 		$this->ftp = new ftp();
 		if ( empty( $opt['port'] ) ) {
 			$this->options['port'] = 21;
 		} else {
 		$this->ftp->setTimeout( FS_CONNECT_TIMEOUT );
 		if ( ! $this->ftp->SetServer( $this->options['hostname'], $this->options['port'] ) ) {
 			$this->errors->add(
 				'connect',
-				/* translators: %s: hostname:port */
 				sprintf(
+					/* translators: %s: hostname:port */
 					__( 'Failed to connect to FTP Server %s' ),
 					$this->options['hostname'] . ':' . $this->options['port']
 				)
 			);
 			return false;
 		}
 		if ( ! $this->ftp->connect() ) {
 			$this->errors->add(
 				'connect',
-				/* translators: %s: hostname:port */
 				sprintf(
+					/* translators: %s: hostname:port */
 					__( 'Failed to connect to FTP Server %s' ),
 					$this->options['hostname'] . ':' . $this->options['port']
 				)
 			);
 			return false;
 		}
 		if ( ! $this->ftp->login( $this->options['username'], $this->options['password'] ) ) {
 			$this->errors->add(
 				'auth',
-				/* translators: %s: username */
 				sprintf(
+					/* translators: %s: Username. */
 					__( 'Username/Password incorrect for %s' ),
 					$this->options['username']
 				)
 			);
 			return false;
 		}
 		$this->ftp->SetType( FTP_BINARY );
 		$this->ftp->Passive( true );
 		$this->ftp->setTimeout( FS_TIMEOUT );
 		return true;
 	}
 	/**
 	 * Reads entire file into a string.
 	public function get_contents( $file ) {
 		if ( ! $this->exists( $file ) ) {
 			return false;
 		}
-		$temp = wp_tempnam( $file );
+		$tempfile   = wp_tempnam( $file );
+		$temphandle = fopen( $tempfile, 'w+' );
-		if ( ! $temphandle = fopen( $temp, 'w+' ) ) {
-			unlink( $temp );
+		if ( ! $temphandle ) {
+			unlink( $tempfile );
 			return false;
 		}
 		mbstring_binary_safe_encoding();
 		if ( ! $this->ftp->fget( $temphandle, $file ) ) {
 			fclose( $temphandle );
-			unlink( $temp );
+			unlink( $tempfile );
 			reset_mbstring_encoding();
-			return ''; // Blank document, File does exist, It's just blank.
+			return ''; // Blank document. File does exist, it's just blank.
 		}
 		reset_mbstring_encoding();
-		fseek( $temphandle, 0 ); // Skip back to the start of the file being written to
+		fseek( $temphandle, 0 ); // Skip back to the start of the file being written to.
 		$contents = '';
 		while ( ! feof( $temphandle ) ) {
 			$contents .= fread( $temphandle, 8 * KB_IN_BYTES );
 		}
 		fclose( $temphandle );
-		unlink( $temp );
+		unlink( $tempfile );
 		return $contents;
 	}
 	/**
 	 * Reads entire file into an array.
 	 * @param int|false $mode     Optional. The file permissions as octal number, usually 0644.
 	 *                            Default false.
 	 * @return bool True on success, false on failure.
 	 */
 	public function put_contents( $file, $contents, $mode = false ) {
-		$temp = wp_tempnam( $file );
+		$tempfile   = wp_tempnam( $file );
-		if ( ! $temphandle = @fopen( $temp, 'w+' ) ) {
+		$temphandle = @fopen( $tempfile, 'w+' );
-			unlink( $temp );
-			return false;
+		if ( ! $temphandle ) {
-		}
+			unlink( $tempfile );
+			return false;
-		// The FTP class uses string functions internally during file download/upload
+		}
+		// The FTP class uses string functions internally during file download/upload.
 		mbstring_binary_safe_encoding();
 		$bytes_written = fwrite( $temphandle, $contents );
-		if ( false === $bytes_written || $bytes_written != strlen( $contents ) ) {
+		if ( false === $bytes_written || strlen( $contents ) != $bytes_written ) {
 			fclose( $temphandle );
-			unlink( $temp );
+			unlink( $tempfile );
 			reset_mbstring_encoding();
 			return false;
 		}
-		fseek( $temphandle, 0 ); // Skip back to the start of the file being written to
+		fseek( $temphandle, 0 ); // Skip back to the start of the file being written to.
 		$ret = $this->ftp->fput( $file, $temphandle );
 		reset_mbstring_encoding();
 		fclose( $temphandle );
-		unlink( $temp );
+		unlink( $tempfile );
 		$this->chmod( $file, $mode );
 		return $ret;
 	}
 	 *
 	 * @return string|false The current working directory on success, false on failure.
 	 */
 	public function cwd() {
 		$cwd = $this->ftp->pwd();
 		if ( $cwd ) {
 			$cwd = trailingslashit( $cwd );
 		}
 		return $cwd;
 	}
 	/**
 	 * Changes current directory.
 	 * @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 ) {
 		}
 		// chmod any sub-objects if recursive.
 		if ( $recursive && $this->is_dir( $file ) ) {
 			$filelist = $this->dirlist( $file );
 			foreach ( (array) $filelist as $filename => $filemeta ) {
 				$this->chmod( $file . '/' . $filename, $mode, $recursive );
 			}
 		}
-		// chmod the file or directory
+		// chmod the file or directory.
 		return $this->ftp->chmod( $file, $mode );
 	}
 	/**
 	 * 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 ) {
 		$dir = $this->dirlist( $file );
 		return $dir[ $file ]['owner'];
 	}
 	/**
 	 * Gets the permissions of the specified file or filepath in their octal format.
 	 * @param string $file Path to the file.
 	 * @return string Mode of the file (the last 3 digits).
 	 */
 	public function getchmod( $file ) {
 		$dir = $this->dirlist( $file );
 		return $dir[ $file ]['permsn'];
 	}
 	/**
 	 * Gets the file's group.
 	 * @param string $file Path to the file.
 	 * @return string|false The group on success, false on failure.
 	 */
 	public function group( $file ) {
 		$dir = $this->dirlist( $file );
 		return $dir[ $file ]['group'];
 	}
 	/**
 	 * Copies a file.
 		if ( ! $overwrite && $this->exists( $destination ) ) {
 			return false;
 		}
 		$content = $this->get_contents( $source );
 		if ( false === $content ) {
 			return false;
 		}
 		return $this->put_contents( $destination, $content, $mode );
 	 * 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 ) ) {
 			return false;
 		}
-		if ( 'f' == $type || $this->is_file( $file ) ) {
+		if ( 'f' === $type || $this->is_file( $file ) ) {
 			return $this->ftp->delete( $file );
 		}
 		if ( ! $recursive ) {
 			return $this->ftp->rmdir( $file );
 		}
 		return $this->ftp->mdel( $file );
 		if ( empty( $list ) && $this->is_dir( $file ) ) {
 			return true; // File is an empty directory.
 		}
-		return ! empty( $list ); //empty list = no file, so invert.
+		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 resource is a file.
 	 */
 	public function is_file( $file ) {
 		if ( $this->is_dir( $file ) ) {
 			return false;
 		}
 		if ( $this->exists( $file ) ) {
 			return true;
 		}
 		return false;
 	}
 	/**
 	 * Checks if resource is a directory.
 	 * @param string $path Directory path.
 	 * @return bool Whether $path is a directory.
 	 */
 	public function is_dir( $path ) {
 		$cwd = $this->cwd();
 		if ( $this->chdir( $path ) ) {
 			$this->chdir( $cwd );
 			return true;
 		}
 		return false;
 	}
 	/**
 	 * Checks if a file is readable.
 	 *                          Default false.
 	 * @return bool True on success, false on failure.
 	 */
 	public function mkdir( $path, $chmod = false, $chown = false, $chgrp = false ) {
 		$path = untrailingslashit( $path );
 		if ( empty( $path ) ) {
 			return false;
 		}
 		if ( ! $this->ftp->mkdir( $path ) ) {
 			return false;
 		}
 		if ( ! $chmod ) {
 			$chmod = FS_CHMOD_DIR;
 		}
 		$this->chmod( $path, $chmod );
 		return true;
 	}
 	/**
 	 * Deletes a directory.
 		}
 		mbstring_binary_safe_encoding();
 		$list = $this->ftp->dirlist( $path );
 		if ( empty( $list ) && ! $this->exists( $path ) ) {
 			reset_mbstring_encoding();
 			return false;
 		}
 		$ret = array();
 		foreach ( $list as $struc ) {
-			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;
 			}
-			if ( 'd' == $struc['type'] ) {
+			if ( 'd' === $struc['type'] ) {
 				if ( $recursive ) {
 					$struc['files'] = $this->dirlist( $path . '/' . $struc['name'], $include_hidden, $recursive );
 				} else {
 					$struc['files'] = array();
 				}
 			}
-			// Replace symlinks formatted as "source -> target" with just the source name
+			// Replace symlinks formatted as "source -> target" with just the source name.
 			if ( $struc['islink'] ) {
 				$struc['name'] = preg_replace( '/(\s*->\s*.*)$/', '', $struc['name'] );
 			}
-			// Add the Octal representation of the file permissions
+			// Add the octal representation of the file permissions.
 			$struc['permsn'] = $this->getnumchmodfromh( $struc['perms'] );
 			$ret[ $struc['name'] ] = $struc;
 		}

changeset 16	a86126ab1dd4
parent 9	177826044cd9
child 18	be944660c56a