fixed issues with core and db, speed fixes

git-svn-id: file:///var/svn/phpvms/trunk@921 e188d3d8-5a48-0410-b2de-ed2772025908

Author: nshahzad

Diff for: action.php

@@ -57,7 +57,7 @@
 Template::Set('MODULE_NAV_INC', $NAVBAR);
 Template::Set('MODULE_HEAD_INC', $HTMLHead);
 
-MainController::RunAllActions(Config::Get('RUN_MODULE'));
+MainController::RunAllActions();
 
 # Force connection close
 DB::close();

Diff for: admin/action.php

@@ -55,10 +55,7 @@
 }
 
 Template::SetTemplatePath(dirname(__FILE__).'/templates');
-//$modules = MainController::getModulesFromPath(dirname(__FILE__).'/modules');
-//MainController::loadModules($modules);
-
-MainController::RunAllActions();
+MainController::runAllActions();
 
 # Force connection close
 DB::close();

Diff for: admin/index.php

@@ -82,7 +82,7 @@
 
 flush();
 
-MainController::RunAllActions(Config::Get('RUN_MODULE'));
+MainController::runAllActions();
 
 $BaseTemplate->Show('footer.tpl');
 

Diff for: admin/modules/Operations/Operations.php

@@ -131,13 +131,13 @@ public function editairline()
 
 	public function calculatedistance($depicao='', $arricao='')
 	{
+		cndebug(print_r($this->get, true));
 		if($depicao == '')
 			$depicao = $this->get->depicao;
 
 		if($arricao == '')
 			$arricao = $this->get->arricao;
 
-			
 		echo OperationsData::getAirportDistance($depicao, $arricao);
 	}
 

Diff for: admin/modules/PilotAdmin/PilotAdmin.php

@@ -286,13 +286,100 @@ public function pilotawards()
 		$this->set('allawards', AwardsData::GetPilotAwards($_REQUEST['pilotid']));
 		$this->render('pilots_awards.tpl');
 	}
-		
+	
 	protected function ShowPilotsList()
 	{
-		$this->set('allpilots', PilotData::GetAllPilots(Vars::GET('letter')));
 		$this->render('pilots_list.tpl');
 	}
 
+	public function getpilotsjson()
+	{
+		$page = $this->get->page; // get the requested page 
+		$limit = $this->get->rows; // get how many rows we want to have into the grid 
+		$sidx = $this->get->sidx; // get index row - i.e. user click to sort 
+		$sord = $this->get->sord; // get the direction 
+		if(!$sidx) $sidx =1;
+		
+		/* Do the search using jqGrid */
+		$where = array();
+		if($this->get->_search == 'true') 
+		{
+			$searchstr = jqgrid::strip($this->get->filters);
+			$where_string = jqgrid::constructWhere($searchstr);
+			
+			# Append to our search, add 1=1 since it comes with AND
+			#	from above
+			$where[] = "1=1 {$where_string}";
+		}
+		
+		Config::Set('PILOT_ORDER_BY', "{$sidx} {$sord}");
+		
+		# Do a search without the limits so we can find how many records
+		$count = count(PilotData::findPilots($where));
+		
+		if($count > 0) 
+		{
+			$total_pages = ceil($count/$limit);
+		} 
+		else 
+		{
+			$total_pages = 0;
+		}
+		
+		if ($page > $total_pages) 
+		{
+			$page = $total_pages;
+		}
+		
+		$start = $limit * $page - $limit; // do not put $limit*($page - 1)
+		if ($start < 0) 
+		{
+			$start = 0;
+		}
+		
+		# And finally do a search with the limits
+		$allpilots = PilotData::findPilots($where, $limit, $start);
+		
+		# Form the json header
+		$json = array(
+			'page' => $page,
+			'total' => $total_pages,
+			'records' => $count,
+			'rows' => array()
+		);
+		
+		# Add each row to the above array
+		foreach($allpilots as $row)
+		{
+			$status = ($row->retired==0) ? 'Active' : 'Retired';
+			$location = '<img src="'.Countries::getCountryImage($row->location).'" alt="'.$row->location.'" />';
+			$edit = '<a href="'.adminurl('/pilotadmin/viewpilots?action=viewoptions&pilotid='.$row->pilotid).'">Edit</a>';
+			
+			$tmp = array(
+				'id' => $row->id,
+				'cell' => array(
+					# Each column, in order
+					$row->id,
+					$row->firstname,
+					$row->lastname,
+					$row->email,
+					$location,
+					$status,
+					$row->rank,
+					$row->totalflights,
+					$row->totalhours,
+					$row->lastip,
+					$edit,
+				),
+			);
+			
+			$json['rows'][] = $tmp;
+		}
+		
+		header("Content-type: text/x-json");
+		echo json_encode($json);
+	}
+			
 	protected function ViewPilotDetails()
 	{
 		//This is for the main tab

Diff for: admin/templates/ops_scheduleform.tpl

@@ -29,12 +29,12 @@
 </tr>
 <tr>
 	<td width="3%" nowrap><strong>Departure Airport:</strong></td>
-	<td><input name="depicao" class="airport_select" value="<?php echo $schedule->depicao;?>" onclick="" />
+	<td><input id="depicao" name="depicao" class="airport_select" value="<?php echo $schedule->depicao;?>" onclick="" />
 	</td>
 </tr>
 <tr>
 	<td><strong>Arrival Airport:</strong></td>
-	<td><input name="arricao" class="airport_select" value="<?php echo $schedule->arricao;?>" onclick="" />
+	<td><input id="arricao" name="arricao" class="airport_select" value="<?php echo $schedule->arricao;?>" onclick="" />
 	</td>
 </tr>
 <tr>
@@ -174,9 +174,7 @@ $(".preview").click(function()
 		+"&arricao="+arricao
 		+"&route="+route;
 			
-	$('#jqmdialog').jqm({
-        ajax: url
-	}).jqmShow();
+	$('#jqmdialog').jqm({ajax: url}).jqmShow();
 	
 	return false;
 });

