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

Commit 503cbb8

Browse files
author
Nabeel Shahzad
committed
VMS-278 VMS-279 VMS-280 #closed fixed
1 parent fe3d579 commit 503cbb8

File tree

8 files changed

+29
-29
lines changed

8 files changed

+29
-29
lines changed

‎admin/index.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@
7272
$BaseTemplate->template_path = SITE_ROOT . '/admin/lib/'.$tplname;
7373
$BaseTemplate->Set('title', SITE_NAME);
7474

75-
7675
Template::Set('MODULE_NAV_INC', $NAVBAR);
7776
Template::Set('MODULE_HEAD_INC', $HTMLHead);
7877

‎core/common/PIREPData.class.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -698,6 +698,8 @@ public static function fileReport($pirepdata)
698698
}
699699
}
700700

701+
$pirepdata['route'] = DB::escape($pirepdata['route']);
702+
701703
if(!empty($pirepdata['route_details']))
702704
{
703705
$pirepdata['route_details'] = DB::escape($pirepdata['route_details']);

‎core/modules/Schedules/Schedules.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ public function addbid()
103103
{
104104
if(!Auth::LoggedIn()) return;
105105

106-
$routeid = $this->post->id;
106+
$routeid = $this->get->id;
107107

108108
if($routeid == '')
109109
{

‎core/version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
929
1+
930

‎install/hashlist

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ fac7c09a2f7b3c46a3c4d20ccb0eb2fb *./install/templates/s2_site_setup.tpl
1111
98159de4e2de83127db1931eb35f818c *./install/update_437.sql
1212
fb61f59a4e1eb0f51ca5c9201b571ba5 *./install/checkinstall.php
1313
c6384626328e54dd77c534d04ff65a44 *./install/update_700.sql
14-
0bb6976bcc06e209c28b684afca2b2bf *./install/update.sql
14+
dba6000718fa86a775d0c3b5b1d3b77e *./install/update.sql
1515
d41d8cd98f00b204e9800998ecf8427e *./install/index.php
1616
55c3722f079209f61fcfce707f077548 *./install/update_400.sql
1717
56522f3521444add8835afbba7375a11 *./install/update_854.sql
@@ -27,7 +27,7 @@ d4d204c3560c283fa4d7a3a367473740 *./install/navdata.sql
2727
654a8ef74503b880f8526873986da3af *./install/install.php
2828
0ce9f88088bd78d869525b8b202fb1bd *./core/lang/en.lang.php
2929
02813e8f573062b56012fea15bccde90 *./core/common/MaintenanceData.class.php
30-
66ac4c7de16bb72aaeefa00e949da84c *./core/common/PIREPData.class.php
30+
a7f3dcafa34f2484a5be9cac106d5f6a *./core/common/PIREPData.class.php
3131
38c88cbada3413d09adc5255428fa579 *./core/common/Auth.class.php
3232
26e225d004bd0b758c49f994453aaac7 *./core/common/jqgrid.class.php
3333
d8cc600bc66b4e2afb1cca5b433fdeb7 *./core/common/RegistrationData.class.php
@@ -163,7 +163,7 @@ c56b2790383f5891808777c40c03e269 *./core/hooks/system/postmoduleload.php.1
163163
d41d8cd98f00b204e9800998ecf8427e *./core/index.php
164164
d41d8cd98f00b204e9800998ecf8427e *./core/pages/index.php
165165
c7e138b27019ee369b9e31eec21df39f *./core/app.config.php
166-
00e89835b48e67d7eaa87ed5dea64ce5 *./core/modules/Schedules/Schedules.php
166+
1e7faecc8a132a2691e2dd66a38b38dc *./core/modules/Schedules/Schedules.php
167167
e58ee78f8e857ad150badae9ba04dddc *./core/modules/news/news.php
168168
935862c6f2d8c067c49c4af2797abebd *./core/modules/XML/XML.php
169169
b29f26b4ddb98f0f2eeba802855a7872 *./core/modules/Contact/Contact.php
@@ -285,7 +285,7 @@ d09d63e66e3dc5077990329100d227d3 *./admin/templates/sidebar_mailer.tpl
285285
00b5070a20404be0c4fff66f9b871135 *./admin/templates/pirep_addcomment.tpl
286286
41c5a1e1d22c034a19e44136a061c9d9 *./admin/templates/ranks_rankform.tpl
287287
651c1a89417a676c8737cc0fcc2de6cd *./admin/templates/downloads_downloadform.tpl
288-
6055a62e0ad30422a4f0075c98452d6c *./admin/index.php
288+
db51741d41836a2f96de6b82d249ed38 *./admin/index.php
289289
54610ae6edfcb9fca44114b104a027fb *./admin/lib/layout/layout.php
290290
764c064e3cb5da3119901a266fd9deae *./admin/lib/layout/header.tpl
291291
98460347f7f55d7659d03260572bf8bc *./admin/lib/layout/footer.tpl
@@ -326,7 +326,7 @@ a73cd5d722a7390595c51e0ccf6fa82f *./lib/js/jquery.colorbox.js
326326
7c6967f5c1ddbb9d61f69e7b19d88056 *./lib/js/acarsmap.js
327327
168c89d09d780812785edabdcc649b2e *./lib/js/jquery.bigiframe.js
328328
fdf811e16f70717f1082e279a1cc52cc *./lib/js/jquery.colorbox-min.js
329-
5a7a34667a27f8469854ed332c261447 *./lib/js/phpvms.js
329+
cc6783059b04b075d46e5cf8574b241f *./lib/js/phpvms.js
330330
ccf14f48623a2413286b3dfb7e43d163 *./lib/js/jquery.metadata.js
331331
2e06583b6d440b4cc60bf7484e696311 *./lib/js/jquery.pstrength.js
332332
0e35751d9b92233a155bbf2b9fde9bcb *./lib/js/jquery-calendar.js

‎install/structure.xml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,9 @@
7777
<field Field="hub" Type="smallint(6)" Null="NO" Key="" Default="0" Extra="" />
7878
<field Field="fuelprice" Type="float" Null="NO" Key="" Default="0" Extra="" />
7979
<field Field="chartlink" Type="text" Null="NO" Key="" Extra="" />
80-
<key Table="phpvms_airports" Non_unique="0" Key_name="PRIMARY" Seq_in_index="1" Column_name="id" Collation="A" Cardinality="292" Null="" Index_type="BTREE" Comment="" />
81-
<key Table="phpvms_airports" Non_unique="0" Key_name="icao" Seq_in_index="1" Column_name="icao" Collation="A" Cardinality="292" Null="" Index_type="BTREE" Comment="" />
82-
<options Name="phpvms_airports" Engine="InnoDB" Version="10" Row_format="Compact" Rows="213" Avg_row_length="307" Data_length="65536" Max_data_length="0" Index_length="16384" Data_free="6291456" Auto_increment="1469" Create_time="2010-04-20 19:10:29" Collation="latin1_swedish_ci" Create_options="" Comment="" />
80+
<key Table="phpvms_airports" Non_unique="0" Key_name="PRIMARY" Seq_in_index="1" Column_name="id" Collation="A" Cardinality="553" Null="" Index_type="BTREE" Comment="" />
81+
<key Table="phpvms_airports" Non_unique="0" Key_name="icao" Seq_in_index="1" Column_name="icao" Collation="A" Cardinality="553" Null="" Index_type="BTREE" Comment="" />
82+
<options Name="phpvms_airports" Engine="InnoDB" Version="10" Row_format="Compact" Rows="389" Avg_row_length="168" Data_length="65536" Max_data_length="0" Index_length="16384" Data_free="6291456" Auto_increment="1469" Create_time="2010-04-20 19:10:29" Collation="latin1_swedish_ci" Create_options="" Comment="" />
8383
</table_structure>
8484
<table_structure name="phpvms_awards">
8585
<field Field="awardid" Type="int(11)" Null="NO" Key="PRI" Extra="auto_increment" />
@@ -102,8 +102,8 @@
102102
<field Field="pilotid" Type="int(11)" Null="NO" Key="" Default="0" Extra="" />
103103
<field Field="routeid" Type="int(11)" Null="NO" Key="" Default="0" Extra="" />
104104
<field Field="dateadded" Type="date" Null="NO" Key="" Extra="" />
105-
<key Table="phpvms_bids" Non_unique="0" Key_name="PRIMARY" Seq_in_index="1" Column_name="bidid" Collation="A" Cardinality="2" Null="" Index_type="BTREE" Comment="" />
106-
<options Name="phpvms_bids" Engine="InnoDB" Version="10" Row_format="Compact" Rows="2" Avg_row_length="8192" Data_length="16384" Max_data_length="0" Index_length="0" Data_free="6291456" Auto_increment="3" Create_time="2010-04-20 19:10:29" Collation="latin1_swedish_ci" Create_options="" Comment="" />
105+
<key Table="phpvms_bids" Non_unique="0" Key_name="PRIMARY" Seq_in_index="1" Column_name="bidid" Collation="A" Cardinality="5" Null="" Index_type="BTREE" Comment="" />
106+
<options Name="phpvms_bids" Engine="InnoDB" Version="10" Row_format="Compact" Rows="5" Avg_row_length="3276" Data_length="16384" Max_data_length="0" Index_length="0" Data_free="6291456" Auto_increment="6" Create_time="2010-04-20 19:10:29" Collation="latin1_swedish_ci" Create_options="" Comment="" />
107107
</table_structure>
108108
<table_structure name="phpvms_customfields">
109109
<field Field="fieldid" Type="int(11)" Null="NO" Key="PRI" Extra="auto_increment" />
@@ -350,21 +350,21 @@
350350
<field Field="notes" Type="text" Null="NO" Key="" Extra="" />
351351
<field Field="enabled" Type="int(11)" Null="NO" Key="" Default="1" Extra="" />
352352
<field Field="bidid" Type="int(11)" Null="NO" Key="" Default="0" Extra="" />
353-
<key Table="phpvms_schedules" Non_unique="0" Key_name="PRIMARY" Seq_in_index="1" Column_name="id" Collation="A" Cardinality="217" Null="" Index_type="BTREE" Comment="" />
354-
<key Table="phpvms_schedules" Non_unique="1" Key_name="depicao" Seq_in_index="1" Column_name="depicao" Collation="A" Cardinality="217" Null="" Index_type="BTREE" Comment="" />
355-
<key Table="phpvms_schedules" Non_unique="1" Key_name="flightnum" Seq_in_index="1" Column_name="flightnum" Collation="A" Cardinality="217" Null="" Index_type="BTREE" Comment="" />
356-
<key Table="phpvms_schedules" Non_unique="1" Key_name="depicao_arricao" Seq_in_index="1" Column_name="depicao" Collation="A" Cardinality="217" Null="" Index_type="BTREE" Comment="" />
357-
<key Table="phpvms_schedules" Non_unique="1" Key_name="depicao_arricao" Seq_in_index="2" Column_name="arricao" Collation="A" Cardinality="217" Null="" Index_type="BTREE" Comment="" />
358-
<key Table="phpvms_schedules" Non_unique="1" Key_name="code" Seq_in_index="1" Column_name="code" Collation="A" Cardinality="36" Null="" Index_type="BTREE" Comment="" />
359-
<options Name="phpvms_schedules" Engine="InnoDB" Version="10" Row_format="Compact" Rows="55" Avg_row_length="1191" Data_length="65536" Max_data_length="0" Index_length="65536" Data_free="6291456" Auto_increment="116" Create_time="2010-04-20 19:10:29" Collation="latin1_swedish_ci" Create_options="" Comment="" />
353+
<key Table="phpvms_schedules" Non_unique="0" Key_name="PRIMARY" Seq_in_index="1" Column_name="id" Collation="A" Cardinality="25" Null="" Index_type="BTREE" Comment="" />
354+
<key Table="phpvms_schedules" Non_unique="1" Key_name="depicao" Seq_in_index="1" Column_name="depicao" Collation="A" Cardinality="25" Null="" Index_type="BTREE" Comment="" />
355+
<key Table="phpvms_schedules" Non_unique="1" Key_name="flightnum" Seq_in_index="1" Column_name="flightnum" Collation="A" Cardinality="25" Null="" Index_type="BTREE" Comment="" />
356+
<key Table="phpvms_schedules" Non_unique="1" Key_name="depicao_arricao" Seq_in_index="1" Column_name="depicao" Collation="A" Cardinality="25" Null="" Index_type="BTREE" Comment="" />
357+
<key Table="phpvms_schedules" Non_unique="1" Key_name="depicao_arricao" Seq_in_index="2" Column_name="arricao" Collation="A" Cardinality="25" Null="" Index_type="BTREE" Comment="" />
358+
<key Table="phpvms_schedules" Non_unique="1" Key_name="code" Seq_in_index="1" Column_name="code" Collation="A" Cardinality="1" Null="" Index_type="BTREE" Comment="" />
359+
<options Name="phpvms_schedules" Engine="InnoDB" Version="10" Row_format="Compact" Rows="217" Avg_row_length="302" Data_length="65536" Max_data_length="0" Index_length="65536" Data_free="6291456" Auto_increment="116" Create_time="2010-04-20 19:10:29" Collation="latin1_swedish_ci" Create_options="" Comment="" />
360360
</table_structure>
361361
<table_structure name="phpvms_sessions">
362362
<field Field="id" Type="int(11)" Null="NO" Key="PRI" Extra="auto_increment" />
363363
<field Field="pilotid" Type="int(11)" Null="NO" Key="" Extra="" />
364364
<field Field="ipaddress" Type="varchar(25)" Null="NO" Key="" Extra="" />
365365
<field Field="logintime" Type="datetime" Null="NO" Key="" Extra="" />
366-
<key Table="phpvms_sessions" Non_unique="0" Key_name="PRIMARY" Seq_in_index="1" Column_name="id" Collation="A" Cardinality="59" Null="" Index_type="BTREE" Comment="" />
367-
<options Name="phpvms_sessions" Engine="MyISAM" Version="10" Row_format="Dynamic" Rows="59" Avg_row_length="32" Data_length="1908" Max_data_length="281474976710655" Index_length="2048" Data_free="0" Auto_increment="1794" Create_time="2009-10-31 20:05:09" Update_time="2010-04-22 18:34:09" Check_time="2010-04-20 19:10:29" Collation="latin1_swedish_ci" Create_options="" Comment="" />
366+
<key Table="phpvms_sessions" Non_unique="0" Key_name="PRIMARY" Seq_in_index="1" Column_name="id" Collation="A" Cardinality="61" Null="" Index_type="BTREE" Comment="" />
367+
<options Name="phpvms_sessions" Engine="MyISAM" Version="10" Row_format="Dynamic" Rows="61" Avg_row_length="32" Data_length="1992" Max_data_length="281474976710655" Index_length="2048" Data_free="0" Auto_increment="1796" Create_time="2009-10-31 20:05:09" Update_time="2010-04-22 23:53:55" Check_time="2010-04-20 19:10:29" Collation="latin1_swedish_ci" Create_options="" Comment="" />
368368
</table_structure>
369369
<table_structure name="phpvms_settings">
370370
<field Field="id" Type="int(11)" Null="NO" Key="PRI" Extra="auto_increment" />

‎install/update.sql

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,6 @@ ALTER TABLE `phpvms_aircraft` ADD `minrank` INT NOT NULL DEFAULT '0' AFTER `maxc
4141
ALTER TABLE `phpvms_aircraft` ADD `ranklevel` INT NOT NULL DEFAULT '0' AFTER `minrank` ;
4242

4343
-- Remove deprecated settings;
44-
DELETE FROM `phpvms_settings` WHERE `name='PHPVMS_VERSION';
45-
DELETE FROM `phpvms_settings` WHERE `name='NOTIFY_UPDATE';
46-
DELETE FROM `phpvms_settings` WHERE `name='GOOGLE_KEY';
44+
DELETE FROM `phpvms_settings` WHERE `name`='PHPVMS_VERSION';
45+
DELETE FROM `phpvms_settings` WHERE `name`='NOTIFY_UPDATE';
46+
DELETE FROM `phpvms_settings` WHERE `name`='GOOGLE_KEY';

‎lib/js/phpvms.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,10 @@ $(document).ready(function()
5050
$('.addbid').live('click', function(){
5151
var id = "#"+$(this).attr("id");
5252

53-
$.post(url+"action.php/schedules/addbid", {id: $(this).attr("id")},
54-
function (data, status)
55-
{
53+
$.get(url+"action.php/schedules/addbid?id="+$(this).attr("id"),
54+
function (data) {
5655
$(id).html(data);
57-
});
56+
});
5857

5958
return false;
6059
});

0 commit comments

Comments
 (0)