@@ -1067,9 +1067,11 @@ discard block |
||
| 1067 | 1067 | $delimiter = ''; |
| 1068 | 1068 | $field_names = ['pl_level', 'pl_long', 'pl_lati', 'pl_zoom', 'pl_icon', 'fqpn']; |
| 1069 | 1069 | |
| 1070 | - if ($serverfile !== '') { // first choice is file on server |
|
| 1070 | + if ($serverfile !== '') { |
|
| 1071 | +// first choice is file on server |
|
| 1071 | 1072 | $filename = WT_MODULES_DIR . $this->getName() . '/extra/' . $serverfile; |
| 1072 | - } elseif ($_FILES['localfile']['error'] === UPLOAD_ERR_OK) { // 2nd choice is local file |
|
| 1073 | + } elseif ($_FILES['localfile']['error'] === UPLOAD_ERR_OK) { |
|
| 1074 | +// 2nd choice is local file |
|
| 1073 | 1075 | $filename = $_FILES['localfile']['tmp_name']; |
| 1074 | 1076 | } |
| 1075 | 1077 | |
@@ -1090,7 +1092,8 @@ discard block |
||
| 1090 | 1092 | $delimiter = ','; |
| 1091 | 1093 | } |
| 1092 | 1094 | if ($delimiter !== '') { |
| 1093 | - if (!is_numeric($record[0])) { // lose the header |
|
| 1095 | + if (!is_numeric($record[0])) { |
|
| 1096 | +// lose the header |
|
| 1094 | 1097 | array_shift($input_array); |
| 1095 | 1098 | } |
| 1096 | 1099 | |
@@ -529,8 +529,8 @@ discard block |
||
| 529 | 529 | case 'BaseData': |
| 530 | 530 | $varName = (self::$map_selections['style'] === '') ? '' : self::$map_providers[self::$map_selections['provider']]['styles'][self::$map_selections['style']]; |
| 531 | 531 | $payload = ['selectedProvIndex' => self::$map_selections['provider'], |
| 532 | - 'selectedProvName' => self::$map_providers[self::$map_selections['provider']]['name'], |
|
| 533 | - 'selectedStyleName' => $varName, |
|
| 532 | + 'selectedProvName' => self::$map_providers[self::$map_selections['provider']]['name'], |
|
| 533 | + 'selectedStyleName' => $varName, |
|
| 534 | 534 | ]; |
| 535 | 535 | break; |
| 536 | 536 | case 'ProviderStyles': |
@@ -543,9 +543,9 @@ discard block |
||
| 543 | 543 | $providers[$key] = $provider['name']; |
| 544 | 544 | } |
| 545 | 545 | $payload = ['providers' => $providers, |
| 546 | - 'selectedProv' => self::$map_selections['provider'], |
|
| 547 | - 'styles' => self::$map_providers[self::$map_selections['provider']]['styles'], |
|
| 548 | - 'selectedStyle' => self::$map_selections['style'], |
|
| 546 | + 'selectedProv' => self::$map_selections['provider'], |
|
| 547 | + 'styles' => self::$map_providers[self::$map_selections['provider']]['styles'], |
|
| 548 | + 'selectedStyle' => self::$map_selections['style'], |
|
| 549 | 549 | ]; |
| 550 | 550 | break; |
| 551 | 551 | default: |
@@ -1105,8 +1105,8 @@ discard block |
||
| 1105 | 1105 | $row = explode($delimiter, $input_array[0]); |
| 1106 | 1106 | $fields = count($row); |
| 1107 | 1107 | if ($fields >= 6 && |
| 1108 | - (bool)preg_match("/[SN][0-9]*\.?[0-9]*/", $row[$fields - 3]) && |
|
| 1109 | - (bool)preg_match("/[EW][0-9]*\.?[0-9]*/", $row[$fields - 4])) { |
|
| 1108 | + (bool)preg_match("/[SN][0-9]*\.?[0-9]*/", $row[$fields - 3]) && |
|
| 1109 | + (bool)preg_match("/[EW][0-9]*\.?[0-9]*/", $row[$fields - 4])) { |
|
| 1110 | 1110 | $filetype = 'csv'; |
| 1111 | 1111 | } |
| 1112 | 1112 | } |