diff --git a/lib/NWNDriver.php b/lib/NWNDriver.php index 8fd7c00..017e5c3 100644 --- a/lib/NWNDriver.php +++ b/lib/NWNDriver.php @@ -169,6 +169,7 @@ class NWNDriver global $conf; chdir(NWNAdmin::getServerRoot()); $settings = &$this->_settingsbackend->getSettings(); + unset($settings['module']); $settingString = ''; foreach ($settings as $key => $val) { if (!empty($val)) { @@ -180,11 +181,9 @@ class NWNDriver } } } - //echo '
' . NWNAdmin::getServerExecutable() .$settingString . ' > ' . - // $this->_getLog() . ' 2>&1 < ' . $this->_checkFifo() . ' &'; shell_exec(NWNAdmin::getServerExecutable() .$settingString . ' > ' . $this->_getLog() . ' 2>&1 < ' . $this->_checkFifo() . ' &'); - + $this->_settingsbackend->setData($settings); return true; } diff --git a/lib/ServerForms.php b/lib/ServerForms.php index 1fcdcb2..e4b39e7 100644 --- a/lib/ServerForms.php +++ b/lib/ServerForms.php @@ -55,10 +55,10 @@ class ServerSettings extends Horde_Form true, false, null, array(array('0' => 'Persistent Module', '1' => 'Reload When Empty'))); $this->addVariable(_("Server Visibility"), 'publicserver', 'enum', - true, false, null, array(array('0' => 'Private', - '1' => 'Public'))); + true, false, null, array(array('1' => 'Private', + '0' => 'Public'))); $this->setTitle(_("Configure Server Settings")); $this->setButtons(_("Update Config")); } -} \ No newline at end of file +} diff --git a/start.php b/start.php index f2c970f..45f2b15 100644 --- a/start.php +++ b/start.php @@ -56,6 +56,7 @@ case 'kill': $notification->push(_("The server was killed."), 'horde.warning'); } case 'raw': + $wait = true; $result = $nwndriver->sendCommand(Util::getFormData('command'), true); if (is_a($result, 'PEAR_Error')) { $notification->push(_("There was a problem sending the command: ") .