Diff for: admin/templates/pilots_list.tpl

@@ -1,58 +1,43 @@
 <h3>Pilots List</h3>
-<div align="center">
-	Find by Last Name: <a href="?admin=viewpilots&letter=">View All</a>
-<?php
-for($i=65;$i<91;$i++)
-{
-	echo '<a href="'.SITE_URL.'/admin/index.php/pilotadmin/viewpilots?letter='.chr($i).'">'.chr($i).'</a> ';
-}
-?>
-</div>
+
+<table id="grid"></table>
+<div id="pager"></div>
 <br />
-<?php
-if(!$allpilots)
-{
-	echo '<p>There are no pilots!</p>';
-	return;
-}
-?>
-<table id="tabledlist" class="tablesorter">
-<thead>
-<tr>
-	<th width="1%">Pilot ID</th>
-	<th>Pilot Name</th>
-	<th>Email</th>
-	<th>Location</th>
-	<th>Status</th>
-	<th nowrap="nowrap" align="center">Rank</th>
-	<th nowrap="">Total Flights</th>
-	<th nowrap="">Total Hours</th>
-	<th>Last IP</th>
-	<th>Options</th>
-</tr>
-</thead>
-<tbody>
-<?php
-foreach($allpilots as $pilot)
-{
-?>
-<tr>
-	<td nowrap><?php echo PilotData::GetPilotCode($pilot->code, $pilot->pilotid);?> </td>
-	<td width="1%" nowrap><a href="<?php echo SITE_URL?>/admin/index.php/pilotadmin/viewpilots?action=viewoptions&pilotid=<?php echo $pilot->pilotid;?>"><?php echo $pilot->firstname . ' ' . $pilot->lastname; ?></a></td>
-	<td align="left"><?php echo $pilot->email; ?></td>
-	<td align="center" width="1%"><img src="<?php echo Countries::getCountryImage($pilot->location);?>" </td>
-	<td align="center" width="1%"><?php echo ($pilot->retired==0) ? 'Active' : 'Retired'; ?></td>
-	<td align="center" width="1%" nowrap=""><?php echo $pilot->rank; ?></td>
-	<td align="center" width="1%"><?php echo $pilot->totalflights; ?></td>
-	<td align="center" width="1%"><?php echo $pilot->totalhours; ?></td>
-	<td align="center" width="1%"><?php echo $pilot->lastip; ?></td>
-	<td align="center" width="1%" nowrap>
-		<button class="{button:{icons:{primary:'ui-icon-wrench'}}}"
-			onclick="window.location='<?php echo SITE_URL?>/admin/index.php/pilotadmin/viewpilots?action=viewoptions&pilotid=<?php echo $pilot->pilotid;?>';">
-			Edit</button></td>
-</tr>
-<?php
-}
-?>
-</tbody>
-</table>
+
+<link rel="stylesheet" type="text/css" media="screen" href="<?php echo fileurl('/lib/js/jqgrid/css/ui.jqgrid.css');?>" />
+<script src="<?php echo fileurl('/lib/js/jqgrid/js/i18n/grid.locale-en.js');?>" type="text/javascript"></script>
+<script src="<?php echo fileurl('/lib/js/jqgrid/js/jquery.jqGrid.min.js');?>" type="text/javascript"></script>
+
+<script type="text/javascript">
+$("#grid").jqGrid({
+   url: '<?php echo adminaction('/pilotadmin/getpilotsjson');?>',
+   datatype: 'json',
+   mtype: 'GET',
+   colNames: ['','First', 'Last', 'Email', 'Location', 'Status', 'Rank', 'Flights', 'Hours', 'IP', 'Edit'],
+   colModel : [
+		{index: 'id', name: 'id', hidden: true, search: false },
+		{index: 'firstname', name : 'firstname',sortable : true, align: 'left', search: 'true', searchoptions:{sopt:['in']}},
+		{index: 'lastname', name : 'lastname',  sortable : true, align: 'left', searchoptions:{sopt:['in']}},
+		{index: 'email', name : 'email', sortable : true, align: 'left',searchoptions:{sopt:['li']}},
+		{index: 'location', name : 'location',  sortable : true, align: 'center',searchoptions:{sopt:['eq','ne']}},
+		{index: 'status', name : 'status', sortable : true, align: 'center',searchoptions:{sopt:['in']}},
+		{index: 'rank', name : 'rank', sortable : true, align: 'center', searchoptions:{sopt:['eq','ne']}},
+		{index: 'totalflights', name : 'totalflights', sortable : true, align: 'center',searchoptions:{sopt:['lt','gt']}},
+		{index: 'totalhours', name : 'totalhours', sortable : true, align: 'center',searchoptions:{sopt:['lt','gt']}},
+		{index: 'lastip', name : 'lastip', sortable : true, align: 'center', searchoptions:{sopt:['in']}},
+		{index: '', name : '', sortable : true, align: 'center', search: false}
+	],
+    pager: '#pager', rowNum: 25,
+    sortname: 'lastname', sortorder: 'asc',
+    viewrecords: true, autowidth: true,
+    height: '100%'
+});
+
+jQuery("#grid").jqGrid('navGrid','#pager', 
+	{edit:false,add:false,del:false,search:true,refresh:true},
+	{}, // edit 
+	{}, // add 
+	{}, //del 
+	{multipleSearch:true} // search options 
+); 
+</script>

