Skip to content
This repository was archived by the owner on Dec 6, 2019. It is now read-only.

Repair dropdown selection & FSFK Map Additions #115

Merged
merged 5 commits into from
Sep 30, 2013
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 5 additions & 7 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@
preparecommit
core/local.config.php.old
core/logs/errors.txt
core/local.config.php
core/logs/*
core/pages/*
core/cache/*
core/local.config.php
core/logs/*
lib/signatures/*
lib/avatars/*
lib/rss/*
core/modules/test
core/modules/test/**
mobile
lib/rss/latestpireps.rss
unittest/reports/**
unittest/web
tests/*
tests/Tests/**
tests/utils/*
nbproject/
2 changes: 1 addition & 1 deletion admin/templates/settings_mainform.php
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
echo '<select name="DEFAULT_GROUP">';

foreach($allgroups as $group) {
$sel = ($current == $group->groupid)? 'selected' : '';
$sel = ($current->value == $group->groupid ? 'selected="selected"' : '');
echo '<option value="'.$group->groupid.'" '. $sel . '>'.$group->name.'</option>';
}

Expand Down
70 changes: 0 additions & 70 deletions core/lib/php-ofc-library/ofc_upload_image.php

This file was deleted.

18 changes: 17 additions & 1 deletion core/modules/FSFK/FSFK.php
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,22 @@ public function pirep() {
$img = (string )$xml->FLIGHTMAPS->FlightMapLandingProfileJPG;
if ($img)
$rawdata['FLIGHTMAPS']['FlightMapLandingProfile'] = $img;

$img = (string )$xml->FLIGHTMAPS->FlightMapTaxiInJPG;
if ($img)
$rawdata['FLIGHTMAPS']['FlightMapTaxiIn'] = $img;

$img = (string )$xml->FLIGHTMAPS->FlightMapTaxiOutJPG;
if ($img)
$rawdata['FLIGHTMAPS']['FlightMapTaxiOut'] = $img;

$img = (string )$xml->FLIGHTMAPS->FlightMapVerticalProfileJPG;
if ($img)
$rawdata['FLIGHTMAPS']['FlightMapVerticalProfile'] = $img;

$img = (string )$xml->FLIGHTMAPS->FlightMapJPG;
if ($img)
$rawdata['FLIGHTMAPS']['FlightMap'] = $img;

continue;
} elseif ($key == 'FLIGHTPLAN') {
Expand All @@ -108,7 +124,7 @@ public function pirep() {
} else {
$key = trim($key);
$value = (string )$value;
$value = str_replace('��', '', $value);
$value = str_replace('��', '', $value);

$rawdata['FLIGHTDATA'][$key] = $value;
}
Expand Down
2 changes: 1 addition & 1 deletion install/fixtures/install.sql
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ INSERT INTO `phpvms_airports` (`id`, `icao`, `name`, `country`, `lat`, `lng`, `h

INSERT INTO `phpvms_ranks` VALUES(1, 'New Hire', '', 0, 18.0);

INSERT INTO `phpvms_groups` (`name`, `permissions`, `core`) VALUES ('Administrators', '35651519', 1);
INSERT INTO `phpvms_groups` (`name`, `permissions`, `core`) VALUES ('Administrators', '536870911', 1);
INSERT INTO `phpvms_groups` (`name`, `permissions`, `core`) VALUES ('Active Pilots', '0', 1);
INSERT INTO `phpvms_groups` (`name`, `permissions`, `core`) VALUES ('Inactive Pilots', '0', 1);

Expand Down