- fixed undefined index warnings

Author: Marius Burkard

server/plugins-available/z_php_fpm_incron_reload_plugin.inc.php

@@ -106,7 +106,7 @@ private function isPluginEnabled() {
 		$app->uses('getconf');
 		$serverConfig = $app->getconf->get_server_config($conf['server_id'], 'web');
 
-		return $serverConfig['php_fpm_incron_reload'] === 'y';
+		return (isset($serverConfig['php_fpm_incron_reload']) && $serverConfig['php_fpm_incron_reload'] === 'y');
 	}
 
 	private function createIncronConfiguration($triggerFile, $systemUser, $fastcgiPhpVersion) {

server/server.php

@@ -94,7 +94,7 @@
 	// retrieve admin email address for notifications
 	$sys_ini = $app->db->queryOneRecord("SELECT * FROM sys_ini WHERE sysini_id = 1");
 	$conf['sys_ini'] = $app->ini_parser->parse_ini_string(stripslashes($sys_ini['config']));
-	$conf['admin_mail'] = $conf['sys_ini']['mail']['admin_mail'];
+	$conf['admin_mail'] = (isset($conf['sys_ini']['mail']['admin_mail']) ? $conf['sys_ini']['mail']['admin_mail'] : '');
 	unset($sys_ini);
 
 	/*
@@ -170,9 +170,9 @@
 	$app->modules->loadModules('all');
 	//** Load the plugins that are in the plugins-enabled folder
 	$app->plugins->loadPlugins('all');
-	
+
 	$app->plugins->raiseAction('server_plugins_loaded', '');
-	
+
 	if ($tmp_num_records > 0) {
 		$app->log("Found $tmp_num_records changes, starting update process.", LOGLEVEL_DEBUG);
 		//** Go through the sys_datalog table and call the processing functions