Diff for: admin/templates/pilots_options.tpl

@@ -30,10 +30,21 @@ if($pilotid != Auth::$userinfo->pilotid)
 	<dt></dt>
 	<dd><input type="hidden" name="pilotid" value="<?php echo $pilotid;?>" />
 		<input type="hidden" name="action" value="deletepilot" />
-		<input type="submit" name="submit" value="Delete Pilot" /></dd>
+		<input type="submit" name="submit" onclick="return doublecheck();" value="Delete Pilot" /></dd>
 </dl>
 </form>
 <?php
 }
 }
-?>
+?>
+<script type="text/javascript">
+function doublecheck()
+{
+	var answer = confirm("Are you sure you want to delete?")
+	if (answer) {
+		return true;
+	}
+	
+	return false;
+}
+</script>

Diff for: core/app.config.php

@@ -307,36 +307,17 @@
 {	
 	Template::SetTemplatePath(SITE_ROOT.'/admin/templates');
 
-	Config::Set('RUN_SINGLE_MODULE', true);
 	Config::Set('MODULES_PATH', SITE_ROOT.'/admin/modules');
 	Config::Set('DEFAULT_MODULE', 'Dashboard');
 	Config::Set('MODULES_AUTOLOAD', true);
-	Config::Set('ACTIVE_MODULES', array());
-	
-	CodonRewrite::AddRule('default', array('page'));
 }
 else 
 {	
 	Template::SetTemplatePath(Config::Get('BASE_TEMPLATE_PATH'));
 
-	Config::Set('RUN_SINGLE_MODULE', true);
 	Config::Set('MODULES_PATH', SITE_ROOT.'/core/modules');
 	Config::Set('DEFAULT_MODULE', 'Frontpage');
 	Config::Set('MODULES_AUTOLOAD', true);
-	Config::Set('ACTIVE_MODULES', array());
-	
-	/* Deprecated!!!! */
-	/* Rules for the controllers */
-	CodonRewrite::AddRule('default', array('page'));
-	CodonRewrite::AddRule('acars', array('page', 'action'));
-	CodonRewrite::AddRule('downloads', array('id'));
-	CodonRewrite::AddRule('login', array('page', 'redir'));
-	CodonRewrite::AddRule('logout', array('page', 'redir'));
-	CodonRewrite::AddRule('pireps', array('page', 'id', 'icao'));
-	CodonRewrite::AddRule('pilots', array('page', 'pilotid'));
-	CodonRewrite::AddRule('profile', array('page', 'pilotid'));
-	CodonRewrite::AddRule('schedules', array('page', 'id'));
-	CodonRewrite::AddRule('xml', array('request'));
 }
 
 /* Cache settings */

Diff for: core/bootstrap.inc.php

@@ -76,6 +76,15 @@ function post_module_load()
 	}
 
 	// @TODO: Clean ACARS records older than one month
+	if(Config::Get('MAINTENANCE_MODE') == true  
+		&& !Auth::LoggedIn() 
+		&& !PilotGroups::group_has_perm(Auth::$usergroups, FULL_ADMIN))
+	{
+		echo '<html><head><title>Down for maintenance - '.SITE_NAME.'</title></head><body>';
+		Debug::showCritical(Config::Get('MAINTENANCE_MESSAGE'), 'Down for maintenance');
+		echo '</body></html>';
+		die();
+	}
 
    return true;
 }