diff -r 5e7a0fedabdf -r 877f952ae2bd web/lib/Zend/Service/WindowsAzure/Diagnostics/ConfigurationInstance.php --- a/web/lib/Zend/Service/WindowsAzure/Diagnostics/ConfigurationInstance.php Thu Mar 21 17:31:31 2013 +0100 +++ b/web/lib/Zend/Service/WindowsAzure/Diagnostics/ConfigurationInstance.php Thu Mar 21 19:50:53 2013 +0100 @@ -15,17 +15,12 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Diagnostics - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ /** - * @see Zend_Service_WindowsAzure_Diagnostics_Exception - */ -require_once 'Zend/Service/WindowsAzure/Diagnostics/Exception.php'; - -/** * @see Zend_Service_WindowsAzure_Diagnostics_ConfigurationObjectBaseAbstract */ require_once 'Zend/Service/WindowsAzure/Diagnostics/ConfigurationObjectBaseAbstract.php'; @@ -39,7 +34,7 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Diagnostics - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * * @property Zend_Service_WindowsAzure_Diagnostics_ConfigurationDataSources DataSources Data sources @@ -116,9 +111,10 @@ // Assign Directories settings $this->DataSources->Directories->BufferQuotaInMB = (int)$configurationXml->DataSources->Directories->BufferQuotaInMB; $this->DataSources->Directories->ScheduledTransferPeriodInMinutes = (int)$configurationXml->DataSources->Directories->ScheduledTransferPeriodInMinutes; + if ($configurationXml->DataSources->Directories->Subscriptions && $configurationXml->DataSources->Directories->Subscriptions->DirectoryConfiguration) { - $subscriptions = $configurationXml->DataSources->WindowsEventLog->Subscriptions; + $subscriptions = $configurationXml->DataSources->Directories->Subscriptions; if (count($subscriptions->DirectoryConfiguration) > 1) { $subscriptions = $subscriptions->DirectoryConfiguration; } else { @@ -212,6 +208,7 @@ $returnValue[] = ' '; $returnValue[] = ' '; + $returnValue[] = ' false'; $returnValue[] = ''; // Return