VMS-261 VMS-262 VMS-263 VMS-264 VMS-265 VMS-266 #close fixed

Author: Nabeel Shahzad

admin/lib/phpvmsadmin.js

@@ -18,73 +18,15 @@
 var depicon = baseurl + '/lib/images/towerdeparture.png';
 var arricon = baseurl + '/lib/images/towerarrival.png';
 
-function formInit() 
-{
-	$("#form").ajaxForm({
-		target: '#bodytext',
-		success: function() {
-			$('#bodytext').fadeIn('slow');
-			formInit();
-			$("button, input:button, input:submit, a.button").button();
-		}
-	});
-
-	$("#flashForm").ajaxForm({
-		target: '#results',
-		success: function() {
-			formInit();
-			$("button, input:button, input:submit, a.button").button();
-		}
-	});
-
-	$('#pilotoptionchangepass').ajaxForm({
-		target: '#dialogresult',
-		success: function() {
-			formInit();
-		}
-	});
-
-	$('#selectpilotgroup').ajaxForm({
-		target: '#pilotgroups',
-		success: function() {
-			formInit();
-		}
-	});
-
-	$('#addaward').ajaxForm({
-		target: '#awardslist',
-		success: function() {
-			formInit();
-		}
-	});
-	
-	$("button, input:button, input:submit, a.button").button();
-}
-
-function reloadGroups() {
-	$('.pilotgroupajax').live('click', function() {
-		$("#pilotgroups").load($(this).attr("href"),
-		    { action: $(this).attr("action"), pilotid: $(this).attr("pilotid"), groupid: $(this).attr("id") },
-		    function() {
-		    	reloadGroups();
-		    });
-	});
-
-	$('a.button').button();
-	$('button').button();
-}
-
-function calcDistance() {
-	$("#distance").val("Calculating...");
-	$.get(baseurl + "/admin/action.php/operations/calculatedistance",
-        { depicao: $("#depicao").val(), arricao: $("#arricao").val() },
-        function(data) {
-        	$("#distance").val(data);
-        });
-}
+$(document).ready(function() {
+	initListeners();
+});
 
 function initListeners()
 {
+	formInit();
+	reloadGroups();
+	
 	$('#jqmdialog').jqm({
 		ajax: '@href',
 		onLoad: function(h) {
@@ -122,9 +64,6 @@ function initListeners()
 
 	$('a.button, button, input[type=submit]').button();
 
-	formInit();
-	reloadGroups();
-
 	$("#slidermenu").accordion({ clearStyle: true, autoHeight: false, navigation: true });
 
 	$("#dialogform").ajaxForm({
@@ -227,9 +166,71 @@ function initListeners()
 	}
 }
 
-$(document).ready(function() {
-	initListeners();
-});
+
+function formInit() 
+{
+	$("#form").ajaxForm({
+		target: '#bodytext',
+		success: function() {
+			formInit();
+			$("button, input:button, input:submit, a.button").button();
+		}
+	});
+
+	$("#flashForm").ajaxForm({
+		target: '#results',
+		success: function() {
+			formInit();
+			$("button, input:button, input:submit, a.button").button();
+			$("#grid").trigger("reloadGrid");
+		}
+	});
+	
+	$('#pilotoptionchangepass').ajaxForm({
+		target: '#dialogresult',
+		success: function() {
+			formInit();
+		}
+	});
+
+	$('#selectpilotgroup').ajaxForm({
+		target: '#pilotgroups',
+		success: function() {
+			formInit();
+		}
+	});
+
+	$('#addaward').ajaxForm({
+		target: '#awardslist',
+		success: function() {
+			formInit();
+		}
+	});
+	
+	$("button, input:button, input:submit, a.button").button();
+}
+
+function reloadGroups() {
+	$('.pilotgroupajax').live('click', function() {
+		$("#pilotgroups").load($(this).attr("href"),
+		    { action: $(this).attr("action"), pilotid: $(this).attr("pilotid"), groupid: $(this).attr("id") },
+		    function() {
+		    	reloadGroups();
+		    });
+	});
+
+	$('a.button').button();
+	$('button').button();
+}
+
+function calcDistance() {
+	$("#distance").val("Calculating...");
+	$.get(baseurl + "/admin/action.php/operations/calculatedistance",
+        { depicao: $("#depicao").val(), arricao: $("#arricao").val() },
+        function(data) {
+        	$("#distance").val(data);
+        });
+}
 
 function lookupICAO() {
 	icao = $("#airporticao").val();

admin/maintenance.php

@@ -21,8 +21,10 @@
 	You should either point to this file directly in your web-host's control panel
 	Or add an entry into the crontab file. I recommend running this maybe 2-3am, 
  */
-
+define('ADMIN_PANEL', true);
 include dirname(dirname(__FILE__)).'/core/codon.config.php';
+Auth::$userinfo->pilotid = 0;
+
 error_reporting(E_ALL);
 ini_set('display_errors', 'on');
 
@@ -47,7 +49,5 @@
 
 MaintenanceData::optimizeTables();
 
-include dirname(__FILE__).'/modules/Maintenance/Maintenance.php';
-$m = new Maintenance();
-$m->resetpirepcount();
-$m->resethours();
+MainController::Run('Maintenance', 'resetpirepcount');
+MainController::Run('Maintenance', 'resethours');

admin/modules/Maintenance/Maintenance.php

@@ -133,6 +133,14 @@ public function changepilotid()
 				return;
 			}
 
+			if($this->post->new_pilotid < 1)
+			{
+				$error = true;
+				$this->set('message', 'You cannot have an ID less than 1');
+				$this->render('core_error.tpl');
+				return;
+			}
+			
 			if(empty($this->post->new_pilotid))
 			{
 				$error = true;
@@ -157,19 +165,12 @@ public function changepilotid()
 				$this->render('core_error.tpl');
 				return;
 			}
-			else
-			{
-				$error = true;
-				$this->set('message', 'Invalid pilot!');
-				$this->render('core_error.tpl');
-				return;
-			}
 
 			if($error === false)
 			{
 				PilotData::changePilotID($this->post->old_pilotid, $this->post->new_pilotid);
 
-				$this->set('message', 'Pilot ID changed');
+				$this->set('message', "Pilot ID changed from {$this->post->old_pilotid} to {$this->post->new_pilotid}");
 				$this->render('core_success.tpl');
 			}
 		}
@@ -264,7 +265,6 @@ public function resethours()
 		StatsData::UpdateTotalHours();
 		echo 'Found '.StatsData::TotalHours().' total hours, updated<br /></p>';
 
-		
 		LogData::addLog(Auth::$userinfo->pilotid, 'Reset hours');
 	}
 

admin/modules/Operations/Operations.php

@@ -256,6 +256,8 @@ public function airports()
 					$this->edit_airport_post();
 					break;
 			}
+			
+			return;
 		}
 
 		//$this->set('airports', OperationsData::getAllAirports());
