From f05f1a3cd4cc3a9fa6021d2c5feedd7e734973ba Mon Sep 17 00:00:00 2001 From: msquare Date: Thu, 29 Sep 2016 12:08:12 +0200 Subject: rename to --- includes/pages/admin_import.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'includes/pages/admin_import.php') diff --git a/includes/pages/admin_import.php b/includes/pages/admin_import.php index e533819f..8643dc55 100644 --- a/includes/pages/admin_import.php +++ b/includes/pages/admin_import.php @@ -41,29 +41,29 @@ function admin_import() { switch ($step) { case 'input': - $ok = false; + $valid = false; if (isset($_REQUEST['submit'])) { - $ok = true; + $valid = true; if (isset($_REQUEST['shifttype_id']) && isset($shifttypes[$_REQUEST['shifttype_id']])) { $shifttype_id = $_REQUEST['shifttype_id']; } else { - $ok = false; + $valid = false; error(_('Please select a shift type.')); } if (isset($_REQUEST['add_minutes_start']) && is_numeric(trim($_REQUEST['add_minutes_start']))) { $add_minutes_start = trim($_REQUEST['add_minutes_start']); } else { - $ok = false; + $valid = false; error(_("Please enter an amount of minutes to add to a talk's begin.")); } if (isset($_REQUEST['add_minutes_end']) && is_numeric(trim($_REQUEST['add_minutes_end']))) { $add_minutes_end = trim($_REQUEST['add_minutes_end']); } else { - $ok = false; + $valid = false; error(_("Please enter an amount of minutes to add to a talk's end.")); } @@ -71,21 +71,21 @@ function admin_import() { if (move_uploaded_file($_FILES['xcal_file']['tmp_name'], $import_file)) { libxml_use_internal_errors(true); if (simplexml_load_file($import_file) === false) { - $ok = false; + $valid = false; error(_('No valid xml/xcal file provided.')); unlink($import_file); } } else { - $ok = false; + $valid = false; error(_('File upload went wrong.')); } } else { - $ok = false; + $valid = false; error(_('Please provide some data.')); } } - if ($ok) { + if ($valid) { redirect(page_link_to('admin_import') . "&step=check&shifttype_id=" . $shifttype_id . "&add_minutes_end=" . $add_minutes_end . "&add_minutes_start=" . $add_minutes_start); } else { $html .= div('well well-sm text-center', [ -- cgit v1.2.3-54-g00ecf