Skip to content

formatting, fix missing column during the update #70

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TheWitness merged 1 commit into from
Feb 4, 2026
Merged

formatting, fix missing column during the update #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions includes/functions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@
+-------------------------------------------------------------------------+
*/

//include_once(__DIR__ . '/arrays.php');

function servcheck_show_tab($current_tab) {
global $config, $servcheck_tabs;

Expand Down Expand Up @@ -221,7 +219,7 @@ function servcheck_decrypt_credential ($cred_id) {
$servcheck_iv = substr($encrypted, 0, $iv_length);
$encrypted = substr($encrypted, $iv_length);

$decrypted=openssl_decrypt ($encrypted, SERVCHECK_CIPHER, $servcheck_key, OPENSSL_RAW_DATA, $servcheck_iv);
$decrypted = openssl_decrypt ($encrypted, SERVCHECK_CIPHER, $servcheck_key, OPENSSL_RAW_DATA, $servcheck_iv);

return json_decode($decrypted, true);
}
Expand Down
1 change: 0 additions & 1 deletion servcheck_process.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,6 @@
}
}


// checks only if test passed or some search string exists
if ($results['result_search'] != 'not tested' && $results['result'] == 'ok') {
if ($last_log['result_search'] != $results['result_search']) {
Expand Down
3 changes: 1 addition & 2 deletions servcheck_test.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,6 @@ function form_save() {

$save['external_id'] = get_nfilter_request_var('external_id');


if (isset_request_var('type') && array_key_exists(get_nfilter_request_var('type'), $service_types)) {
$save['type'] = get_nfilter_request_var('type');
list ($category, $service) = explode('_', get_nfilter_request_var('type'));
Expand Down Expand Up @@ -429,7 +428,7 @@ function form_save() {

$save['duration_trigger'] = is_numeric(get_nfilter_request_var('duration_trigger')) ? get_nfilter_request_var('duration_trigger') : 0;

$save['name'] = form_input_validate(get_nfilter_request_var('name'), 'name', '', false, 3);
$save['name'] = form_input_validate(get_nfilter_request_var('name'), 'name', '', false, 3);

$save['search'] = get_nfilter_request_var('search');
$save['search_maint'] = get_nfilter_request_var('search_maint');
Expand Down
4 changes: 4 additions & 0 deletions setup.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,10 @@ function plugin_servcheck_upgrade() {
db_add_column('plugin_servcheck_test', array('name' => 'ipaddress', 'type' => 'varchar(46)', 'NULL' => false, 'default' => '', 'after' => 'hostname'));
}

if (!db_column_exists('plugin_servcheck_test', 'external_id')) {
db_add_column('plugin_servcheck_test', array('name' => 'external_id', 'type' => 'varchar(20)', 'NULL' => false, 'default' => '', 'after' => 'notes'));
}

// 0.3 contains a lot of changes. I tried to convert old data but for sure make a backup

db_execute('DROP TABLE IF EXISTS plugin_servcheck_contacts');
Expand Down