2.1 release, kACARS fix

Author: Nabeel Shahzad

core/logs/log.txt

@@ -1,12 +0,0 @@
-=====
-Time: 
-=====
-Time: 04.19.10 14:03:35
-Backtrace: DB::write_debug > DB::get_results > StatsData::TotalFlightsToday > include > TemplateSet->getTemplate > TemplateSet->showTemplate > Template::show > CodonModule->render > Dashboard->index > call_user_func_array > MainController::RunAllActions
-Query: SELECT COUNT(*) AS `total` FROM phpvms_pirepsDATE(`submitdate`) = CURDATE()
-Error: (1064) - You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '(`submitdate`) = CURDATE()' at line 1
-=====
-
-
-=====
-

core/modules/kACARS_Free/kACARS_Free.php

@@ -35,9 +35,9 @@ public function index()
 				return;	
 			}
 
-			$this->log(print_r($this->xml->asXML(), true), 'kacars');
+			$this->log(print_r($xml->asXML(), true), 'kacars');
 
-			$case = strtolower($this->xml->switch->data);
+			$case = strtolower($xml->switch->data);
 			switch($case)
 			{
 				case 'verify':		
@@ -60,7 +60,7 @@ public function index()
 
 				case 'getbid':							
 
-					$pilotid = PilotData::parsePilotID($this->xml->verify->pilotID);
+					$pilotid = PilotData::parsePilotID($xml->verify->pilotID);
 					$pilotinfo = PilotData::getPilotData($pilotid);
 					$biddata = SchedulesData::getLatestBid($pilotid);
 					$aircraftinfo = OperationsData::getAircraftByReg($biddata->registration);
@@ -108,7 +108,7 @@ public function index()
 
 				case 'getflight':
 
-					$flightinfo = SchedulesData::getProperFlightNum($this->xml->pirep->flightNumber);
+					$flightinfo = SchedulesData::getProperFlightNum($xml->pirep->flightNumber);
 
 					$params = array(
 						's.code' => $flightinfo['code'],
@@ -153,7 +153,7 @@ public function index()
 
 				case 'liveupdate':	
 
-					$pilotid = PilotData::parsePilotID($this->xml->verify->pilotID);
+					$pilotid = PilotData::parsePilotID($xml->verify->pilotID);
 
 					# Get the distance remaining
 					$depapt = OperationsData::GetAirportInfo($xml->liveupdate->depICAO);
@@ -209,7 +209,7 @@ public function index()
 					$code = $flightinfo['code'];
 					$flightnum = $flightinfo['flightnum'];
 
-					$pilotid = PilotData::parsePilotID($this->xml->verify->pilotID);
+					$pilotid = PilotData::parsePilotID($xml->verify->pilotID);
 
 					# Make sure airports exist:
 					#  If not, add them.
@@ -414,7 +414,6 @@ public static function ProcessLogin($useridoremail, $password)
 				$sql = 'SELECT * FROM '.TABLE_PREFIX.'pilots
 					   WHERE pilotid='.$id;
 			}
-			
 			else
 			{				
 				return false;

core/version

@@ -1 +1 @@
-926
+927

install/hashlist

@@ -11,7 +11,7 @@ fac7c09a2f7b3c46a3c4d20ccb0eb2fb  *./install/templates/s2_site_setup.tpl
 98159de4e2de83127db1931eb35f818c  *./install/update_437.sql
 26ef658d7e68ae3cd8f5e34e9e9c5e65  *./install/checkinstall.php
 c6384626328e54dd77c534d04ff65a44  *./install/update_700.sql
-78ac341bb1c1ae65d37cc37cc4bef4c5  *./install/update.sql
+0bb6976bcc06e209c28b684afca2b2bf  *./install/update.sql
 d41d8cd98f00b204e9800998ecf8427e  *./install/index.php
 55c3722f079209f61fcfce707f077548  *./install/update_400.sql
 56522f3521444add8835afbba7375a11  *./install/update_854.sql
@@ -20,11 +20,11 @@ d41d8cd98f00b204e9800998ecf8427e  *./install/index.php
 1ee77934d1a602e9c74861c9391a55d9  *./install/update_628.sql
 c272ba4d5e3656768e851f448face751  *./install/loader.inc.php
 20aed0ce417ba947f254459309b4ac1f  *./install/Installer.class.php
-d79871df7bcc5aaabb166feb2d0252fc  *./install/update.php
+d617e0d979ec50733d2040661038b738  *./install/update.php
 6b8d1dc1b006ef2a88e8130ce7bb157a  *./install/update_441.sql
 87a5365aeff06351424ae56fdb561909  *./install/checkdb.php
 d4d204c3560c283fa4d7a3a367473740  *./install/navdata.sql
-b0bf9020a8fcc2736ef8eb90a21261a7  *./install/install.php
+654a8ef74503b880f8526873986da3af  *./install/install.php
 0ce9f88088bd78d869525b8b202fb1bd  *./core/lang/en.lang.php
 ca3ba6576a81f6107b9017187bc2f484  *./core/common/MaintenanceData.class.php
 66ac4c7de16bb72aaeefa00e949da84c  *./core/common/PIREPData.class.php
@@ -171,7 +171,7 @@ e989746517699422f43d3d1d5ba0d799  *./core/modules/Profile/Profile.php
 db56836cad01ef0f2b40a482e1b49828  *./core/modules/Registration/Registration.php
 fe8673f5292627c7589eed45b591a20b  *./core/modules/Downloads/Downloads.php
 e6eb59f2814008a2a20eb01591c12447  *./core/modules/Pilots/Pilots.php
-20e1a65966388952372b1089c50cae29  *./core/modules/kACARS_Free/kACARS_Free.php
+be83521d9521fbf0078d27e114f32faf  *./core/modules/kACARS_Free/kACARS_Free.php
 d41d8cd98f00b204e9800998ecf8427e  *./core/modules/index.php
 c75e1f34d88a90272e8b4f665e62ea3d  *./core/modules/Frontpage/Frontpage.php
 4745bff609adac50676f834dbf25f46c  *./core/modules/ACARS/fsacars.php

install/structure.xml

@@ -77,9 +77,9 @@
 		<field Field="hub" Type="smallint(6)" Null="NO" Key="" Default="0" Extra="" />
 		<field Field="fuelprice" Type="float" Null="NO" Key="" Default="0" Extra="" />
 		<field Field="chartlink" Type="text" Null="NO" Key="" Extra="" />
-		<key Table="phpvms_airports" Non_unique="0" Key_name="PRIMARY" Seq_in_index="1" Column_name="id" Collation="A" Cardinality="258" Null="" Index_type="BTREE" Comment="" />
-		<key Table="phpvms_airports" Non_unique="0" Key_name="icao" Seq_in_index="1" Column_name="icao" Collation="A" Cardinality="258" Null="" Index_type="BTREE" Comment="" />
-		<options Name="phpvms_airports" Engine="InnoDB" Version="10" Row_format="Compact" Rows="553" Avg_row_length="118" Data_length="65536" Max_data_length="0" Index_length="16384" Data_free="6291456" Auto_increment="1469" Create_time="2010-04-09 17:02:46" Collation="latin1_swedish_ci" Create_options="" Comment="" />
+		<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="" />
+		<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="" />
+		<options Name="phpvms_airports" Engine="InnoDB" Version="10" Row_format="Compact" Rows="160" Avg_row_length="409" Data_length="65536" Max_data_length="0" Index_length="16384" Data_free="6291456" Auto_increment="1469" Create_time="2010-04-09 17:02:46" Collation="latin1_swedish_ci" Create_options="" Comment="" />
 	</table_structure>
 	<table_structure name="phpvms_awards">
 		<field Field="awardid" Type="int(11)" Null="NO" Key="PRI" Extra="auto_increment" />
@@ -363,8 +363,8 @@
 		<field Field="pilotid" Type="int(11)" Null="NO" Key="" Extra="" />
 		<field Field="ipaddress" Type="varchar(25)" Null="NO" Key="" Extra="" />
 		<field Field="logintime" Type="datetime" Null="NO" Key="" Extra="" />
-		<key Table="phpvms_sessions" Non_unique="0" Key_name="PRIMARY" Seq_in_index="1" Column_name="id" Collation="A" Cardinality="102" Null="" Index_type="BTREE" Comment="" />
-		<options Name="phpvms_sessions" Engine="MyISAM" Version="10" Row_format="Dynamic" Rows="102" Avg_row_length="32" Data_length="3320" Max_data_length="281474976710655" Index_length="2048" Data_free="0" Auto_increment="1678" Create_time="2009-10-31 20:05:09" Update_time="2010-04-19 05:20:00" Check_time="2010-04-09 17:02:47" Collation="latin1_swedish_ci" Create_options="" Comment="" />
+		<key Table="phpvms_sessions" Non_unique="0" Key_name="PRIMARY" Seq_in_index="1" Column_name="id" Collation="A" Cardinality="119" Null="" Index_type="BTREE" Comment="" />
+		<options Name="phpvms_sessions" Engine="MyISAM" Version="10" Row_format="Dynamic" Rows="119" Avg_row_length="32" Data_length="3864" Max_data_length="281474976710655" Index_length="4096" Data_free="0" Auto_increment="1695" Create_time="2009-10-31 20:05:09" Update_time="2010-04-20 02:26:30" Check_time="2010-04-09 17:02:47" Collation="latin1_swedish_ci" Create_options="" Comment="" />
 	</table_structure>
 	<table_structure name="phpvms_settings">
 		<field Field="id" Type="int(11)" Null="NO" Key="PRI" Extra="auto_increment" />
@@ -383,7 +383,7 @@
 		<field Field="lastupdate" Type="datetime" Null="NO" Key="" Extra="" />
 		<key Table="phpvms_updates" Non_unique="0" Key_name="PRIMARY" Seq_in_index="1" Column_name="id" Collation="A" Cardinality="9" Null="" Index_type="BTREE" Comment="" />
 		<key Table="phpvms_updates" Non_unique="1" Key_name="name" Seq_in_index="1" Column_name="name" Collation="A" Cardinality="9" Null="" Index_type="BTREE" Comment="" />
-		<options Name="phpvms_updates" Engine="MyISAM" Version="10" Row_format="Dynamic" Rows="9" Avg_row_length="33" Data_length="300" Max_data_length="281474976710655" Index_length="3072" Data_free="0" Auto_increment="10" Create_time="2009-12-20 17:51:29" Update_time="2010-04-17 23:03:52" Check_time="2010-04-09 17:02:47" Collation="latin1_swedish_ci" Create_options="" Comment="" />
+		<options Name="phpvms_updates" Engine="MyISAM" Version="10" Row_format="Dynamic" Rows="9" Avg_row_length="33" Data_length="300" Max_data_length="281474976710655" Index_length="3072" Data_free="0" Auto_increment="10" Create_time="2009-12-20 17:51:29" Update_time="2010-04-19 18:03:35" Check_time="2010-04-09 17:02:47" Collation="latin1_swedish_ci" Create_options="" Comment="" />
 	</table_structure>
 </database>
 </mysqldump>