Ticket #18476: 18476.4.diff
| File 18476.4.diff, 22.1 KB (added by , 12 years ago) |
|---|
-
src/wp-admin/includes/class-wp-filesystem-base.php
1 1 <?php 2 2 /** 3 * Base WordPress Filesystem .3 * Base WordPress Filesystem 4 4 * 5 5 * @package WordPress 6 6 * @subpackage Filesystem … … 9 9 /** 10 10 * Base WordPress Filesystem class for which Filesystem implementations extend 11 11 * 12 * @since 2.5 12 * @since 2.5.0 13 13 */ 14 14 class WP_Filesystem_Base { 15 15 /** 16 16 * Whether to display debug data for the connection. 17 17 * 18 * @since 2.519 18 * @access public 19 * @since 2.5.0 20 20 * @var bool 21 21 */ 22 22 var $verbose = false; … … 24 24 /** 25 25 * Cached list of local filepaths to mapped remote filepaths. 26 26 * 27 * @since 2.728 27 * @access private 28 * @since 2.7.0 29 29 * @var array 30 30 */ 31 31 var $cache = array(); … … 33 33 /** 34 34 * The Access method of the current connection, Set automatically. 35 35 * 36 * @since 2.537 36 * @access public 37 * @since 2.5.0 38 38 * @var string 39 39 */ 40 40 var $method = ''; 41 41 42 42 /** 43 * Returns the path on the remote filesystem of ABSPATH 43 * Constructor (empty). 44 */ 45 function __construct() {} 46 47 /** 48 * Return the path on the remote filesystem of ABSPATH. 44 49 * 45 * @since 2.746 50 * @access public 51 * @since 2.7.0 52 * 47 53 * @return string The location of the remote path. 48 54 */ 49 55 function abspath() { … … 55 61 } 56 62 57 63 /** 58 * Return s the path on the remote filesystem of WP_CONTENT_DIR64 * Return the path on the remote filesystem of WP_CONTENT_DIR. 59 65 * 60 * @since 2.761 66 * @access public 67 * @since 2.7.0 68 * 62 69 * @return string The location of the remote path. 63 70 */ 64 71 function wp_content_dir() { … … 66 73 } 67 74 68 75 /** 69 * Return s the path on the remote filesystem of WP_PLUGIN_DIR76 * Return the path on the remote filesystem of WP_PLUGIN_DIR. 70 77 * 71 * @since 2.772 78 * @access public 79 * @since 2.7.0 73 80 * 74 81 * @return string The location of the remote path. 75 82 */ … … 78 85 } 79 86 80 87 /** 81 * Return s the path on the remote filesystem of the Themes Directory88 * Return the path on the remote filesystem of the Themes Directory. 82 89 * 83 * @since 2.784 90 * @access public 91 * @since 2.7.0 85 92 * 86 * @param string $theme The Theme stylesheet or template for the directory 93 * @param string $theme The Theme stylesheet or template for the directory. 87 94 * @return string The location of the remote path. 88 95 */ 89 96 function wp_themes_dir( $theme = false ) { … … 97 104 } 98 105 99 106 /** 100 * Return s the path on the remote filesystem of WP_LANG_DIR107 * Return the path on the remote filesystem of WP_LANG_DIR. 101 108 * 109 * @access public 102 110 * @since 3.2.0 103 * @access public104 111 * 105 112 * @return string The location of the remote path. 106 113 */ … … 109 116 } 110 117 111 118 /** 112 * Locate sa folder on the remote filesystem.119 * Locate a folder on the remote filesystem. 113 120 * 114 * Deprecated; use WP_Filesystem::abspath() or WP_Filesystem::wp_*_dir() methods instead.115 *116 * @since 2.5117 * @deprecated 2.7118 121 * @access public 122 * @since 2.5.0 123 * @deprecated 2.7.0 use WP_Filesystem::abspath() or WP_Filesystem::wp_*_dir() instead. 124 * @see WP_Filesystem::abspath() 125 * @see WP_Filesystem::wp_content_dir() 126 * @see WP_Filesystem::wp_plugins_dir() 127 * @see WP_Filesystem::wp_themes_dir() 128 * @see WP_Filesystem::wp_lang_dir() 119 129 * 120 * @param string $base The folder to start searching from 121 * @param bool $echo True to display debug information 130 * @param string $base The folder to start searching from. 131 * @param bool $echo True to display debug information. 132 * Default false. 122 133 * @return string The location of the remote path. 123 134 */ 124 function find_base_dir( $base = '.', $echo = false) {135 function find_base_dir( $base = '.', $echo = false ) { 125 136 _deprecated_function(__FUNCTION__, '2.7', 'WP_Filesystem::abspath() or WP_Filesystem::wp_*_dir()' ); 126 137 $this->verbose = $echo; 127 138 return $this->abspath(); 128 139 } 129 140 130 141 /** 131 * Locate sa folder on the remote filesystem.142 * Locate a folder on the remote filesystem. 132 143 * 133 * Deprecated; use WP_Filesystem::abspath() or WP_Filesystem::wp_*_dir() methods instead.134 *135 * @since 2.5136 * @deprecated 2.7137 144 * @access public 145 * @since 2.5.0 146 * @deprecated 2.7.0 use WP_Filesystem::abspath() or WP_Filesystem::wp_*_dir() methods instead. 147 * @see WP_Filesystem::abspath() 148 * @see WP_Filesystem::wp_content_dir() 149 * @see WP_Filesystem::wp_plugins_dir() 150 * @see WP_Filesystem::wp_themes_dir() 151 * @see WP_Filesystem::wp_lang_dir() 138 152 * 139 * @param string $base The folder to start searching from 140 * @param bool $echo True to display debug information153 * @param string $base The folder to start searching from. 154 * @param bool $echo True to display debug information. 141 155 * @return string The location of the remote path. 142 156 */ 143 function get_base_dir( $base = '.', $echo = false) {157 function get_base_dir( $base = '.', $echo = false ) { 144 158 _deprecated_function(__FUNCTION__, '2.7', 'WP_Filesystem::abspath() or WP_Filesystem::wp_*_dir()' ); 145 159 $this->verbose = $echo; 146 160 return $this->abspath(); 147 161 } 148 162 149 163 /** 150 * Locate sa folder on the remote filesystem.164 * Locate a folder on the remote filesystem. 151 165 * 152 * Assumes that on Windows systems, Stripping off the Drive letter is OK153 * Sanitizes \\ to / in windows filepaths.166 * Assumes that on Windows systems, Stripping off the Drive 167 * letter is OK Sanitizes \\ to / in windows filepaths. 154 168 * 155 * @since 2.7156 169 * @access public 170 * @since 2.7.0 157 171 * 158 * @param string $folder the folder to locate 172 * @param string $folder the folder to locate. 159 173 * @return string The location of the remote path. 160 174 */ 161 function find_folder( $folder) {175 function find_folder( $folder ) { 162 176 163 177 if ( isset( $this->cache[ $folder ] ) ) 164 178 return $this->cache[ $folder ]; … … 215 229 } 216 230 217 231 /** 218 * Locate sa folder on the remote filesystem.232 * Locate a folder on the remote filesystem. 219 233 * 220 * Expects Windows sanitized path 234 * Expects Windows sanitized path. 221 235 * 222 * @since 2.7223 236 * @access private 237 * @since 2.7.0 224 238 * 225 * @param string $folder the folder to locate226 * @param string $base the folder to start searching from227 * @param bool $loop if the function has recursed, Internal use only239 * @param string $folder The folder to locate. 240 * @param string $base The folder to start searching from. 241 * @param bool $loop If the function has recursed, Internal use only. 228 242 * @return string The location of the remote path. 229 243 */ 230 function search_for_folder( $folder, $base = '.', $loop = false ) {244 function search_for_folder( $folder, $base = '.', $loop = false ) { 231 245 if ( empty( $base ) || '.' == $base ) 232 246 $base = trailingslashit($this->cwd()); 233 247 … … 282 296 } 283 297 284 298 /** 285 * Return s the *nix style file permissions for a file299 * Return the *nix-style file permissions for a file. 286 300 * 287 * From the PHP documentation page for fileperms() 301 * From the PHP documentation page for fileperms(). 288 302 * 289 303 * @link http://docs.php.net/fileperms 290 * @since 2.5304 * 291 305 * @access public 306 * @since 2.5.0 292 307 * 293 * @param string $file string filename294 * @return string *nix style representation of permissions308 * @param string $file String filename. 309 * @return string The *nix-style representation of permissions. 295 310 */ 296 function gethchmod( $file){311 function gethchmod( $file ){ 297 312 $perms = $this->getchmod($file); 298 313 if (($perms & 0xC000) == 0xC000) // Socket 299 314 $info = 's'; … … 336 351 } 337 352 338 353 /** 339 * Convert s *nixstyle file permissions to a octal number.354 * Convert *nix-style file permissions to a octal number. 340 355 * 341 356 * Converts '-rw-r--r--' to 0644 342 357 * From "info at rvgate dot nl"'s comment on the PHP documentation for chmod() 343 358 * 344 359 * @link http://docs.php.net/manual/en/function.chmod.php#49614 345 * @since 2.5360 * 346 361 * @access public 362 * @since 2.5.0 347 363 * 348 * @param string $mode string *nix style file permission364 * @param string $mode string The *nix-style file permission. 349 365 * @return int octal representation 350 366 */ 351 function getnumchmodfromh( $mode) {367 function getnumchmodfromh( $mode ) { 352 368 $realmode = ''; 353 369 $legal = array('', 'w', 'r', 'x', '-'); 354 370 $attarray = preg_split('//', $mode); … … 369 385 } 370 386 371 387 /** 372 * Determine sif the string provided contains binary characters.388 * Determine if the string provided contains binary characters. 373 389 * 374 * @since 2.7375 390 * @access private 391 * @since 2.7.0 376 392 * 377 * @param string $text String to test against 378 * @return bool true if string is binary, false otherwise 393 * @param string $text String to test against. 394 * @return bool true if string is binary, false otherwise. 379 395 */ 380 396 function is_binary( $text ) { 381 397 return (bool) preg_match( '|[^\x20-\x7E]|', $text ); // chr(32)..chr(127) 382 398 } 383 } 399 400 /** 401 * Change the ownership of a file / folder. 402 * 403 * Default behavior is to do nothing, override this in your subclass, if desired. 404 * 405 * @since 2.5.0 406 * 407 * @param string $file Path to the file. 408 * @param mixed $owner A user name or number. 409 * @param bool $recursive Optional. If set True changes file owner recursivly. Defaults to False. 410 * @return bool Returns true on success or false on failure. 411 */ 412 function chown( $file, $owner, $recursive = false ) { 413 return false; 414 } 415 416 /** 417 * Connect filesystem. 418 * 419 * @since 2.5.0 420 * 421 * @return bool True on success or false on failure (always true for WP_Filesystem_Direct). 422 */ 423 function connect() { 424 return true; 425 } 426 427 /** 428 * Read entire file into a string. 429 * 430 * @since 2.5.0 431 * 432 * @param string $file Name of the file to read. 433 * @return string|bool Returns the read data or false on failure. 434 */ 435 function get_contents( $file ) { 436 return false; 437 } 438 439 /** 440 * Read entire file into an array. 441 * 442 * @since 2.5.0 443 * 444 * @param string $file Path to the file. 445 * @return array|bool the file contents in an array or false on failure. 446 */ 447 function get_contents_array( $file ) { 448 return false; 449 } 450 451 /** 452 * Write a string to a file. 453 * 454 * @since 2.5.0 455 * 456 * @param string $file Remote path to the file where to write the data. 457 * @param string $contents The data to write. 458 * @param int $mode Optional. The file permissions as octal number, usually 0644. 459 * @return bool False on failure. 460 */ 461 function put_contents( $file, $contents, $mode = false ) { 462 return false; 463 } 464 465 /** 466 * Get the current working directory. 467 * 468 * @since 2.5.0 469 * 470 * @return string|bool The current working directory on success, or false on failure. 471 */ 472 function cwd() { 473 return false; 474 } 475 476 /** 477 * Change current directory. 478 * 479 * @since 2.5.0 480 * 481 * @param string $dir The new current directory. 482 * @return bool Returns true on success or false on failure. 483 */ 484 function chdir( $dir ) { 485 return false; 486 } 487 488 /** 489 * Change the file group. 490 * 491 * @since 2.5.0 492 * 493 * @param string $file Path to the file. 494 * @param mixed $group A group name or number. 495 * @param bool $recursive Optional. If set True changes file group recursively. Defaults to False. 496 * @return bool Returns true on success or false on failure. 497 */ 498 function chgrp( $file, $group, $recursive = false ) { 499 return false; 500 } 501 502 /** 503 * Change filesystem permissions. 504 * 505 * @since 2.5.0 506 * 507 * @param string $file Path to the file. 508 * @param int $mode Optional. The permissions as octal number, usually 0644 for files, 0755 for dirs. 509 * @param bool $recursive Optional. If set True changes file group recursively. Defaults to False. 510 * @return bool Returns true on success or false on failure. 511 */ 512 function chmod( $file, $mode = false, $recursive = false ) { 513 return false; 514 } 515 516 /** 517 * Get the file owner. 518 * 519 * @since 2.5.0 520 * 521 * @param string $file Path to the file. 522 * @return string|bool Username of the user or false on error. 523 */ 524 function owner( $file ) { 525 return false; 526 } 527 528 /** 529 * Get the file's group. 530 * 531 * @since 2.5.0 532 * 533 * @param string $file Path to the file. 534 * @return string|bool The group or false on error. 535 */ 536 function group( $file ) { 537 return false; 538 } 539 540 /** 541 * Copy a file. 542 * 543 * @since 2.5.0 544 * 545 * @param string $source Path to the source file. 546 * @param string $destination Path to the destination file. 547 * @param bool $overwrite Optional. Whether to overwrite the destination file if it exists. 548 * Default false. 549 * @param int $mode Optional. The permissions as octal number, usually 0644 for files, 0755 for dirs. 550 * Default false. 551 * @return bool True if file copied successfully, False otherwise. 552 */ 553 function copy( $source, $destination, $overwrite = false, $mode = false ) { 554 return false; 555 } 556 557 /** 558 * Move a file. 559 * 560 * @since 2.5.0 561 * 562 * @param string $source Path to the source file. 563 * @param string $destination Path to the destination file. 564 * @param bool $overwrite Optional. Whether to overwrite the destination file if it exists. 565 * Default false. 566 * @return bool True if file copied successfully, False otherwise. 567 */ 568 function move( $source, $destination, $overwrite = false ) { 569 return false; 570 } 571 572 /** 573 * Delete a file or directory. 574 * 575 * @since 2.5.0 576 * 577 * @param string $file Path to the file. 578 * @param bool $recursive Optional. If set True changes file group recursively. Defaults to False. 579 * Default false. 580 * @param bool $type Type of resource. 'f' for file, 'd' for directory. 581 * Default false. 582 * @return bool True if the file or directory was deleted, false on failure. 583 */ 584 function delete( $file, $recursive = false, $type = false ) { 585 return false; 586 } 587 588 /** 589 * Check if a file or directory exists. 590 * 591 * @since 2.5.0 592 * 593 * @param string $file Path to file/directory. 594 * @return bool Whether $file exists or not. 595 */ 596 function exists( $file ) { 597 return false; 598 } 599 600 /** 601 * Check if resource is a file. 602 * 603 * @since 2.5.0 604 * 605 * @param string $file File path. 606 * @return bool Whether $file is a file. 607 */ 608 function is_file( $file ) { 609 return false; 610 } 611 612 /** 613 * Check if resource is a directory. 614 * 615 * @since 2.5.0 616 * 617 * @param string $path Directory path. 618 * @return bool Whether $path is a directory. 619 */ 620 function is_dir( $path ) { 621 return false; 622 } 623 624 /** 625 * Check if a file is readable. 626 * 627 * @since 2.5.0 628 * 629 * @param string $file Path to file. 630 * @return bool Whether $file is readable. 631 */ 632 function is_readable( $file ) { 633 return false; 634 } 635 636 /** 637 * Check if a file or directory is writable. 638 * 639 * @since 2.5.0 640 * 641 * @param string $path Path to file/directory. 642 * @return bool Whether $file is writable. 643 */ 644 function is_writable( $file ) { 645 return false; 646 } 647 648 /** 649 * Gets the file's last access time. 650 * 651 * @since 2.5.0 652 * 653 * @param string $file Path to file. 654 * @return int Unix timestamp representing last access time. 655 */ 656 function atime( $file ) { 657 return false; 658 } 659 660 /** 661 * Gets the file modification time. 662 * 663 * @since 2.5.0 664 * 665 * @param string $file Path to file. 666 * @return int Unix timestamp representing modification time. 667 */ 668 function mtime( $file ) { 669 return false; 670 } 671 672 /** 673 * Gets the file size (in bytes). 674 * 675 * @since 2.5.0 676 * 677 * @param string $file Path to file. 678 * @return int Size of the file in bytes. 679 */ 680 function size( $file ) { 681 return false; 682 } 683 684 /** 685 * Set the access and modification times of a file. 686 * 687 * Note: If $file doesn't exist, it will be created. 688 * 689 * @since 2.5.0 690 * 691 * @param string $file Path to file. 692 * @param int $time Optional. Modified time to set for file. 693 * Default 0. 694 * @param int $atime Optional. Access time to set for file. 695 * Default 0. 696 * @return bool Whether operation was successful or not. 697 */ 698 function touch( $file, $time = 0, $atime = 0 ) { 699 return false; 700 } 701 702 /** 703 * Create a directory. 704 * 705 * @since 2.5.0 706 * 707 * @param string $path Path for new directory. 708 * @param mixed $chmod Optional. The permissions as octal number, (or False to skip chmod) 709 * Default false. 710 * @param mixed $chown Optional. A user name or number (or False to skip chown) 711 * Default false. 712 * @param mixed $chgrp Optional. A group name or number (or False to skip chgrp). 713 * Default false. 714 * @return bool False if directory cannot be created, true otherwise. 715 */ 716 function mkdir( $path, $chmod = false, $chown = false, $chgrp = false ) { 717 return false; 718 } 719 720 /** 721 * Delete a directory. 722 * 723 * @since 2.5.0 724 * 725 * @param string $path Path to directory. 726 * @param bool $recursive Optional. Whether to recursively remove files/directories. 727 * Default false. 728 * @return bool Whether directory is deleted successfully or not. 729 */ 730 function rmdir( $path, $recursive = false ) { 731 return false; 732 } 733 734 /** 735 * Get details for files in a directory or a specific file. 736 * 737 * @since 2.5.0 738 * 739 * @param string $path Path to directory or file. 740 * @param bool $include_hidden Optional. Whether to include details of hidden ("." prefixed) files. 741 * Default true. 742 * @param bool $recursive Optional. Whether to recursively include file details in nested directories. 743 * Default false. 744 * @return array|bool { 745 * Array of files. False if unable to list directory contents. 746 * 747 * @type string 'name' Name of the file/directory. 748 * @type string 'perms' *nix representation of permissions. 749 * @type int 'permsn' Octal representation of permissions. 750 * @type string 'owner' Owner name or ID. 751 * @type int 'size' Size of file in bytes. 752 * @type int 'lastmodunix' Last modified unix timestamp. 753 * @type mixed 'lastmod' Last modified month (3 letter) and day (without leading 0). 754 * @type int 'time' Last modified time. 755 * @type string 'type' Type of resource. 'f' for file, 'd' for directory. 756 * @type mixed 'files' If a directory and $recursive is true, contains another array of files. 757 * } 758 */ 759 function dirlist( $path, $include_hidden = true, $recursive = false ) { 760 return false; 761 } 762 763 } // WP_Filesystem_Base -
src/wp-admin/includes/class-wp-filesystem-direct.php
15 15 * @uses WP_Filesystem_Base Extends class 16 16 */ 17 17 class WP_Filesystem_Direct extends WP_Filesystem_Base { 18 var $errors = null; 18 19 19 /** 20 20 * constructor 21 21 * … … 27 27 } 28 28 29 29 /** 30 * connect filesystem.31 *32 * @return bool Returns true on success or false on failure (always true for WP_Filesystem_Direct).33 */34 function connect() {35 return true;36 }37 38 /**39 30 * Reads entire file into a string 40 31 * 41 32 * @param string $file Name of the file to read. … … 185 176 * Gets file owner 186 177 * 187 178 * @param string $file Path to the file. 188 * @return string Username of the user.179 * @return string|bool Username of the user or false on error. 189 180 */ 190 181 function owner($file) { 191 182 $owneruid = @fileowner($file); -
src/wp-admin/includes/class-wp-filesystem-ftpext.php
181 181 return (bool)@ftp_chmod($this->link, $mode, $file); 182 182 } 183 183 184 function chown($file, $owner, $recursive = false ) {185 return false;186 }187 188 184 function owner($file) { 189 185 $dir = $this->dirlist($file); 190 186 return $dir[$file]['owner']; -
src/wp-admin/includes/class-wp-filesystem-ftpsockets.php
187 187 return $this->ftp->chmod($file, $mode); 188 188 } 189 189 190 function chown($file, $owner, $recursive = false ) {191 return false;192 }193 194 190 function owner($file) { 195 191 $dir = $this->dirlist($file); 196 192 return $dir[$file]['owner']; -
src/wp-admin/includes/class-wp-filesystem-ssh2.php
1 1 <?php 2 2 /** 3 * WordPress SSH2 Filesystem.3 * WordPress Filesystem Class for implementing SSH2 4 4 * 5 * @package WordPress6 * @subpackage Filesystem7 */8 9 /**10 * WordPress Filesystem Class for implementing SSH2.11 *12 5 * To use this class you must follow these steps for PHP 5.2.6+ 13 6 * 14 7 * @contrib http://kevin.vanzonneveld.net/techblog/article/make_ssh_connections_with_php/ - Installation Notes … … 35 28 * 36 29 * Note: as of WordPress 2.8, This utilises the PHP5+ function 'stream_get_contents' 37 30 * 38 * @since 2.7 31 * @since 2.7.0 32 * 39 33 * @package WordPress 40 34 * @subpackage Filesystem 41 * @uses WP_Filesystem_Base Extends class42 35 */ 43 36 class WP_Filesystem_SSH2 extends WP_Filesystem_Base { 44 37 … … 208 201 return $this->run_command(sprintf('chmod -R %o %s', $mode, escapeshellarg($file)), true); 209 202 } 210 203 211 function chown($file, $owner, $recursive = false ) { 204 /** 205 * Change the ownership of a file / folder. 206 * 207 * @since Unknown 208 * 209 * @param string $file Path to the file. 210 * @param mixed $owner A user name or number. 211 * @param bool $recursive Optional. If set True changes file owner recursivly. Defaults to False. 212 * @return bool Returns true on success or false on failure. 213 */ 214 function chown( $file, $owner, $recursive = false ) { 212 215 if ( ! $this->exists($file) ) 213 216 return false; 214 217 if ( ! $recursive || ! $this->is_dir($file) )