Fixed some timing issues.
parent
95941affe5
commit
9648184fde
|
@ -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 '<pre>' . NWNAdmin::getServerExecutable() .$settingString . ' > ' .
|
||||
// $this->_getLog() . ' 2>&1 < ' . $this->_checkFifo() . ' &</pre>';
|
||||
shell_exec(NWNAdmin::getServerExecutable() .$settingString . ' > ' .
|
||||
$this->_getLog() . ' 2>&1 < ' . $this->_checkFifo() . ' &');
|
||||
|
||||
$this->_settingsbackend->setData($settings);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
|
@ -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"));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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: ") .
|
||||
|
|
Reference in New Issue