More webgui code improvements and some new vessel data
This commit is contained in:
1 parent
72571ede53
commit
3a43f749f5
13 files changed
+398
-306
No files matched your search
+19
-6
@@ -10,24 +10,37 @@
|
||||
|
||||
// ========== GPC FUNCTIONS ===================================================
|
||||
|
||||
function gpc_get_string(&$GPC, $varname, $maxlen = NULL, $default = NULL) {
|
||||
// TODO Parameter nullval: single value or array of values which considered as null
|
||||
// Default value for nullval is "-1"
|
||||
function gpc_get_string(&$GPC, $varname, $maxlen = NULL, $default = NULL, $nullvals = []) {
|
||||
// Parameter nullvals: single value or array of values which considered as null
|
||||
if (!isset($GPC[$varname]) || (strlen(trim($GPC[$varname])) == 0)) {
|
||||
return $default;
|
||||
}
|
||||
$s = trim($GPC[$varname]);
|
||||
if (isset($maxlen)) {
|
||||
return substr($s, 0, $maxlen);
|
||||
$s = substr($s, 0, $maxlen);
|
||||
}
|
||||
if (!is_array($nullvals)) {
|
||||
$nullvals = [$nullvals];
|
||||
}
|
||||
if (in_array($s, $nullvals, true)) {
|
||||
return NULL;
|
||||
}
|
||||
return $s;
|
||||
}
|
||||
|
||||
function gpc_get_int(&$GPC, $varname, $default = NULL) {
|
||||
function gpc_get_int(&$GPC, $varname, $default = NULL, $nullvals = []) {
|
||||
// Parameter nullvals: single value or array of values which considered as null
|
||||
if (!isset($GPC[$varname]) || $GPC[$varname] === '') {
|
||||
return $default;
|
||||
}
|
||||
return (int)$GPC[$varname];
|
||||
$value = (int)$GPC[$varname];
|
||||
if (!is_array($nullvals)) {
|
||||
$nullvals = [$nullvals];
|
||||
}
|
||||
if (in_array($value, $nullvals, true)) {
|
||||
return NULL;
|
||||
}
|
||||
return $value;
|
||||
}
|
||||
|
||||
function gpc_get_uint(&$GPC, $varname, $default = NULL) {
|
||||
|
||||
Reference in new issue
Block a user