fix undefined index (fix jsxc/jsxc#726)

nextcloud · Nov 2, 2018 · d2825e2 · d2825e2
1 parent d2bb0d3
commit d2825e2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/lib/Settings/Personal.php b/lib/Settings/Personal.php
@@ -35,7 +35,7 @@ public function getForm()
 
 			if (is_array($options)) {
 				$loginFormEnable = null;
-				if (is_array($options['loginForm']) && isset($options['loginForm']['enable'])) {
+				if (isset($options['loginForm']) && is_array($options['loginForm']) && isset($options['loginForm']['enable'])) {
 					$loginFormEnable = $options['loginForm']['enable'];
 				}
 
@@ -47,7 +47,7 @@ public function getForm()
 					$parameters['loginForm'] = 'default';
 				}
 
-				if (is_array($options['xmpp'])) {
+				if (isset($options['xmpp']) && is_array($options['xmpp'])) {
 					if (!empty($options['xmpp']['username'])) {
 						$node = $options['xmpp']['username'];
 						$parameters['xmppUsername'] = $options['xmpp']['username'];
@@ -68,7 +68,7 @@ public function getForm()
 		$xmppOverwrite = $this->config->getAppValue('ojsxc', 'xmppOverwrite');
 
 		$parameters['xmppUrl'] = $this->config->getAppValue('ojsxc', 'boshUrl');
-		$parameters['externalConnectable'] = Application::getServerType() !== Application.INTERNAL;
+		$parameters['externalConnectable'] = Application::getServerType() !== Application::INTERNAL;
 		$parameters['allowToOverwriteXMPPConfig'] = $xmppOverwrite === 'true';
 		$parameters['jid'] = $node . '@' . $domain;
 

diff --git a/templates/settings/personal.php b/templates/settings/personal.php
@@ -33,7 +33,7 @@
 		</p>
 	</div>
 
-	<?php if($_['externalConnectable']): ?>
+	<?php if(isset($_['externalConnectable']) && $_['externalConnectable']): ?>
 	<h3>Connection parameters</h3>
 
 	<div>
-Original file line number
+Diff line change
@@ Expand Up / @@ -33,7 +33,7 @@ @@
     		</p>
     	</div>
-    	<?php if($_['externalConnectable']): ?>
+    	<?php if(isset($_['externalConnectable']) && $_['externalConnectable']): ?>
     	<h3>Connection parameters</h3>
     	<div>
@@ Expand Down @@