stackforge/openstack-sdk-php
Code Issues Proposed changes

Merge branch 'develop' of git.hpcloud.net:butchema/HPCloud-PHP into develop

Browse Source
This commit is contained in:
Matt Farina
2012-08-08 15:05:00 -04:00
parent d64ec2d3d4 9b93527b13
commit 83ad854360
2 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/HPCloud/Services/IdentityServices.php
View File

@@ -323,7 +323,7 @@ class IdentityServices /*implements Serializable*/ {
* HPCloud console.
* @param string $tenantName
* The tenant Name for this account. This can be obtained through the
* HPCloud console. NOTE: This is currently unused.
* HPCloud console.
* @throws HPCloud::Transport::AuthorizationException
* If authentication failed.
* @throws HPCloud::Exception
@@ -342,12 +342,9 @@ class IdentityServices /*implements Serializable*/ {
if (!empty($tenantId)) {
$ops['tenantId'] = $tenantId;
}
// Not currently working.
// If a tenant name is provided, add it to the auth array.
//if (!empty($tenantName)) {
// $ops['tenantName'] = $tenantName;
//}
elseif (!empty($tenantName)) {
$ops['tenantName'] = $tenantName;
}
return $this->authenticate($ops);
@@ -404,9 +401,9 @@ class IdentityServices /*implements Serializable*/ {
if (!empty($tenantId)) {
$ops['tenantId'] = $tenantId;
}
//if (!empty($tenantName)) {
// $ops['tenantName'] = $tenantName;
//}
elseif (!empty($tenantName)) {
$ops['tenantName'] = $tenantName;
}
return $this->authenticate($ops);
}

4
src/HPCloud/Transport/PHPStreamTransport.php
View File

@@ -293,8 +293,8 @@ class PHPStreamTransport implements Transporter {
$out = sprintf("Content-Type: %s\n", $msg);
break;
case STREAM_NOTIFY_PROGRESS:
fwrite($msg . PHP_EOL);
$out = sprintf("%d bytes of %s\n", $bytes, $filesize);
$out = sprintf($msg . PHP_EOL);
$out .= sprintf("%d bytes of %s\n", $bytes, $filesize);
break;
default:
$out = sprintf("Code: %d, Message: %s\n", $code, $msg);