Added validation of the config

This commit is contained in:
Jeroen De Meerleer 2018-09-13 12:38:12 +02:00
parent 562a1a8d55
commit 392646b238
Signed by: JeroenED
GPG Key ID: 28CCCB8F62BFADD6
5 changed files with 164 additions and 3 deletions

73
config.php Normal file
View File

@ -0,0 +1,73 @@
<?php
/*
* The MIT License
*
* Copyright 2017-2018 Jeroen De Meerleer <me@jeroened.be>.
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantia²l portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
require_once "include/initialize.inc.php";
if ($_SERVER["REQUEST_METHOD"] == "GET") {
$message = "";
if (isset($_GET["message"])) {
switch ($_GET["message"]) {
case "edited":
$message = "The config has been edited"; break;
}
}
$error = "";
if (isset($_GET["error"])) {
switch ($_GET["error"]) {
case "emptyfields":
$error = "Some fields were empty"; break;
}
}
$loader = new Twig_Loader_Filesystem('templates');
$twig = new Twig_Environment($loader, array('cache' => 'cache', "debug" => true));
$configs = load_config_categorized();
$twig_vars = array('config' => $configs, "error" => $error, "message" => $message);
echo $twig->render('config.html.twig', $twig_vars);
}
elseif ($_SERVER["REQUEST_METHOD"] == "POST") {
foreach($_POST as $key => $value) {
if (empty($value)) {
header("location:config.php?error=emptyfields"); exit;
}
$keydb = str_replace('_', '.', $key);
$stmt = $db->prepare("UPDATE config SET value = ? WHERE conf = ?");
$stmt->execute(array($value, $keydb));
}
header("location:config.php?message=edited");
exit;
}
require_once 'include/finalize.inc.php';

View File

@ -30,4 +30,61 @@ function job_in_array($id, $jobs) {
}
return false;
}
function load_config_categorized() {
global $db;
$allConfig = $db->prepare("SELECT * FROM config ORDER BY category ASC");
$allConfig->execute();
$allConfigResult = $allConfig->fetchAll(PDO::FETCH_ASSOC);
// Separate lines into categories
$configCategorized = array();
$count = 0;
foreach($allConfigResult as $key=>$value) {
$configCategorized[$value['category']][$count]['conf'] = $value['conf'];
$configCategorized[$value['category']][$count]['value'] = $value['value'];
$configCategorized[$value['category']][$count]['label'] = $value['label'];
$configCategorized[$value['category']][$count]['description'] = $value['description'];
$configCategorized[$value['category']][$count]['type'] = parse_config_type($value['type']);
$count++;
}
// into a easy twig array
$catcount = 0;
foreach ($configCategorized as $key => $value) {
$twigarray[$catcount]['name'] = $key;
$twigarray[$catcount]['conf'] = $value;
$catcount++;
}
return $twigarray;
}
function get_configvalue($conf) {
global $db;
$config = $db->prepare("SELECT value FROM config WHERE conf = ?");
$config->execute(array($conf));
$configResult = $config->fetch(PDO::FETCH_ASSOC);
return $configResult['value'];
}
function parse_config_type($type) {
$splittype = explode('(', substr($type, 0, -1));
$r_var['type'] = $splittype[0];
$splitargs = explode(',', $splittype[1]);
switch($r_var['type'])
{
case 'number':
$r_var['args'][] = $splitargs[0] != '-1' ? 'min="' . $splitargs[0] . '"' : '';
$r_var['args'][] = $splitargs[1] != '-1' ? 'max="' . $splitargs[1] . '"' : '';
break;
}
return $r_var;
}

View File

@ -26,11 +26,11 @@
session_start();
require_once "include/functions.php";
error_reporting("E_ALL");
error_reporting(E_ALL);
ini_set("display_errors", "on");
require_once "include/functions.php";
if( ini_get('safe_mode') ){
die("Cannot run in safe mode");
}

View File

@ -30,6 +30,7 @@
<ul class="nav nav-stacked">
<li><a href="overview.php">Overview</a></li>
<li><a href="addjob.php">Add a new cronjob</a></li>
<li><a href="config.php">Configuration</a></li>
</ul>
</div>
</div>

View File

@ -0,0 +1,30 @@
{% extends "base.html.twig" %}
{% block title %}configuration{% endblock %}
{% block content %}
<h2>Webcron configuration</h2>
{% if not message == "" %}
<div class="alert alert-success fade in">
<a href="#" class="close" data-dismiss="alert">&times;</a>
{{ message }}
</div>
{% endif %}
{% if not error == "" %}
<div class="alert alert-danger fade in">
<a href="#" class="close" data-dismiss="alert">&times;</a>
<strong>Error!</strong> {{ error }}
</div>
{% endif %}
<form method="post" action="config.php">
{% for cat in config %}
<h3>{{ cat.name }}</h3>
{% for confval in cat.conf %}
<div class="form-group">
<p><label for="{{ confval.conf }}">{{ confval.label }}</label><p>
<p><input class="form-control" id="{{ confval.conf }}" name="{{ confval.conf }}" type="{{ confval.type.type }}"{% for args in confval.type.args %} {{ args | raw }}{% endfor %}value="{{ confval.value }}">
<p class="description">{{ confval.description }}</p>
</div>
{% endfor %}
{% endfor %}
<button type="submit" class="btn btn-default">Submit</button>
</form>
{% endblock %}