@@ -801,7 +803,8 @@ protected function add_airport_post()
 	{
 
 		if($this->post->icao == '' || $this->post->name == '' 
-				|| $this->post->country == '' || $this->post->lat == '' || $this->post->long == '')
+			|| $this->post->country == '' 
+			|| $this->post->lat == '' || $this->post->lng == '')
 		{
 			$this->set('message', 'Some fields were blank!');
 			$this->render('core_error.tpl');
@@ -818,7 +821,7 @@ protected function add_airport_post()
 			'name' => $this->post->name,
 			'country' => $this->post->country,
 			'lat' => $this->post->lat,
-			'lng' => $this->post->long,
+			'lng' => $this->post->lng,
 			'hub' => $this->post->hub,
 			'chartlink' => $this->post->chartlink,
 			'fuelprice' => $this->post->fuelprice
@@ -837,16 +840,16 @@ protected function add_airport_post()
 			return;
 		}
 
-		$this->set('message', 'The airport has been added');
-		$this->render('core_success.tpl');
+		/*$this->set('message', 'The airport has been added');
+		$this->render('core_success.tpl');*/
 
 		LogData::addLog(Auth::$userinfo->pilotid, 'Added the airport "'.$this->post->icao.' - '.$this->post->name.'"');
 	}
 
 	protected function edit_airport_post()
 	{
 		if($this->post->icao == '' || $this->post->name == '' 
-				|| $this->post->country == '' || $this->post->lat == '' || $this->post->long == '')
+				|| $this->post->country == '' || $this->post->lat == '' || $this->post->lng == '')
 		{
 			$this->set('message', 'Some fields were blank!');
 			$this->render('core_message.tpl');
@@ -864,7 +867,7 @@ protected function edit_airport_post()
 			'name' => $this->post->name,
 			'country' => $this->post->country,
 			'lat' => $this->post->lat,
-			'lng' => $this->post->long,
+			'lng' => $this->post->lng,
 			'hub' => $this->post->hub,
 			'chartlink' => $this->post->chartlink,
 			'fuelprice' => $this->post->fuelprice

admin/templates/finance_expenseform.tpl

@@ -1,5 +1,5 @@
 <h3><?php echo $title;?></h3>
-<form id="form" action="<?php echo adminaction('/finances/viewexpenses');?>" method="post">
+<form id="form" action="<?php echo adminaction('/finance/viewexpenses');?>" method="post">
 <dl>
 <dt>* Expense Name:</dt>
 <dd><input name="name" type="text" value="<?php echo $expense->name; ?>" /></dd>

admin/templates/maintenance_changepilotid.tpl

@@ -1,6 +1,15 @@
 <p><b>NOTE:</b> Be VERY cautioned when changing a pilot ID. Even though this is 'controlled', problems can still occur. If you change the pilot ID to a number which is HIGHER than the highest pilot ID, all new registered pilots will have an ID starting after that. This WILL change their login ID. <b>This user cannot be logged in while doing the change.</b></p>
+<p>The PILOT ID is shown in the following format below:<br />
+<pre>FORMATTED_PILOT_ID - DATABASE_ID - NAME</pre>
+You must enter a new DATABASE_ID. The formatted pilow ID is based on the database ID and the offset. Your current offset is <strong><?php echo Config::Get('PILOTID_OFFSET');?></strong>.</p>
+<p>For example, you want the pilot ID to be VMS<?php echo Config::Get('PILOTID_OFFSET') + 200;?> - for the new ID you would enter: <?php echo 200 - intval(Config::Get('PILOTID_OFFSET'));?>. If your offset is 1000 (meaning all pilot IDs start from 1000), to have a pilot ID of 1030 you would change the DB ID to 30 (that's what you would enter below).
+</p>
+<p>
+	<strong>ID Calculator:</strong> Enter the intended pilot ID: <input type="text" value="" onKeyUp="showid(this.value);" /><br />
+	<span id="enterid"></span>
+</p>
+<hr>
 <form action="" method="post">
-
 <b>Select Pilot:</b><br />
 <select name="old_pilotid">
 <option value="0">Select a Pilot</option>
@@ -32,4 +41,18 @@
 <br />
 <p><b>Are you sure?</b></p>
 <input type="submit" name="submit" value="Confirm Change ID" />
-</form>
+</form>
+<script type="text/javascript">
+var OFFSET = <?php echo Config::Get('PILOTID_OFFSET')?>;
+function showid(value)
+{
+	value = parseInt(value);
+	if(value < OFFSET)
+	{
+		$("#enterid").html("The displayed pilot ID cannot be less than your offset");
+	}
+	
+	id = value - OFFSET;
+	$("#enterid").html("Enter \""+id+"\" in the field below (without quotes!)");
+}
+</script>

admin/templates/maintenance_options.tpl

@@ -106,4 +106,5 @@
 	<input type="text" name="cron" style="padding: 5px; width: 400px; " value="php -f <?php echo SITE_ROOT?>admin/maintenance.php" />
 </p>
 <p>It's recommended to run this sometime between 2-6am (pick an artibrary time when you would least-likely have any flights). 
-Also, remember to change in local.config.php, USE_CRON to true, so phpVMS doesn't try to automatically schedule these tasks to run.</p>
+Also, remember to change in local.config.php, USE_CRON to true, so phpVMS doesn't try to automatically schedule these tasks to run.</p>
+<p><strong>Note: </strong> If you setup the cron to run, it's recommended to also run it by hand once to ensure data is populated, unless you want to wait for it to run automatically.</p>

admin/templates/ops_airportform.tpl

@@ -1,5 +1,5 @@
 <h3><?php echo $title?></h3>
-<form id="form" action="<?php echo adminaction('/operations/airports');?>" method="post">
+<form id="flashForm" action="<?php echo adminaction('/operations/airports');?>" method="post">
 <dl>
 <dt>Airport ICAO Code *</dt>
 <dd><input id="airporticao" name="icao" type="text" value="<?php echo $airport->icao?>" /> 
@@ -18,7 +18,7 @@
 <dd><input id="airportlat" name="lat" type="text" value="<?php echo $airport->lat?>" /></dd>
 
 <dt>Longitude *</dt>
-<dd><input id="airportlong" name="long" type="text" value="<?php echo $airport->lng?>" /></dd>
+<dd><input id="airportlong" name="lng" type="text" value="<?php echo $airport->lng?>" /></dd>
 
 <dt>Chart Link</dt>
 <dd><input id="chartlink" name="chartlink" type="text" value="<?php echo $airport->chartlink?>" /></dd>
@@ -47,6 +47,7 @@
 </dd>
 </dl>
 </form>
+
 <script type="text/javascript">
 $("#airporticao").bind("blur", function()
 {

admin/templates/ops_airportlist.tpl

@@ -1,5 +1,5 @@
 <h3>Airports List</h3>
-
+<div id="results"></div>
 <table id="grid"></table>
 <div id="pager"></div>
 <br />

core/classes/Debug.class.php

@@ -106,6 +106,7 @@ public static function log($string, $filename = 'log')
 		if($filename == '')
 			$filename = 'log';
 
+		$time = date('m.d.y H:i:s');
 		$string = "=====\n"
 				 ."Time: {$time}\n"
 				 ."{$string}\n=====\n\n";

core/classes/ezdb/ezdb_base.class.php

@@ -635,14 +635,7 @@ public function build_select($params)
 
 		if(!empty($params['where']))
 		{
-			if(is_array($params['where']))
-			{
-				$sql .= $this->build_where($params['where']);
-			}
-			else
-			{
-				$sql .= $params['where'];
-			}
+			$sql .= $this->build_where($params['where']);
 		}
 
 		if(!empty($params['group']))