More updates

This commit is contained in:
laf 2015-05-25 18:05:11 +01:00
parent 388d30d2a6
commit 0ccbc7a6b1
5 changed files with 144 additions and 120 deletions

View File

@ -789,7 +789,18 @@ function add_config_item($new_conf_name,$new_conf_value,$new_conf_type,$new_conf
function get_config_by_group($group) {
$group = array($group);
foreach (dbFetchRows("SELECT * FROM `config` WHERE `config_group` = '?'", array($group)) as $config_item) {
$items[] = $config_item;
$val = $config_item['config_value'];
if (filter_var($val,FILTER_VALIDATE_INT)) {
$val = (int) $val;
} elseif (filter_var($val,FILTER_VALIDATE_FLOAT)) {
$val = (float) $val;
} elseif (filter_var($val,FILTER_VALIDATE_BOOLEAN)) {
$val =(boolean) $val;
}
if ($val === TRUE) {
$config_item += array('config_checked'=>'checked');
}
$items[$config_item['config_name']] = $config_item;
}
return $items;
}

View File

@ -17,56 +17,12 @@ if (isset($_GET['error'])) {
}
if (isset($_GET['account']) && isset($_GET['service_key']) && isset($_GET['service_name'])) {
set_config_name('alert,transports,pagerduty',$_GET['service_key']);
set_config_name('alert,pagerduty,account',$_GET['account']);
set_config_name('alert,pagerduty,service',$_GET['service_name']);
set_config_name('alert.transports.pagerduty',$_GET['service_key']);
set_config_name('alert.pagerduty.account',$_GET['account']);
set_config_name('alert.pagerduty.service',$_GET['service_name']);
}
// Default settings config
$admin_config = get_config_by_name('alert,admins');
if (strcasecmp($admin_config[0]['config_value'],"true") == 0) {
$admin_checked = 'checked';
} else {
$admin_checked = '';
}
$read_config = get_config_by_name('alert,globals');
if (strcasecmp($read_config[0]['config_value'],"true") == 0) {
$read_checked = 'checked';
} else {
$read_checked = '';
}
$default_only_config = get_config_by_name('alert,default_only');
if (strcasecmp($default_only_config[0]['config_value'],"true") == 0) {
$default_only_checked = 'checked';
} else {
$default_only_checked = '';
}
$default_mail_config = get_config_by_name('alert,default_mail');
$tolerance_window_config = get_config_by_name('alert,tolerance_window');
// Mail transport config
$email_transport_config = get_config_by_name('alert,transports,mail');
if (strcasecmp($email_transport_config[0]['config_value'],"true") == 0) {
$email_transport_checked = 'checked';
} else {
$email_transport_checked = '';
}
$email_backend_config = get_config_by_name('email_backend');
$email_from_config = get_config_by_name('email_from');
$email_user_config = get_config_by_name('email_user');
$email_sendmail_path_config = get_config_by_name('email_sendmail_path');
$email_smtp_host_config = get_config_by_name('email_smtp_host');
$email_smtp_port_config = get_config_by_name('email_smtp_port');
$email_smtp_timeout_config = get_config_by_name('email_smtp_timeout');
$email_smtp_secure_config = get_config_by_name('email_smtp_secure');
$email_smtp_auth_config = get_config_by_name('email_smtp_auth');
if (strcasecmp($email_smtp_auth_config[0]['config_value'],"true") == 0) {
$email_smtp_auth_checked = 'checked';
} else {
$email_smtp_auth_checked = '';
}
$email_smtp_username_config = get_config_by_name('email_smtp_username');
$email_smtp_password_config = get_config_by_name('email_smtp_password');
$config_groups = get_config_by_group('alerting');
if (isset($config['base_url'])) {
$callback = $config['base_url'].'/'.$_SERVER['REQUEST_URI'].'/';
@ -87,39 +43,39 @@ echo '
<div id="general_settings_expand" class="panel-collapse collapse">
<div class="panel-body">
<div class="form-group">
<label for="admins" class="col-sm-4 control-label">$config[\''.str_replace(",", "']['", $admin_config[0]['config_name']).'\'] = </label>
<div data-toggle="tooltip" title="'.$admin_config[0]['config_desc'].'" class="toolTip glyphicon glyphicon-question-sign"></div>
<label for="admins" class="col-sm-4 control-label">Issue alerts to admins </label>
<div data-toggle="tooltip" title="'.$config_groups['alert.admins']['config_descr'].'" class="toolTip glyphicon glyphicon-question-sign"></div>
<div class="col-sm-4">
<input id="admins" type="checkbox" name="global-config-check" '.$admin_checked.' data-on-text="Yes" data-off-text="No" data-size="small" data-config_id="'.$admin_config[0]['config_id'].'">
<input id="admins" type="checkbox" name="global-config-check" '.$config_groups['alert.admins']['config_checked'].' data-on-text="Yes" data-off-text="No" data-size="small" data-config_id="'.$config_groups['alert.admins']['config_id'].'">
</div>
</div>
<div class="form-group">
<label for="globals" class="col-sm-4 control-label">$config[\''.str_replace(",", "']['", $read_config[0]['config_name']).'\'] = </label>
<div data-toggle="tooltip" title="'.$read_config[0]['config_desc'].'" class="toolTip glyphicon glyphicon-question-sign"></div>
<label for="globals" class="col-sm-4 control-label">Issue alerts to read only users </label>
<div data-toggle="tooltip" title="'.$config_groups['alert.alert_globals']['config_descr'].'" class="toolTip glyphicon glyphicon-question-sign"></div>
<div class="col-sm-4">
<input id="globals" type="checkbox" name="global-config-check" '.$read_checked.' data-on-text="Yes" data-off-text="No" data-size="small" data-config_id="'.$read_config[0]['config_id'].'">
<input id="globals" type="checkbox" name="global-config-check" '.$config_groups['alert.alert_globals']['config_checked'].' data-on-text="Yes" data-off-text="No" data-size="small" data-config_id="'.$config_groups['alert.alert_globals']['config_id'].'">
</div>
</div>
<div class="form-group">
<label for="default_only" class="col-sm-4 control-label">$config[\''.str_replace(",", "']['", $default_only_config[0]['config_name']).'\'] = </label>
<div data-toggle="tooltip" title="'.$default_only_config[0]['config_desc'].'" class="toolTip glyphicon glyphicon-question-sign"></div>
<label for="default_only" class="col-sm-4 control-label">Send alerts to default contact only </label>
<div data-toggle="tooltip" title="'.$config_groups['alert.default_only']['config_descr'].'" class="toolTip glyphicon glyphicon-question-sign"></div>
<div class="col-sm-4">
<input id="default_only" type="checkbox" name="global-config-check" '.$default_only_checked.' data-on-text="Yes" data-off-text="No" data-size="small" data-config_id="'.$default_only_config[0]['config_id'].'">
<input id="default_only" type="checkbox" name="global-config-check" '.$config_groups['alert.default_only']['config_checked'].' data-on-text="Yes" data-off-text="No" data-size="small" data-config_id="'.$config_groups['alert.default_only']['config_id'].'">
</div>
</div>
<div class="form-group has-feedback">
<label for="default_mail" class="col-sm-4 control-label">$config[\''.str_replace(",", "']['", $default_mail_config[0]['config_name']).'\'] = </label>
<div data-toggle="tooltip" title="'.$default_mail_config[0]['config_desc'].'" class="toolTip glyphicon glyphicon-question-sign"></div>
<label for="default_mail" class="col-sm-4 control-label">Default contact </label>
<div data-toggle="tooltip" title="'.$config_groups['alert.default_mail']['config_descr'].'" class="toolTip glyphicon glyphicon-question-sign"></div>
<div class="col-sm-4">
<input id="default_mail" class="form-control" type="text" name="global-config-input" value="'.$default_mail_config[0]['config_value'].'" data-config_id="'.$default_mail_config[0]['config_id'].'">
<input id="default_mail" class="form-control" type="text" name="global-config-input" value="'.$config_groups['alert.default_mail']['config_value'].'" data-config_id="'.$config_groups['alert.default_mail']['config_id'].'">
<span class="glyphicon form-control-feedback" aria-hidden="true"></span>
</div>
</div>
<div class="form-group has-feedback">
<label for="tolerance_window" class="col-sm-4 control-label">$config[\''.str_replace(",", "']['", $tolerance_window_config[0]['config_name']).'\'] = </label>
<div data-toggle="tooltip" title="'.$tolerance_window_config[0]['config_desc'].'" class="toolTip glyphicon glyphicon-question-sign"></div>
<label for="tolerance_window" class="col-sm-4 control-label">Tolerance window for cron </label>
<div data-toggle="tooltip" title="'.$config_groups['alert.tolerance_window']['config_descr'].'" class="toolTip glyphicon glyphicon-question-sign"></div>
<div class="col-sm-4">
<input id="tolerance_window" class="form-control" type="text" name="global-config-input" value="'.$tolerance_window_config[0]['config_value'].'" data-config_id="'.$tolerance_window_config[0]['config_id'].'">
<input id="tolerance_window" class="form-control" type="text" name="global-config-input" value="'.$config_groups['alert.tolerance_window']['config_value'].'" data-config_id="'.$config_groups['alert.tolerance_window']['config_id'].'">
<span class="glyphicon form-control-feedback" aria-hidden="true"></span>
</div>
</div>
@ -135,96 +91,114 @@ echo '
<div id="email_transport_expand" class="panel-collapse collapse">
<div class="panel-body">
<div class="form-group">
<label for="default_only" class="col-sm-4 control-label">$config[\''.str_replace(",", "']['", $email_transport_config[0]['config_name']).'\'] = </label>
<div data-toggle="tooltip" title="'.$email_transport_config[0]['config_desc'].'" class="toolTip glyphicon glyphicon-question-sign"></div>
<label for="default_only" class="col-sm-4 control-label">Enable email alerting </label>
<div data-toggle="tooltip" title="'.$config_groups['alert.transport.mail']['config_descr'].'" class="toolTip glyphicon glyphicon-question-sign"></div>
<div class="col-sm-4">
<input id="default_only" type="checkbox" name="global-config-check" '.$email_transport_checked.' data-on-text="Yes" data-off-text="No" data-size="small" data-config_id="'.$email_transport_config[0]['config_id'].'">
<input id="mail_transport" type="checkbox" name="global-config-check" '.$config_groups['alert.transport.mail']['config_checked'].' data-on-text="Yes" data-off-text="No" data-size="small" data-config_id="'.$config_groups['alert.transport.mail']['config_id'].'">
</div>
</div>
<div class="form-group has-feedback">
<label for="email_backend" class="col-sm-4 control-label">$config[\''.str_replace(",", "']['", $email_backend_config[0]['config_name']).'\'] = </label>
<div data-toggle="tooltip" title="'.$email_backend_config[0]['config_desc'].'" class="toolTip glyphicon glyphicon-question-sign"></div>
<label for="email_backend" class="col-sm-4 control-label">How to deliver mail </label>
<div data-toggle="tooltip" title="'.$config_groups['email_backend']['config_descr'].'" class="toolTip glyphicon glyphicon-question-sign"></div>
<div class="col-sm-4">
<input id="email_backend" class="form-control" type="text" name="global-config-input" value="'.$email_backend_config[0]['config_value'].'" data-config_id="'.$email_backend_config[0]['config_id'].'">
<select id="email_backend" class="form-control" name="global-config-select" data-config_id="'.$config_groups['email_backend']['config_id'].'">';
foreach ($dyn_config['email_backend'] as $backend) {
echo '<option value="'.$backend.'"';
if ($config_groups['email_backend']['config_value'] == $backend) {
echo ' selected';
}
echo '>'.$backend.'</option>';
}
echo '</select>
<span class="glyphicon form-control-feedback" aria-hidden="true"></span>
</div>
</div>
<div class="form-group has-feedback">
<label for="email_from" class="col-sm-4 control-label">$config[\''.str_replace(",", "']['", $email_from_config[0]['config_name']).'\'] = </label>
<div data-toggle="tooltip" title="'.$email_from_config[0]['config_desc'].'" class="toolTip glyphicon glyphicon-question-sign"></div>
<label for="email_from" class="col-sm-4 control-label">From address </label>
<div data-toggle="tooltip" title="'.$config_groups['email_from']['config_descr'].'" class="toolTip glyphicon glyphicon-question-sign"></div>
<div class="col-sm-4">
<input id="email_from" class="form-control" type="text" name="global-config-input" value="'.$email_from_config[0]['config_value'].'" data-config_id="'.$email_from_config[0]['config_id'].'">
<input id="email_from" class="form-control" type="text" name="global-config-input" value="'.$config_groups['email_from']['config_value'].'" data-config_id="'.$config_groups['email_from']['config_id'].'">
<span class="glyphicon form-control-feedback" aria-hidden="true"></span>
</div>
</div>
<div class="form-group has-feedback">
<label for="email_user" class="col-sm-4 control-label">$config[\''.str_replace(",", "']['", $email_user_config[0]['config_name']).'\'] = </label>
<div data-toggle="tooltip" title="'.$email_user_config[0]['config_desc'].'" class="toolTip glyphicon glyphicon-question-sign"></div>
<label for="email_user" class="col-sm-4 control-label">From name </label>
<div data-toggle="tooltip" title="'.$config_groups['email_user']['config_descr'].'" class="toolTip glyphicon glyphicon-question-sign"></div>
<div class="col-sm-4">
<input id="email_user" class="form-control" type="text" name="global-config-input" value="'.$email_user_config[0]['config_value'].'" data-config_id="'.$email_user_config[0]['config_id'].'">
<input id="email_user" class="form-control" type="text" name="global-config-input" value="'.$config_groups['email_user']['config_value'].'" data-config_id="'.$config_groups['email_user']['config_id'].'">
<span class="glyphicon form-control-feedback" aria-hidden="true"></span>
</div>
</div>
<div class="form-group has-feedback">
<label for="email_sendmail_path" class="col-sm-4 control-label">$config[\''.str_replace(",", "']['", $email_sendmail_path_config[0]['config_name']).'\'] = </label>
<div data-toggle="tooltip" title="'.$email_sendmail_path_config[0]['config_desc'].'" class="toolTip glyphicon glyphicon-question-sign"></div>
<label for="email_sendmail_path" class="col-sm-4 control-label">Sendmail path </label>
<div data-toggle="tooltip" title="'.$config_groups['email_sendmail_path']['config_descr'].'" class="toolTip glyphicon glyphicon-question-sign"></div>
<div class="col-sm-4">
<input id="email_sendmail_path" class="form-control" type="text" name="global-config-input" value="'.$email_sendmail_path_config[0]['config_value'].'" data-config_id="'.$email_sendmail_path_config[0]['config_id'].'">
<input id="email_sendmail_path" class="form-control" type="text" name="global-config-input" value="'.$config_groups['email_sendmail_path']['config_value'].'" data-config_id="'.$config_groups['email_sendmail_path']['config_id'].'">
<span class="glyphicon form-control-feedback" aria-hidden="true"></span>
</div>
</div>
<div class="form-group has-feedback">
<label for="email_smtp_host" class="col-sm-4 control-label">$config[\''.str_replace(",", "']['", $email_smtp_host_config[0]['config_name']).'\'] = </label>
<div data-toggle="tooltip" title="'.$email_smtp_host_config[0]['config_desc'].'" class="toolTip glyphicon glyphicon-question-sign"></div>
<label for="email_smtp_host" class="col-sm-4 control-label">SMTP Host </label>
<div data-toggle="tooltip" title="'.$config_groups['email_smtp_host']['config_descr'].'" class="toolTip glyphicon glyphicon-question-sign"></div>
<div class="col-sm-4">
<input id="email_smtp_host" class="form-control" type="text" name="global-config-input" value="'.$email_smtp_host_config[0]['config_value'].'" data-config_id="'.$email_smtp_host_config[0]['config_id'].'">
<input id="email_smtp_host" class="form-control" type="text" name="global-config-input" value="'.$config_groups['email_smtp_host']['config_value'].'" data-config_id="'.$config_groups['email_smtp_host']['config_id'].'">
<span class="glyphicon form-control-feedback" aria-hidden="true"></span>
</div>
</div>
<div class="form-group has-feedback">
<label for="email_smtp_port" class="col-sm-4 control-label">$config[\''.str_replace(",", "']['", $email_smtp_port_config[0]['config_name']).'\'] = </label>
<div data-toggle="tooltip" title="'.$email_smtp_port_config[0]['config_desc'].'" class="toolTip glyphicon glyphicon-question-sign"></div>
<label for="email_smtp_port" class="col-sm-4 control-label">SMTP Port </label>
<div data-toggle="tooltip" title="'.$config_groups['email_smtp_port']['config_descr'].'" class="toolTip glyphicon glyphicon-question-sign"></div>
<div class="col-sm-4">
<input id="email_smtp_port" class="form-control" type="text" name="global-config-input" value="'.$email_smtp_port_config[0]['config_value'].'" data-config_id="'.$email_smtp_port_config[0]['config_id'].'">
<input id="email_smtp_port" class="form-control" type="text" name="global-config-input" value="'.$config_groups['email_smtp_port']['config_value'].'" data-config_id="'.$config_groups['email_smtp_port']['config_id'].'">
<span class="glyphicon form-control-feedback" aria-hidden="true"></span>
</div>
</div>
<div class="form-group has-feedback">
<label for="email_smtp_timeout" class="col-sm-4 control-label">$config[\''.str_replace(",", "']['", $email_smtp_timeout_config[0]['config_name']).'\'] = </label>
<div data-toggle="tooltip" title="'.$email_smtp_timeout_config[0]['config_desc'].'" class="toolTip glyphicon glyphicon-question-sign"></div>
<label for="email_smtp_timeout" class="col-sm-4 control-label">SMTP Timeout </label>
<div data-toggle="tooltip" title="'.$config_groups['email_smtp_timeout']['config_descr'].'" class="toolTip glyphicon glyphicon-question-sign"></div>
<div class="col-sm-4">
<input id="email_smtp_timeout" class="form-control" type="text" name="global-config-input" value="'.$email_smtp_timeout_config[0]['config_value'].'" data-config_id="'.$email_smtp_timeout_config[0]['config_id'].'">
<input id="email_smtp_timeout" class="form-control" type="text" name="global-config-input" value="'.$config_groups['email_smtp_timeout']['config_value'].'" data-config_id="'.$config_groups['email_smtp_timeout']['config_id'].'">
<span class="glyphicon form-control-feedback" aria-hidden="true"></span>
</div>
</div>
<div class="form-group has-feedback">
<label for="email_smtp_secure" class="col-sm-4 control-label">$config[\''.str_replace(",", "']['", $email_smtp_secure_config[0]['config_name']).'\'] = </label>
<div data-toggle="tooltip" title="'.$email_smtp_secure_config[0]['config_desc'].'" class="toolTip glyphicon glyphicon-question-sign"></div>
<label for="email_smtp_secure" class="col-sm-4 control-label">SMTP Secure </label>
<div data-toggle="tooltip" title="'.$config_groups['email_smtp_secure']['config_descr'].'" class="toolTip glyphicon glyphicon-question-sign"></div>
<div class="col-sm-4">
<input id="email_smtp_secure" class="form-control" type="text" name="global-config-input" value="'.$email_smtp_secure_config[0]['config_value'].'" data-config_id="'.$email_smtp_secure_config[0]['config_id'].'">
<select id="email_smtp_secure" class="form-control"name="global-config-select" data-config_id="'.$config_groups['email_smtp_secure']['config_id'].'">';
foreach ($dyn_config['email_smtp_secure'] as $secure) {
echo "<option value='$secure'";
if ($config_groups['email_smtp_secure']['config_value'] == $secure) {
echo " selected";
}
echo ">$secure</option>";
}
echo '</select>
<span class="glyphicon form-control-feedback" aria-hidden="true"></span>
</div>
</div>
<div class="form-group">
<label for="email_smtp_auth" class="col-sm-4 control-label">$config[\''.str_replace(",", "']['", $email_smtp_auth_config[0]['config_name']).'\'] = </label>
<div data-toggle="tooltip" title="'.$email_smtp_auth_config[0]['config_desc'].'" class="toolTip glyphicon glyphicon-question-sign"></div>
<label for="email_smtp_auth" class="col-sm-4 control-label">SMTP Authentication </label>
<div data-toggle="tooltip" title="'.$config_groups['email_smtp_auth']['config_descr'].'" class="toolTip glyphicon glyphicon-question-sign"></div>
<div class="col-sm-4">
<input id="email_smtp_auth" type="checkbox" name="global-config-check" '.$email_smtp_auth_checked.' data-on-text="Yes" data-off-text="No" data-size="small" data-config_id="'.$email_smtp_auth_config[0]['config_id'].'">
<input id="email_smtp_auth" type="checkbox" name="global-config-check" '.$config_groups['email_smtp_auth']['config_checked'].' data-on-text="Yes" data-off-text="No" data-size="small" data-config_id="'.$config_groups['email_smtp_auth']['config_id'].'">
</div>
</div>
<div class="form-group has-feedback">
<label for="email_smtp_username" class="col-sm-4 control-label">$config[\''.str_replace(",", "']['", $email_smtp_username_config[0]['config_name']).'\'] = </label>
<div data-toggle="tooltip" title="'.$email_smtp_username_config[0]['config_desc'].'" class="toolTip glyphicon glyphicon-question-sign"></div>
<label for="email_smtp_username" class="col-sm-4 control-label">SMTP Authentication username </label>
<div data-toggle="tooltip" title="'.$config_groups['email_smtp_username']['config_descr'].'" class="toolTip glyphicon glyphicon-question-sign"></div>
<div class="col-sm-4">
<input id="email_smtp_username" class="form-control" type="text" name="global-config-input" value="'.$email_smtp_username_config[0]['config_value'].'" data-config_id="'.$email_smtp_username_config[0]['config_id'].'">
<input id="email_smtp_username" class="form-control" type="text" name="global-config-input" value="'.$config_groups['email_smtp_username']['config_value'].'" data-config_id="'.$config_groups['email_smtp_username']['config_id'].'">
<span class="glyphicon form-control-feedback" aria-hidden="true"></span>
</div>
</div>
<div class="form-group has-feedback">
<label for="email_smtp_password" class="col-sm-4 control-label">$config[\''.str_replace(",", "']['", $email_smtp_password_config[0]['config_name']).'\'] = </label>
<div data-toggle="tooltip" title="'.$email_smtp_password_config[0]['config_desc'].'" class="toolTip glyphicon glyphicon-question-sign"></div>
<label for="email_smtp_password" class="col-sm-4 control-label">SMTP AUthentication passoword </label>
<div data-toggle="tooltip" title="'.$config_groups['email_smtp_password']['config_descr'].'" class="toolTip glyphicon glyphicon-question-sign"></div>
<div class="col-sm-4">
<input id="email_smtp_password" class="form-control" type="text" name="global-config-input" value="'.$email_smtp_password_config[0]['config_value'].'" data-config_id="'.$email_smtp_password_config[0]['config_id'].'">
<input id="email_smtp_password" class="form-control" type="text" name="global-config-input" value="'.$config_groups['email_smtp_password']['config_value'].'" data-config_id="'.$config_groups['email_smtp_password']['config_id'].'">
<span class="glyphicon form-control-feedback" aria-hidden="true"></span>
</div>
</div>
@ -256,9 +230,16 @@ echo '
<div id="pagerduty_transport_expand" class="panel-collapse collapse">
<div class="panel-body">
<div class="form-group">
<div class="col-sm-8">
<div class="col-sm-2">
<a href="https://connect.pagerduty.com/connect?vendor=2fc7c9f3c8030e74aae6&callback='.$callback.'"><img src="images/pd_connect_button.png" width="202" height="36" alt="Connect to PagerDuty"></a>
</div>
<div class="col-sm-1">';
if (empty($config_groups['alert.transports.pagerduty']['config_value']) === FALSE) {
echo "<i class='fa fa-check-square-o fa-col-success fa-3x'></i>". $config_groups['alert.transports.pagerduty']['config_value'];
} else {
echo "<i class='fa fa-check-square-o fa-col-danger fa-3x'></i>";
}
echo '</div>
</div>
</div>
</div>
@ -325,4 +306,36 @@ echo '
}
});
});
$( 'select[name="global-config-select"]').change(function(event) {
event.preventDefault();
var $this = $(this);
var config_id = $this.data("config_id");
var config_value = $this.val();
$.ajax({
type: 'POST',
url: '/ajax_form.php',
data: {type: "update-config-item", config_id: config_id, config_value: config_value},
dataType: "json",
success: function (data) {
if (data.status == 'ok') {
$this.closest('.form-group').addClass('has-success');
$this.next().addClass('glyphicon-ok');
setTimeout(function(){
$this.closest('.form-group').removeClass('has-success');
$this.next().removeClass('glyphicon-ok');
}, 2000);
} else {
$(this).closest('.form-group').addClass('has-error');
$this.next().addClass('glyphicon-remove');
setTimeout(function(){
$this.closest('.form-group').removeClass('has-error');
$this.next().removeClass('glyphicon-remove');
}, 2000);
}
},
error: function () {
$("#message").html('<div class="alert alert-info">An error occurred.</div>');
}
});
});
</script>

View File

@ -625,4 +625,7 @@ $config['ipmi']['type'][] = "lan";
$config['ipmi']['type'][] = "imb";
$config['ipmi']['type'][] = "open";
// Options needed for dyn config - do NOT edit
$dyn_config['email_backend'] = array('mail','sendmail','smtp');
$dyn_config['email_smtp_secure'] = array('', 'tls', 'ssl');
?>

View File

@ -14,29 +14,27 @@ if (!$database_link)
$database_db = mysql_select_db($config['db_name'], $database_link);
function mergecnf($obj) {
global $config;
$pointer = array();
$val = $obj['config_value'];
$obj = $obj['config_name'];
$obj = explode('.',$obj);
$str = "";
foreach ($obj as $sub) {
if (!empty($sub)) {
$str .= "['".addslashes($sub)."']";
} else {
$str .= "[]";
$obj = explode('.',$obj,2);
if (!isset($obj[1])) {
if (filter_var($val,FILTER_VALIDATE_INT)) {
$val = (int) $val;
} elseif (filter_var($val,FILTER_VALIDATE_FLOAT)) {
$val = (float) $val;
} elseif (filter_var($val,FILTER_VALIDATE_BOOLEAN)) {
$val =(boolean) $val;
}
if (!empty($obj[0])) {
return array($obj[0] => $val);
} else {
return array($val);
}
}
$str = '$config'.$str.' = ';
if (filter_var($val,FILTER_VALIDATE_INT)) {
$str .= "(int) '$val';";
} elseif (filter_var($val,FILTER_VALIDATE_FLOAT)) {
$str .= "(float) '$val';";
} elseif (filter_var($val,FILTER_VALIDATE_BOOLEAN)) {
$str .= "(boolean) '$val';";
} else {
$str .= "'$val';";
$pointer[$obj[0]] = mergecnf(array('config_name'=>$obj[1],'config_value'=>$val));
}
eval('return array('.$str.')');
return $pointer;
}
foreach( dbFetchRows('select config_name,config_value from config') as $obj ) {

View File

@ -28,7 +28,6 @@ include_once($config['install_dir'] . "/includes/syslog.php");
include_once($config['install_dir'] . "/includes/rewrites.php");
include_once($config['install_dir'] . "/includes/snmp.inc.php");
include_once($config['install_dir'] . "/includes/services.inc.php");
echo $config['install_dir'] . "/includes/console_colour.php";
include_once($config['install_dir'] . "/includes/console_colour.php");
$console_color = new Console_Color2();