| 
                                                        @@ -9,7 +9,9 @@  discard block  | 
                                                    
                                                    
                                                         | 
                                                         | 
                                                         block discarded – undo  | 
                                                    
                                                                                                                                                                                                                    
                                                            | 
                                                                                                                                    9
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    9
                                                                                                                                                                                                 | 
                                                             if (strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') { | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    10
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    10
                                                                                                                                                                                                 | 
                                                             	exec("ps ux", $output, $result); | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    11
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    11
                                                                                                                                                                                                 | 
                                                             	$j = 0;  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    12
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -	foreach ($output as $line) if(strpos($line, "update_db.php") && !strpos($line, "sh ")) $j++;  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    12
                                                                                                                                                                                                 | 
                                                            +	foreach ($output as $line) { | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    13
                                                                                                                                                                                                 | 
                                                            +		if(strpos($line, "update_db.php") && !strpos($line, "sh ")) $j++;  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    14
                                                                                                                                                                                                 | 
                                                            +	}  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    13
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    15
                                                                                                                                                                                                 | 
                                                             	if ($j > 1) { | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    14
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    16
                                                                                                                                                                                                 | 
                                                             		echo "Script is already runnning...";  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    15
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    17
                                                                                                                                                                                                 | 
                                                             		die();  | 
                                                        
                                                                                                                                                        
                                                         | 
                                                        @@ -29,14 +31,18 @@  discard block  | 
                                                    
                                                    
                                                         | 
                                                         | 
                                                         block discarded – undo  | 
                                                    
                                                                                                                                                                                                                    
                                                            | 
                                                                                                                                    29
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    31
                                                                                                                                                                                                 | 
                                                             			$update_db->update_notam();  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    30
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    32
                                                                                                                                                                                                 | 
                                                             		}  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    31
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    33
                                                                                                                                                                                                 | 
                                                             		$update_db->insert_last_notam_update();  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    32
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -	} elseif (isset($globalDebug) && $globalDebug && isset($globalNOTAM) && $globalNOTAM) echo "NOTAM are only updated once a day.\n";  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    34
                                                                                                                                                                                                 | 
                                                            +	} elseif (isset($globalDebug) && $globalDebug && isset($globalNOTAM) && $globalNOTAM) { | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    35
                                                                                                                                                                                                 | 
                                                            +		echo "NOTAM are only updated once a day.\n";  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    36
                                                                                                                                                                                                 | 
                                                            +	}  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    33
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    37
                                                                                                                                                                                                 | 
                                                             	if ($update_db->check_last_update() && (!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS)) { | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    34
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    38
                                                                                                                                                                                                 | 
                                                             		$update_db->update_all();  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    35
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    39
                                                                                                                                                                                                 | 
                                                             	//	require_once(dirname(__FILE__).'/../require/class.Spotter.php');  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    36
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    40
                                                                                                                                                                                                 | 
                                                             	//	$Spotter = new Spotter();  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    37
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    41
                                                                                                                                                                                                 | 
                                                             	//	$Spotter->updateFieldsFromOtherTables();  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    38
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    42
                                                                                                                                                                                                 | 
                                                             		$update_db->insert_last_update();  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    39
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -	} elseif (isset($globalDebug) && $globalDebug && (!isset($globalVA) || !$globalVA) && (!isset($globalphpVMS) || !$globalphpVMS) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM)) echo "DB are populated with external data only every 15 days ! Files are not updated more often.\n";  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    43
                                                                                                                                                                                                 | 
                                                            +	} elseif (isset($globalDebug) && $globalDebug && (!isset($globalVA) || !$globalVA) && (!isset($globalphpVMS) || !$globalphpVMS) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM)) { | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    44
                                                                                                                                                                                                 | 
                                                            +		echo "DB are populated with external data only every 15 days ! Files are not updated more often.\n";  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    45
                                                                                                                                                                                                 | 
                                                            +	}  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    40
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    46
                                                                                                                                                                                                 | 
                                                             	if (isset($globalWaypoints) && $globalWaypoints && $update_db->check_last_airspace_update()) { | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    41
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    47
                                                                                                                                                                                                 | 
                                                             		echo "Check if new airspace version exist...";  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    42
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    48
                                                                                                                                                                                                 | 
                                                             		echo $update_db->update_airspace_fam();  | 
                                                        
                                                                                                                                                        
                                                         | 
                                                        @@ -45,8 +51,11 @@  discard block  | 
                                                    
                                                    
                                                         | 
                                                         | 
                                                         block discarded – undo  | 
                                                    
                                                                                                                                                                                                                    
                                                            | 
                                                                                                                                    45
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    51
                                                                                                                                                                                                 | 
                                                             	if (isset($globalGeoid) && $globalGeoid && $update_db->check_last_geoid_update()) { | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    46
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    52
                                                                                                                                                                                                 | 
                                                             		echo "Check if new geoid version exist...";  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    47
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    53
                                                                                                                                                                                                 | 
                                                             		$error = $update_db->update_geoid_fam();  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    48
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -		if ($error == '') $update_db->insert_last_geoid_update();  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    49
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -		else echo $error;  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    54
                                                                                                                                                                                                 | 
                                                            +		if ($error == '') { | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    55
                                                                                                                                                                                                 | 
                                                            +			$update_db->insert_last_geoid_update();  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    56
                                                                                                                                                                                                 | 
                                                            +		} else { | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    57
                                                                                                                                                                                                 | 
                                                            +			echo $error;  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    58
                                                                                                                                                                                                 | 
                                                            +		}  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    50
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    59
                                                                                                                                                                                                 | 
                                                             	}  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    51
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    60
                                                                                                                                                                                                 | 
                                                             	if (isset($globalMarine) && $globalMarine && $update_db->check_last_marine_identity_update()) { | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    52
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    61
                                                                                                                                                                                                 | 
                                                             		echo "Check if new marine identity version exist...";  | 
                                                        
                                                                                                                                                        
                                                         | 
                                                        @@ -64,7 +73,9 @@  discard block  | 
                                                    
                                                    
                                                         | 
                                                         | 
                                                         block discarded – undo  | 
                                                    
                                                                                                                                                                                                                    
                                                            | 
                                                                                                                                    64
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    73
                                                                                                                                                                                                 | 
                                                             			//echo "Done";  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    65
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    74
                                                                                                                                                                                                 | 
                                                             		}  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    66
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    75
                                                                                                                                                                                                 | 
                                                             		$update_db->insert_last_owner_update();  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    67
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -	} elseif (isset($globalDebug) && $globalDebug && (!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS)) echo "Owner are only updated every 15 days.\n";  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    76
                                                                                                                                                                                                 | 
                                                            +	} elseif (isset($globalDebug) && $globalDebug && (!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS)) { | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    77
                                                                                                                                                                                                 | 
                                                            +		echo "Owner are only updated every 15 days.\n";  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    78
                                                                                                                                                                                                 | 
                                                            +	}  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    68
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    79
                                                                                                                                                                                                 | 
                                                               | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    69
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    80
                                                                                                                                                                                                 | 
                                                             	if (isset($globalAccidents) && $globalAccidents && (!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS)) { | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    70
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    81
                                                                                                                                                                                                 | 
                                                             		require_once(dirname(__FILE__).'/../require/class.Accident.php');  | 
                                                        
                                                                                                                                                        
                                                         | 
                                                        @@ -73,7 +84,9 @@  discard block  | 
                                                    
                                                    
                                                         | 
                                                         | 
                                                         block discarded – undo  | 
                                                    
                                                                                                                                                                                                                    
                                                            | 
                                                                                                                                    73
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    84
                                                                                                                                                                                                 | 
                                                             		if ($Accident->check_last_accidents_update()) { | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    74
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    85
                                                                                                                                                                                                 | 
                                                             			$Accident->download_update();  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    75
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    86
                                                                                                                                                                                                 | 
                                                             			$Accident->insert_last_accidents_update();  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    76
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -		} else echo "Accidents are updated once a day.\n";  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    87
                                                                                                                                                                                                 | 
                                                            +		} else { | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    88
                                                                                                                                                                                                 | 
                                                            +			echo "Accidents are updated once a day.\n";  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    89
                                                                                                                                                                                                 | 
                                                            +		}  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    77
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    90
                                                                                                                                                                                                 | 
                                                             	}  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    78
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    91
                                                                                                                                                                                                 | 
                                                                 | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    79
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    92
                                                                                                                                                                                                 | 
                                                             }  | 
                                                        
                                                                                                                                                        
                                                         | 
                                                        @@ -86,15 +99,19 @@  discard block  | 
                                                    
                                                    
                                                         | 
                                                         | 
                                                         block discarded – undo  | 
                                                    
                                                                                                                                                                                                                    
                                                            | 
                                                                                                                                    86
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    99
                                                                                                                                                                                                 | 
                                                             	if ($METAR->check_last_update()) { | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    87
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    100
                                                                                                                                                                                                 | 
                                                             		$METAR->addMETARCycle();  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    88
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    101
                                                                                                                                                                                                 | 
                                                             		$METAR->insert_last_update();  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    89
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -	} else echo "METAR are only updated every 30 minutes.\n";  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    90
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -}  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    102
                                                                                                                                                                                                 | 
                                                            +	} else { | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    103
                                                                                                                                                                                                 | 
                                                            +		echo "METAR are only updated every 30 minutes.\n";  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    104
                                                                                                                                                                                                 | 
                                                            +	}  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    105
                                                                                                                                                                                                 | 
                                                            +	}  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    91
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    106
                                                                                                                                                                                                 | 
                                                               | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    92
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    107
                                                                                                                                                                                                 | 
                                                             if (isset($globalSchedules) && $globalSchedules && $update_db->check_last_schedules_update() && (!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS)) { | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    93
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    108
                                                                                                                                                                                                 | 
                                                             	echo "Updating schedules...";  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    94
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    109
                                                                                                                                                                                                 | 
                                                             	//$update_db->update_oneworld();  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    95
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    110
                                                                                                                                                                                                 | 
                                                             	$update_db->update_skyteam();  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    96
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    111
                                                                                                                                                                                                 | 
                                                             	$update_db->insert_last_schedules_update();  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    97
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -} elseif (isset($globalDebug) && $globalDebug && isset($globalOwner) && $globalOwner && (!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS)) echo "Schedules are only updated every 15 days.\n";  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    112
                                                                                                                                                                                                 | 
                                                            +} elseif (isset($globalDebug) && $globalDebug && isset($globalOwner) && $globalOwner && (!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS)) { | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    113
                                                                                                                                                                                                 | 
                                                            +	echo "Schedules are only updated every 15 days.\n";  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    114
                                                                                                                                                                                                 | 
                                                            +}  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    98
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    115
                                                                                                                                                                                                 | 
                                                               | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    99
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    116
                                                                                                                                                                                                 | 
                                                             if (isset($globalArchiveMonths) && $globalArchiveMonths > 0) { | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    100
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    117
                                                                                                                                                                                                 | 
                                                             	echo "Updating statistics and archive old data...";  |