import v2.0.0.0_RC3 | 2012-07-01
https://github.com/lucanos/CommunityID -> http://www.itadmins.net/archives/357
This commit is contained in:
@ -17,7 +17,7 @@
|
||||
* @subpackage Amazon
|
||||
* @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
|
||||
* @license http://framework.zend.com/license/new-bsd New BSD License
|
||||
* @version $Id: Abstract.php 16971 2009-07-22 18:05:45Z mikaelkael $
|
||||
* @version $Id: Abstract.php 18926 2009-11-10 19:16:03Z sidhighwind $
|
||||
*/
|
||||
|
||||
require_once 'Zend/Service/Abstract.php';
|
||||
|
@ -17,7 +17,7 @@
|
||||
* @subpackage Ec2
|
||||
* @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
|
||||
* @license http://framework.zend.com/license/new-bsd New BSD License
|
||||
* @version $Id: Abstract.php 16971 2009-07-22 18:05:45Z mikaelkael $
|
||||
* @version $Id: Abstract.php 18926 2009-11-10 19:16:03Z sidhighwind $
|
||||
*/
|
||||
|
||||
require_once 'Zend/Service/Amazon/Abstract.php';
|
||||
|
@ -17,7 +17,7 @@
|
||||
* @subpackage Ec2
|
||||
* @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
|
||||
* @license http://framework.zend.com/license/new-bsd New BSD License
|
||||
* @version $Id: CloudWatch.php 16971 2009-07-22 18:05:45Z mikaelkael $
|
||||
* @version $Id: CloudWatch.php 19067 2009-11-19 22:13:54Z sidhighwind $
|
||||
*/
|
||||
|
||||
require_once 'Zend/Service/Amazon/Ec2/Abstract.php';
|
||||
@ -274,8 +274,12 @@ class Zend_Service_Amazon_Ec2_CloudWatch extends Zend_Service_Amazon_Ec2_Abstrac
|
||||
$x = 1;
|
||||
foreach($options['Dimensions'] as $dimKey=>$dimVal) {
|
||||
if(!in_array($dimKey, $this->_validDimensionsKeys, true)) continue;
|
||||
$options[$dimKey . '.member.' . $x++] = $dimVal;
|
||||
$options['Dimensions.member.' . $x . '.Name'] = $dimKey;
|
||||
$options['Dimensions.member.' . $x . '.Value'] = $dimVal;
|
||||
$x++;
|
||||
}
|
||||
|
||||
unset($options['Dimensions']);
|
||||
}
|
||||
|
||||
$params = array_merge($params, $options);
|
||||
@ -310,8 +314,8 @@ class Zend_Service_Amazon_Ec2_CloudWatch extends Zend_Service_Amazon_Ec2_Abstrac
|
||||
* Return the Metrics that are aviable for your current monitored instances
|
||||
*
|
||||
* @param string $nextToken The NextToken parameter is an optional parameter
|
||||
* that allows you to retrieve the next set of results
|
||||
* for your ListMetrics query.
|
||||
* that allows you to retrieve the next set of results
|
||||
* for your ListMetrics query.
|
||||
* @return array
|
||||
*/
|
||||
public function listMetrics($nextToken = null)
|
||||
|
@ -17,7 +17,7 @@
|
||||
* @subpackage Ec2
|
||||
* @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
|
||||
* @license http://framework.zend.com/license/new-bsd New BSD License
|
||||
* @version $Id: Securitygroups.php 16971 2009-07-22 18:05:45Z mikaelkael $
|
||||
* @version $Id: Securitygroups.php 18096 2009-09-13 17:39:19Z sidhighwind $
|
||||
*/
|
||||
|
||||
require_once 'Zend/Service/Amazon/Ec2/Abstract.php';
|
||||
@ -106,7 +106,17 @@ class Zend_Service_Amazon_Ec2_Securitygroups extends Zend_Service_Amazon_Ec2_Abs
|
||||
$sItem['ipProtocol'] = $xpath->evaluate('string(ec2:ipProtocol/text())', $ip_node);
|
||||
$sItem['fromPort'] = $xpath->evaluate('string(ec2:fromPort/text())', $ip_node);
|
||||
$sItem['toPort'] = $xpath->evaluate('string(ec2:toPort/text())', $ip_node);
|
||||
$sItem['ipRanges'] = $xpath->evaluate('string(ec2:ipRanges/ec2:item/ec2:cidrIp/text())', $ip_node);
|
||||
|
||||
$ips = $xpath->query('ec2:ipRanges/ec2:item', $ip_node);
|
||||
|
||||
$sItem['ipRanges'] = array();
|
||||
foreach($ips as $ip) {
|
||||
$sItem['ipRanges'][] = $xpath->evaluate('string(ec2:cidrIp/text())', $ip);
|
||||
}
|
||||
|
||||
if(count($sItem['ipRanges']) == 1) {
|
||||
$sItem['ipRanges'] = $sItem['ipRanges'][0];
|
||||
}
|
||||
|
||||
$item['ipPermissions'][] = $sItem;
|
||||
unset($ip_node, $sItem);
|
||||
|
0
libs/Zend/Service/Amazon/Exception.php
Executable file → Normal file
0
libs/Zend/Service/Amazon/Exception.php
Executable file → Normal file
0
libs/Zend/Service/Amazon/S3.php
Executable file → Normal file
0
libs/Zend/Service/Amazon/S3.php
Executable file → Normal file
0
libs/Zend/Service/Amazon/S3/Exception.php
Executable file → Normal file
0
libs/Zend/Service/Amazon/S3/Exception.php
Executable file → Normal file
32
libs/Zend/Service/Amazon/S3/Stream.php
Executable file → Normal file
32
libs/Zend/Service/Amazon/S3/Stream.php
Executable file → Normal file
@ -17,7 +17,7 @@
|
||||
* @subpackage Amazon_S3
|
||||
* @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
|
||||
* @license http://framework.zend.com/license/new-bsd New BSD License
|
||||
* @version $Id: Stream.php 16971 2009-07-22 18:05:45Z mikaelkael $
|
||||
* @version $Id: Stream.php 18951 2009-11-12 16:26:19Z alexander $
|
||||
*/
|
||||
|
||||
/**
|
||||
@ -331,13 +331,13 @@ class Zend_Service_Amazon_S3_Stream
|
||||
$stat['blksize'] = 0;
|
||||
$stat['blocks'] = 0;
|
||||
|
||||
if(($slash = strchr($this->_objectName, '/')) === false || $slash == strlen($this->_objectName)-1) {
|
||||
/* bucket */
|
||||
$stat['mode'] |= 040000;
|
||||
} else {
|
||||
$stat['mode'] |= 0100000;
|
||||
}
|
||||
$info = $this->_s3->getInfo($this->_objectName);
|
||||
if(($slash = strchr($this->_objectName, '/')) === false || $slash == strlen($this->_objectName)-1) {
|
||||
/* bucket */
|
||||
$stat['mode'] |= 040000;
|
||||
} else {
|
||||
$stat['mode'] |= 0100000;
|
||||
}
|
||||
$info = $this->_s3->getInfo($this->_objectName);
|
||||
if (!empty($info)) {
|
||||
$stat['size'] = $info['size'];
|
||||
$stat['atime'] = time();
|
||||
@ -441,14 +441,14 @@ class Zend_Service_Amazon_S3_Stream
|
||||
$stat['blksize'] = 0;
|
||||
$stat['blocks'] = 0;
|
||||
|
||||
$name = $this->_getNamePart($path);
|
||||
if(($slash = strchr($name, '/')) === false || $slash == strlen($name)-1) {
|
||||
/* bucket */
|
||||
$stat['mode'] |= 040000;
|
||||
} else {
|
||||
$stat['mode'] |= 0100000;
|
||||
}
|
||||
$info = $this->_getS3Client($path)->getInfo($name);
|
||||
$name = $this->_getNamePart($path);
|
||||
if(($slash = strchr($name, '/')) === false || $slash == strlen($name)-1) {
|
||||
/* bucket */
|
||||
$stat['mode'] |= 040000;
|
||||
} else {
|
||||
$stat['mode'] |= 0100000;
|
||||
}
|
||||
$info = $this->_getS3Client($path)->getInfo($name);
|
||||
|
||||
if (!empty($info)) {
|
||||
$stat['size'] = $info['size'];
|
||||
|
Reference in New Issue
Block a user