diff options
| author | Christoph Schulthess | 2017-01-31 15:26:04 +0100 |
|---|---|---|
| committer | Christoph Schulthess | 2017-01-31 15:26:04 +0100 |
| commit | fe60d0fc5a7693d227f2e353993de0eb733bf595 (patch) | |
| tree | adf5b5d4f6ba1b806c55d634ea2e9d738a4aa03b | |
| parent | debug config module (diff) | |
| download | slx-admin-fe60d0fc5a7693d227f2e353993de0eb733bf595.tar.gz slx-admin-fe60d0fc5a7693d227f2e353993de0eb733bf595.tar.xz slx-admin-fe60d0fc5a7693d227f2e353993de0eb733bf595.zip | |
finished config module
| -rw-r--r-- | modules-available/debugconfig/page.inc.php | 21 | ||||
| -rw-r--r-- | modules-available/debugconfig/templates/debugconfig.html | 17 |
2 files changed, 19 insertions, 19 deletions
diff --git a/modules-available/debugconfig/page.inc.php b/modules-available/debugconfig/page.inc.php index ca6ba136..04ce6793 100644 --- a/modules-available/debugconfig/page.inc.php +++ b/modules-available/debugconfig/page.inc.php @@ -3,7 +3,7 @@ class Page_debugConfig extends Page { - const DEFAULT_CONFIG = array("enabled" => false, "debugServer" => "127.0.0.1"); + const DEFAULT_CONFIG = array("enabled" => false, "debugServer" => "127.0.0.1", "port" => 5900); protected function doPreprocess() { @@ -12,15 +12,18 @@ class Page_debugConfig extends Page Message::addError('main.no-permission'); Util::redirect('?do=Main'); } - if (!filter_var(Request::get('debugServer'), FILTER_VALIDATE_IP)) { - return; + if (Request::post('action') === 'debugconf') { + /*if (!filter_var(Request::get('debugServer'), FILTER_VALIDATE_IP)) { + return; + }*/ + $this->setConfig(); } } protected function doRender() { $debug_config = $this->getConfig(); - Render::addTemplate('debugconfig', array("debugEnabled" => $debug_config["enabled"], "debugServer" => $debug_config["debugServer"])); + Render::addTemplate('debugconfig', array("debugEnabled" => $debug_config["enabled"], "debugServer" => $debug_config["debugServer"], "port" => $debug_config["port"])); } private function getConfig() @@ -33,13 +36,9 @@ class Page_debugConfig extends Page private function setConfig() { - error_log("here"); - if (Request::get('toggleDebug' === 'enable')) { - $enabled = true; - } else { - $enabled = false; - } - Property::setRemoteDebugConfig(array('enabled' => $enabled, 'debugServer' => Request::get('debugServer'))); + error_log(request::post('toggleDebug')); + $enabled = isset($_POST['toggleDebug']) ? true : false; + Property::setRemoteDebugConfig(array('enabled' => $enabled, 'debugServer' => Request::post('debugServer'), 'port' => Request::post('port'))); } } diff --git a/modules-available/debugconfig/templates/debugconfig.html b/modules-available/debugconfig/templates/debugconfig.html index 4aa0b4e9..83ea0449 100644 --- a/modules-available/debugconfig/templates/debugconfig.html +++ b/modules-available/debugconfig/templates/debugconfig.html @@ -1,6 +1,6 @@ <form action="?do=DebugConfig" method="post"> <input type="hidden" name="token" value="{{token}}"> - <input type="hidden" name="action" value="$this->setConfig()"> + <input type="hidden" name="action" value="debugconf"> <div class="panel panel-default"> <div class="panel-heading">{{lang_debugConfig}}</div> <div class="panel-body"> @@ -8,17 +8,18 @@ <div class="col-md-5 slx-cfg-toggle"> <div>REMOTE_DBG_SERVER</div> <div class="slx-default">master-ip</div> - {{#debugEnabled}} - <input class="bootstrap-switch" name="toggleDebug" value="enable" id="" type="checkbox" checked="true"><label style="margin-left: 10px;">{{lang_debuggingActive}}</label> - {{/debugEnabled}} - {{^debugEnabled}} - <input class="bootstrap-switch" name="toggleDebug" value="enable" id="" type="checkbox"><label style="margin-left: 10px;">{{lang_debuggingInactive}}</label> - {{/debugEnabled}} + <input class="bootstrap-switch" name="toggleDebug" type="checkbox" + {{#debugEnabled}}checked="true"><label style="margin-left: 10px;">{{lang_debuggingActive}}{{/debugEnabled}} + {{^debugEnabled}}><label style="margin-left: 10px;">{{lang_debuggingInactive}}{{/debugEnabled}} + </label> </div> - <div class="col-md-5"> + <div class="col-md-3"> <input name="debugServer" id="DBG_SERVER_ADDR" class="form-control" value="{{debugServer}}" type="text"/> </div> <div class="col-md-2"> + <input name="port" id="DBG_SERVER_PORT" class="form-control" value="{{port}}" type="text" /> + </div> + <div class="col-md-2"> <a class="btn btn-default" data-toggle="modal" data-target="help-remoteDebugging"> <span class="glyphicon glyphicon-question-sign"></span> </a> |