<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[12999] trunk/wp-admin/includes: Standardise return values in WP_Filesystem
::dirlist(), ::chmod() and ::exists()</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12999">12999</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2010-02-07 01:59:30 +0000 (Sun, 07 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Standardise return values in WP_Filesystem::dirlist(), ::chmod() and ::exists()</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesclasswpfilesystemftpextphp">trunk/wp-admin/includes/class-wp-filesystem-ftpext.php</a></li>
<li><a href="#trunkwpadminincludesclasswpfilesystemftpsocketsphp">trunk/wp-admin/includes/class-wp-filesystem-ftpsockets.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesclasswpfilesystemftpextphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-filesystem-ftpext.php (12998 => 12999)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-filesystem-ftpext.php 2010-02-07 01:31:40 UTC (rev 12998)
+++ trunk/wp-admin/includes/class-wp-filesystem-ftpext.php 2010-02-07 01:59:30 UTC (rev 12999)
</span><span class="lines">@@ -160,8 +160,8 @@
</span><span class="cx">
</span><span class="cx"> // chmod the file or directory
</span><span class="cx"> if ( ! function_exists('ftp_chmod') )
</span><del>- return @ftp_site($this->link, sprintf('CHMOD %o %s', $mode, $file));
- return @ftp_chmod($this->link, $mode, $file);
</del><ins>+ return (bool)@ftp_site($this->link, sprintf('CHMOD %o %s', $mode, $file));
+ return (bool)@ftp_chmod($this->link, $mode, $file);
</ins><span class="cx"> }
</span><span class="cx"> function chown($file, $owner, $recursive = false ) {
</span><span class="cx"> return false;
</span><span class="lines">@@ -242,7 +242,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx"> function mkdir($path, $chmod = false, $chown = false, $chgrp = false) {
</span><del>- if ( !ftp_mkdir($this->link, $path) )
</del><ins>+ if ( !@ftp_mkdir($this->link, $path) )
</ins><span class="cx"> return false;
</span><span class="cx"> $this->chmod($path);
</span><span class="cx"> if ( $chown )
</span><span class="lines">@@ -286,8 +286,8 @@
</span><span class="cx"> if ( $lcount < 8 )
</span><span class="cx"> return '';
</span><span class="cx"> $b = array();
</span><del>- $b['isdir'] = $lucifer[0]{0} === "d";
- $b['islink'] = $lucifer[0]{0} === "l";
</del><ins>+ $b['isdir'] = $lucifer[0]{0} === 'd';
+ $b['islink'] = $lucifer[0]{0} === 'l';
</ins><span class="cx"> if ( $b['isdir'] )
</span><span class="cx"> $b['type'] = 'd';
</span><span class="cx"> elseif ( $b['islink'] )
</span><span class="lines">@@ -334,7 +334,7 @@
</span><span class="cx">
</span><span class="cx"> $list = @ftp_rawlist($this->link, '-a ' . $path, false);
</span><span class="cx">
</span><del>- if ( $list === false )
</del><ins>+ if ( empty($list) ) // Empty array = non-existant folder(real folder will show . at least
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> $dirlist = array();
</span><span class="lines">@@ -355,9 +355,6 @@
</span><span class="cx"> $dirlist[ $entry['name'] ] = $entry;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( ! $dirlist )
- return false;
-
</del><span class="cx"> $ret = array();
</span><span class="cx"> foreach ( (array)$dirlist as $struc ) {
</span><span class="cx"> if ( 'd' == $struc['type'] ) {
</span></span></pre></div>
<a id="trunkwpadminincludesclasswpfilesystemftpsocketsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-filesystem-ftpsockets.php (12998 => 12999)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-filesystem-ftpsockets.php 2010-02-07 01:31:40 UTC (rev 12998)
+++ trunk/wp-admin/includes/class-wp-filesystem-ftpsockets.php 2010-02-07 01:59:30 UTC (rev 12999)
</span><span class="lines">@@ -224,7 +224,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function is_file($file) {
</span><del>- return $this->is_dir($file) ? false : true;
</del><ins>+ if ( $this->is_dir($file) )
+ return false;
+ if ( $this->exists($file) )
+ return true;
+ return false;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function is_dir($path) {
</span><span class="lines">@@ -288,7 +292,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $list = $this->ftp->dirlist($path);
</span><del>- if ( ! $list )
</del><ins>+ if ( empty($list) && !$this->exists($path) )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> $ret = array();
</span></span></pre>
</div>
</div>
</body>
</html>