[icinga-checkins] icinga.org: icinga-web/r1.2: * Fixed PHP error

git at icinga.org git at icinga.org
Mon Nov 8 14:53:13 CET 2010


Module: icinga-web
Branch: r1.2
Commit: 313e712cc7fdf9224bbe151082e4237b2153c6fd
URL:    https://git.icinga.org/?p=icinga-web.git;a=commit;h=313e712cc7fdf9224bbe151082e4237b2153c6fd

Author: Marius Hein <marius.hein at netways.de>
Date:   Wed Nov  3 14:32:14 2010 +0100

* Fixed PHP error

---

 app/modules/AppKit/config/auth.xml                 |    2 +-
 .../xml/to/icinga-tactical-overview-presets.xml    |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/modules/AppKit/config/auth.xml b/app/modules/AppKit/config/auth.xml
index 879cb6b..8b8dbd5 100755
--- a/app/modules/AppKit/config/auth.xml
+++ b/app/modules/AppKit/config/auth.xml
@@ -108,7 +108,7 @@
 		<ae:parameter name="auth_key">
 			<ae:parameter name="auth_module">AppKit</ae:parameter>
 			<ae:parameter name="auth_provider">Auth.Provider.AuthKey</ae:parameter>
-			<ae:parameter name="auth_enable">false</ae:parameter>
+			<ae:parameter name="auth_enable">true</ae:parameter>
 			<ae:parameter name="auth_authoritative">true</ae:parameter>
 		</ae:parameter>
 		
diff --git a/app/modules/Cronks/data/xml/to/icinga-tactical-overview-presets.xml b/app/modules/Cronks/data/xml/to/icinga-tactical-overview-presets.xml
index 478e9df..4b213c9 100644
--- a/app/modules/Cronks/data/xml/to/icinga-tactical-overview-presets.xml
+++ b/app/modules/Cronks/data/xml/to/icinga-tactical-overview-presets.xml
@@ -118,7 +118,7 @@
 			<![CDATA[
 				Ext.onReady(function() {
 					var store = new Ext.data.JsonStore({
-						fields: <?php echo json_encode(array_keys($data[0])); ?>,
+						fields: <?php echo isset($data[0]) ? json_encode(array_keys($data[0])) : '[]'; ?>,
 						data: <?php echo json_encode($data); ?>
 
 					});
@@ -243,4 +243,4 @@
 			]]>
 		</MAIN>
     </template_code>
-</template>
\ No newline at end of file
+</template>





More information about the icinga-checkins mailing list