From a0125bb93e71cb4fd5259f85c97fc3d78b37772d Mon Sep 17 00:00:00 2001 From: Michael Kaufmann Date: Tue, 18 Dec 2018 15:51:48 +0100 Subject: [PATCH 1/4] Update function.setCycleOfCronjob.php --- lib/functions/validate/function.setCycleOfCronjob.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/functions/validate/function.setCycleOfCronjob.php b/lib/functions/validate/function.setCycleOfCronjob.php index dcc935eb..abcdc018 100644 --- a/lib/functions/validate/function.setCycleOfCronjob.php +++ b/lib/functions/validate/function.setCycleOfCronjob.php @@ -36,7 +36,7 @@ function setCycleOfCronjob($fieldname, $fielddata, $newfieldvalue, $allnewfieldv break; } - Database::query("UPDATE `cronjobs_run` SET `interval` = '1 ".$interval."' WHERE `cronfile` = 'cron_used_tickets_reset.php';"); + Database::query("UPDATE `cronjobs_run` SET `interval` = '1 ".$interval."' WHERE `cronfile` = 'used_tickets_reset';"); return array(FORMFIELDS_PLAUSIBILITY_CHECK_OK); } From a2f205bae3464ea81ccd24178e4b1b6a1799ce45 Mon Sep 17 00:00:00 2001 From: Michael Kaufmann Date: Tue, 18 Dec 2018 15:52:19 +0100 Subject: [PATCH 2/4] Update class.SImExporter.php --- lib/classes/settings/class.SImExporter.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/classes/settings/class.SImExporter.php b/lib/classes/settings/class.SImExporter.php index 366efc64..be93a749 100644 --- a/lib/classes/settings/class.SImExporter.php +++ b/lib/classes/settings/class.SImExporter.php @@ -48,7 +48,7 @@ class SImExporter 'system.mysql_access_host', 'system.lastcronrun', 'system.defaultip', - 'system.defaultsslip'. + 'system.defaultsslip', 'system.last_tasks_run', 'system.last_archive_run', 'system.leprivatekey', From dd8fbf090081064d2346cf389c85dcbc09de4391 Mon Sep 17 00:00:00 2001 From: Michael Kaufmann Date: Fri, 21 Dec 2018 11:25:48 +0100 Subject: [PATCH 3/4] add new namespaces branch to travis testing Signed-off-by: Michael Kaufmann --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 217ed99e..7bb534a1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,8 @@ php: branches: only: - master + - master + - namespaces matrix: include: From bd790224752213a088018cf3a167c94ee3fa75bc Mon Sep 17 00:00:00 2001 From: JB1985 Date: Mon, 24 Dec 2018 20:50:38 +0100 Subject: [PATCH 4/4] Update logfiles_viewer.php typo --- logfiles_viewer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/logfiles_viewer.php b/logfiles_viewer.php index 3226d25a..639d9047 100644 --- a/logfiles_viewer.php +++ b/logfiles_viewer.php @@ -80,6 +80,6 @@ if (function_exists('exec')) { if (AREA == 'admin') { dynamic_error('You need to allow the exec() function in the froxlor-vhost php-config'); } else { - dynamic_error('Required function exec() is not allowed. Pllease contact the system administrator.'); + dynamic_error('Required function exec() is not allowed. Please contact the system administrator.'); } }