diff options
| author | Simon Rettberg | 2017-12-01 18:58:16 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2017-12-01 18:58:16 +0100 |
| commit | 4e39862628cf5b59f5c8d91f11070edd90b4a818 (patch) | |
| tree | 3950c3900f3b48660c806977631c81f07d793101 /modules-available | |
| parent | [roomplanner] Sort already placed machines to the bottom (diff) | |
| download | slx-admin-4e39862628cf5b59f5c8d91f11070edd90b4a818.tar.gz slx-admin-4e39862628cf5b59f5c8d91f11070edd90b4a818.tar.xz slx-admin-4e39862628cf5b59f5c8d91f11070edd90b4a818.zip | |
Fix several PHP notices about undefined indexes, variables, not-arrays
Diffstat (limited to 'modules-available')
5 files changed, 14 insertions, 9 deletions
diff --git a/modules-available/locationinfo/page.inc.php b/modules-available/locationinfo/page.inc.php index 311b269d..d6035869 100644 --- a/modules-available/locationinfo/page.inc.php +++ b/modules-available/locationinfo/page.inc.php @@ -808,9 +808,11 @@ class Page_LocationInfo extends Page } $langs = Dictionary::getLanguages(true); - foreach ($langs as &$lang) { - if ($lang['cc'] === $config['language']) { - $lang['selected'] = 'selected'; + if (isset($config['language'])) { + foreach ($langs as &$lang) { + if ($lang['cc'] === $config['language']) { + $lang['selected'] = 'selected'; + } } } diff --git a/modules-available/roomplanner/baseconfig/getconfig.inc.php b/modules-available/roomplanner/baseconfig/getconfig.inc.php new file mode 100644 index 00000000..f4708547 --- /dev/null +++ b/modules-available/roomplanner/baseconfig/getconfig.inc.php @@ -0,0 +1,3 @@ +<?php + +ConfigHolder::add("SLX_PVS_CONFIG_URL", 'http://' . $_SERVER['SERVER_ADDR'] . $_SERVER['SCRIPT_NAME'] . '?do=roomplanner'); diff --git a/modules-available/roomplanner/inc/pvsgenerator.inc.php b/modules-available/roomplanner/inc/pvsgenerator.inc.php index 6df7c10e..292441d4 100644 --- a/modules-available/roomplanner/inc/pvsgenerator.inc.php +++ b/modules-available/roomplanner/inc/pvsgenerator.inc.php @@ -59,7 +59,7 @@ class PvsGenerator if (is_null($room['notnull']) || isset($room['skip'])) // Not leaf continue; if (Module::isAvailable('runmode')) { - $pc = RunMode::getForMode('roomplanner', $room['locationid']); + $pc = RunMode::getForMode('roomplanner', $room['locationid'], true); if (!empty($pc)) { $pc = array_pop($pc); $room['managerip'] = $pc['clientip']; @@ -219,7 +219,6 @@ class PvsGenerator if (!is_array($data)) { $data = array(); } - ConfigHolder::add("SLX_PVS_CONFIG_URL", 'http://' . $_SERVER['SERVER_ADDR'] . $_SERVER['SCRIPT_NAME'] . '?do=roomplanner'); if (isset($data['dedicatedmgr']) && $data['dedicatedmgr']) { ConfigHolder::add("SLX_ADDONS", false, 100000); diff --git a/modules-available/roomplanner/page.inc.php b/modules-available/roomplanner/page.inc.php index bae9db7b..764d5cdb 100644 --- a/modules-available/roomplanner/page.inc.php +++ b/modules-available/roomplanner/page.inc.php @@ -248,10 +248,11 @@ class Page_Roomplanner extends Page protected function getFurniture($config) { - if ($config === false) { + if ($config === false) return array(); - } $config = json_decode($config['roomplan'], true); + if (!is_array($config)) + return array(); return $config; } diff --git a/modules-available/sysconfig/addmodule_ldapauth.inc.php b/modules-available/sysconfig/addmodule_ldapauth.inc.php index 07c494cc..62120b48 100644 --- a/modules-available/sysconfig/addmodule_ldapauth.inc.php +++ b/modules-available/sysconfig/addmodule_ldapauth.inc.php @@ -16,11 +16,11 @@ class LdapAuth_Start extends AddModule_Base $data['title'] = $this->edit->title(); $data['edit'] = $this->edit->id(); } - if ($data['fixnumeric'] === false) { + if (!isset($data['fixnumeric']) || $data['fixnumeric'] === false) { $data['fixnumeric'] = 's'; } postToArray($data, $LDAPAUTH_COMMON_FIELDS, true); - if (preg_match('/^(.*)\:(636|389)$/', $data['server'], $out)) { + if (isset($data['server']) && preg_match('/^(.*)\:(636|389)$/', $data['server'], $out)) { $data['server'] = $out[1]; } $data['step'] = 'LdapAuth_CheckConnection'; |