Commit 80579215 authored by Till Brehm's avatar Till Brehm

Merge branch 'master' into 'master'

update caa

See merge request ispconfig/ispconfig3!875
parents 876f4a00 ba507131
...@@ -43,11 +43,11 @@ class plugin_system_config_dns_ca extends plugin_base { ...@@ -43,11 +43,11 @@ class plugin_system_config_dns_ca extends plugin_base {
$pluginTpl = new tpl; $pluginTpl = new tpl;
$pluginTpl->newTemplate('templates/system_config_dns_ca_edit.htm'); $pluginTpl->newTemplate('templates/system_config_dns_ca_edit.htm');
include 'lib/lang/'.$_SESSION['s']['language'].'_system_config.lng'; include 'lib/lang/'.$app->functions->check_language($_SESSION['s']['language']).'_system_config.lng';
$pluginTpl->setVar($wb); $pluginTpl->setVar($wb);
if(isset($_GET['action']) && ($_GET['action'] == 'edit') && $_GET['id'] > 0) { $ca_id = $app->functions->intval($_GET['id']);
if(isset($_GET['action']) && ($_GET['action'] == 'edit') && $ca_id > 0) {
$pluginTpl->setVar('edit_record', 1); $pluginTpl->setVar('edit_record', 1);
$ca_id = intval($_GET['id']);
$rec = $app->db->queryOneRecord("SELECT * FROM dns_ssl_ca WHERE id = ?", $ca_id); $rec = $app->db->queryOneRecord("SELECT * FROM dns_ssl_ca WHERE id = ?", $ca_id);
$pluginTpl->setVar('id', $rec['id']); $pluginTpl->setVar('id', $rec['id']);
$pluginTpl->setVar('ca_name', $rec['ca_name']); $pluginTpl->setVar('ca_name', $rec['ca_name']);
...@@ -56,16 +56,15 @@ class plugin_system_config_dns_ca extends plugin_base { ...@@ -56,16 +56,15 @@ class plugin_system_config_dns_ca extends plugin_base {
$pluginTpl->setVar('ca_critical', $rec['ca_critical']); $pluginTpl->setVar('ca_critical', $rec['ca_critical']);
$pluginTpl->setVar('ca_iodef', $rec['ca_iodef']); $pluginTpl->setVar('ca_iodef', $rec['ca_iodef']);
$pluginTpl->setVar('active', $rec['active']); $pluginTpl->setVar('active', $rec['active']);
} elseif(isset($_GET['action']) && ($_GET['action'] == 'save') && $_GET['id'] > 0) { } elseif(isset($_GET['action']) && ($_GET['action'] == 'save') && $ca_id > 0) {
$pluginTpl->setVar('edit_record', 0); $pluginTpl->setVar('edit_record', 0);
$ca_id = intval($_GET['id']);
$pluginTpl->setVar('id', $ca_id); $pluginTpl->setVar('id', $ca_id);
$pluginTpl->setVar('ca_name', $_POST['ca_name']); $pluginTpl->setVar('ca_name', $app->functions->htmlentities($_POST['ca_name']));
$pluginTpl->setVar('ca_issue', $_POST['ca_issue']); $pluginTpl->setVar('ca_issue', $app->functions->htmlentities($_POST['ca_issue']));
$pluginTpl->setVar('ca_wildcard', $_POST['ca_wildcard']); $pluginTpl->setVar('ca_wildcard', $app->functions->htmlentities($_POST['ca_wildcard']));
$pluginTpl->setVar('ca_critical', $_POST['ca_critical']); $pluginTpl->setVar('ca_critical', $app->functions->htmlentities($_POST['ca_critical']));
$pluginTpl->setVar('ca_iodef', $_POST['ca_iodef']); $pluginTpl->setVar('ca_iodef', $app->functions->htmlentities($_POST['ca_iodef']));
$pluginTpl->setVar('active', $_POST['active']); $pluginTpl->setVar('active', $app->functions->htmlentities($_POST['active']));
} else { } else {
$pluginTpl->setVar('edit_record', 0); $pluginTpl->setVar('edit_record', 0);
} }
...@@ -77,10 +76,10 @@ class plugin_system_config_dns_ca extends plugin_base { ...@@ -77,10 +76,10 @@ class plugin_system_config_dns_ca extends plugin_base {
function onUpdate() { function onUpdate() {
global $app; global $app;
$id = intval($_GET['id']); $ca_id = $app->functions->intval($_GET['id']);
if(isset($_GET['action']) && $_GET['action'] == 'save') { if(isset($_GET['action']) && $_GET['action'] == 'save') {
if($id > 0) { if($ca_id > 0) {
$app->db->query("UPDATE dns_ssl_ca SET ca_name = ?, ca_issue = ?, ca_wildcard = ?, ca_iodef = ?, active = ? WHERE id = ?", $_POST['ca_name'], $_POST['ca_issue'], $_POST['ca_wildcard'], $_POST['ca_iodef'], $_POST['active'], $_GET['id']); $app->db->query("UPDATE dns_ssl_ca SET ca_name = ?, ca_issue = ?, ca_wildcard = ?, ca_iodef = ?, active = ? WHERE id = ?", $_POST['ca_name'], $_POST['ca_issue'], $_POST['ca_wildcard'], $_POST['ca_iodef'], $_POST['active'], $ca_id);
} else { } else {
$app->db->query("INSERT INTO (sys_userid, sys_groupid, sys_perm_user, sys_perm_group, sys_perm_other, ca_name, ca_issue, ca_wildcard, ca_iodef, active) VALUES(1, 1, 'riud', 'riud', '', ?, ?, ?, ?, ?", $_POST['ca_name'], $_POST['ca_issue'], $_POST['ca_wildcard'], $_POST['ca_iodef'], $_POST['active']); $app->db->query("INSERT INTO (sys_userid, sys_groupid, sys_perm_user, sys_perm_group, sys_perm_other, ca_name, ca_issue, ca_wildcard, ca_iodef, active) VALUES(1, 1, 'riud', 'riud', '', ?, ?, ?, ?, ?", $_POST['ca_name'], $_POST['ca_issue'], $_POST['ca_wildcard'], $_POST['ca_iodef'], $_POST['active']);
} }
......
...@@ -44,7 +44,7 @@ class plugin_system_config_dns_ca_list extends plugin_base { ...@@ -44,7 +44,7 @@ class plugin_system_config_dns_ca_list extends plugin_base {
$listTpl->newTemplate('templates/system_config_dns_ca_list.htm'); $listTpl->newTemplate('templates/system_config_dns_ca_list.htm');
//* Loading language file //* Loading language file
$lng_file = 'lib/lang/'.$_SESSION['s']['language'].'_system_config.lng'; $lng_file = 'lib/lang/'.$app->functions->check_language($_SESSION['s']['language']).'_system_config.lng';
include $lng_file; include $lng_file;
$listTpl->setVar($wb); $listTpl->setVar($wb);
if($_SESSION['s']['user']['typ'] == 'admin') { if($_SESSION['s']['user']['typ'] == 'admin') {
......
...@@ -62,7 +62,7 @@ class system_config_dns_ca_plugin { ...@@ -62,7 +62,7 @@ class system_config_dns_ca_plugin {
} }
} }
} }
} //* End function }
function web_vhost_domain_edit($event_name, $page_form) { function web_vhost_domain_edit($event_name, $page_form) {
global $app; global $app;
......
...@@ -35,7 +35,7 @@ require_once '../../lib/app.inc.php'; ...@@ -35,7 +35,7 @@ require_once '../../lib/app.inc.php';
$app->auth->check_module_permissions('dns'); $app->auth->check_module_permissions('dns');
$type = $_GET["type"]; $type = $_GET["type"];
$ca_id = $_GET['ca_id']; $ca_id = $app->functions->intval($_GET['ca_id']);
if($type == 'get_ipv4'){ if($type == 'get_ipv4'){
$result = array(); $result = array();
......
...@@ -61,3 +61,4 @@ $TTL {tmpl_var name='ttl'} ...@@ -61,3 +61,4 @@ $TTL {tmpl_var name='ttl'}
</tmpl_if> </tmpl_if>
</tmpl_loop> </tmpl_loop>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment