penguincoder
/
nwnadmin
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed some timing issues.

master
penguinc 2005-01-23 06:17:36 +00:00
parent 95941affe5
commit 9648184fde
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/NWNDriver.php
View File

@ -169,6 +169,7 @@ class NWNDriver
global $conf; global $conf;
chdir(NWNAdmin::getServerRoot()); chdir(NWNAdmin::getServerRoot());
$settings = &$this->_settingsbackend->getSettings(); $settings = &$this->_settingsbackend->getSettings();
unset($settings['module']);
$settingString = ''; $settingString = '';
foreach ($settings as $key => $val) { foreach ($settings as $key => $val) {
if (!empty($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 . ' > ' . shell_exec(NWNAdmin::getServerExecutable() .$settingString . ' > ' .
$this->_getLog() . ' 2>&1 < ' . $this->_checkFifo() . ' &'); $this->_getLog() . ' 2>&1 < ' . $this->_checkFifo() . ' &');
$this->_settingsbackend->setData($settings);
return true; return true;
} }

6
lib/ServerForms.php
View File

@ -55,10 +55,10 @@ class ServerSettings extends Horde_Form
true, false, null, array(array('0' => 'Persistent Module', true, false, null, array(array('0' => 'Persistent Module',
'1' => 'Reload When Empty'))); '1' => 'Reload When Empty')));
$this->addVariable(_("Server Visibility"), 'publicserver', 'enum', $this->addVariable(_("Server Visibility"), 'publicserver', 'enum',
true, false, null, array(array('0' => 'Private', true, false, null, array(array('1' => 'Private',
'1' => 'Public'))); '0' => 'Public')));
$this->setTitle(_("Configure Server Settings")); $this->setTitle(_("Configure Server Settings"));
$this->setButtons(_("Update Config")); $this->setButtons(_("Update Config"));
} }
} }

1
start.php
View File

@ -56,6 +56,7 @@ case 'kill':
$notification->push(_("The server was killed."), 'horde.warning'); $notification->push(_("The server was killed."), 'horde.warning');
} }
case 'raw': case 'raw':
$wait = true;
$result = $nwndriver->sendCommand(Util::getFormData('command'), true); $result = $nwndriver->sendCommand(Util::getFormData('command'), true);
if (is_a($result, 'PEAR_Error')) { if (is_a($result, 'PEAR_Error')) {
$notification->push(_("There was a problem sending the command: ") . $notification->push(_("There was a problem sending the command: ") .