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

Commit 57621ae

Browse files
author
Nabeel Shahzad
committed
Error level fixes
1 parent c01bb9b commit 57621ae

File tree

6 files changed

+113
-113
lines changed

6 files changed

+113
-113
lines changed

action.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@
4343

4444
define('SITE_ROOT', dirname(__FILE__));
4545
include 'core/codon.config.php';
46-
error_reporting(E_ALL ^ E_NOTICE);
47-
46+
error_reporting(E_ALL ^ E_NOTICE ^ E_STRICT);
47+
4848
$BaseTemplate = new TemplateSet;
4949

5050
//load the main skin
@@ -60,4 +60,4 @@
6060
MainController::RunAllActions();
6161

6262
# Force connection close
63-
DB::close();
63+
DB::close();

admin/action.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646

4747
include '../core/codon.config.php';
4848

49-
error_reporting(E_ALL ^ E_NOTICE);
49+
error_reporting(E_ALL ^ E_NOTICE ^ E_WARNING ^ E_STRICT);
5050

5151
if(!Auth::LoggedIn() || !PilotGroups::group_has_perm(Auth::$usergroups, ACCESS_ADMIN))
5252
{

core/app.config.php

Lines changed: 92 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,19 @@
1818

1919
/**
2020
* DO NOT MODIFY THESE SETTINGS HERE!!
21-
* They will get over-ridden in an update. These are just defaults
21+
* They will get over-ridden in an update. These are just defaults
2222
* To change, copy-paste and change the line/option/setting into your
2323
* local.config.php file
2424
*
2525
* Most of these are in your local.config.php already
26-
*
26+
*
2727
* View the docs for details about these settings
2828
*/
2929

3030
# Debug mode is off by default
3131
Config::Set('DEBUG_MODE', false);
3232
Config::Set('DEBUG_LEVEL', 1); // 1 logs query errors, 2 logs all queries
33-
Config::Set('ERROR_LEVEL', E_ALL ^ E_NOTICE);
33+
Config::Set('ERROR_LEVEL', E_ALL ^ E_NOTICE ^ E_WARNING ^ E_STRICT);
3434

3535
# Page encoding options
3636
Config::Set('PAGE_ENCODING', 'UTF-8');
@@ -45,7 +45,7 @@
4545
Config::Set('PILOTID_OFFSET', 0); # What # to start pilot ID's from
4646
Config::Set('PILOTID_LENGTH', 4); # Length of the Pilot ID
4747
Config::Set('UNITS', 'nm'); # Your units: nm, mi or km
48-
Config::Set('LOAD_FACTOR', '82'); # %age load factor
48+
Config::Set('LOAD_FACTOR', '82'); # %age load factor
4949
Config::Set('CARGO_UNITS', 'lbs');
5050
Config::Set('DEFAULT_MAX_CARGO_LOAD', 10000);
5151
Config::Set('DEFAULT_MAX_PAX_LOAD', 250);
@@ -109,7 +109,7 @@
109109
# ACARS options
110110
# Minutes, flights to show on the ACARS
111111
# Default is 720 minutes (12 hours)
112-
Config::Set('ACARS_LIVE_TIME', 720);
112+
Config::Set('ACARS_LIVE_TIME', 720);
113113
Config::Set('ACARS_DEBUG', false);
114114

115115
/*
@@ -118,28 +118,28 @@
118118
Euro (�), enter "€"
119119
Yen (�), enter "¥"
120120
Pounds (�), enter "£"
121-
121+
122122
For example, to set EUROS:
123123
Config::Set('MONEY_UNIT', '€');
124124
*/
125-
125+
126126
Config::Set('MONEY_UNIT', '$');
127127

128128
/*
129129
To change the money format, look at:
130130
http://us3.php.net/money_format
131-
131+
132132
However, I do not recommend changing this
133133
*/
134-
134+
135135
Config::Set('MONEY_FORMAT', '%(#10n');
136136

137137

138138
# Fuel info
139139
/* Default fuel price, for airports that don't have
140140
And the surcharge percentage. View the docs
141141
for more details about these
142-
*/
142+
*/
143143
Config::Set('FUEL_GET_LIVE_PRICE', true);
144144
Config::Set('FUEL_DEFAULT_PRICE', '5.10');
145145
Config::Set('FUEL_SURCHARGE', '5');
@@ -149,16 +149,16 @@
149149
Config::Set('WeightUnit', '1'); # 0=Kg 1=lbs
150150
Config::Set('DistanceUnit', '2'); # 0=KM 1= Miles 2=NMiles
151151
Config::Set('SpeedUnit', '1'); # 0=Km/H 1=Kts
152-
Config::Set('AltUnit', '1'); # 0=Meter 1=Feet
152+
Config::Set('AltUnit', '1'); # 0=Meter 1=Feet
153153
Config::Set('LiquidUnit', '3'); # 0=liter 1=gal 2=kg 3=lbs
154154
Config::Set('WelcomeMessage', 'phpVMS/FSPAX ACARS'); # Welcome Message
155155
Config::Set('LIQUID_UNIT_NAMES', array('liter','gal','kg', 'lbs'));
156156

157157
/* FSFK Settings
158158
Your FTP Server, and path to the lib/images folder (from where the FTP connects from), IE
159159
ftp://phpvms.net/phpvms/lib/fsfk or ftp://phpvms.net/public_html/phpvms/lib/fsfk
160-
161-
You want the path from when you connect to the FTP down to where the /lib/fsfk folder is
160+
161+
You want the path from when you connect to the FTP down to where the /lib/fsfk folder is
162162
*/
163163
Config::Set('FSFK_FTP_SERVER', '');
164164
Config::Set('FSFK_FTP_PORT', '21');
@@ -167,14 +167,14 @@
167167
Config::Set('FSFK_FTP_PASSIVE_MODE', 'TRUE');
168168
Config::Set('FSFK_IMAGE_PATH', '/lib/fsfk'); // web path from SITE_ROOT
169169

170-
# Options for the signature that's generated
170+
# Options for the signature that's generated
171171
Config::Set('SIGNATURE_TEXT_COLOR', '#000');
172172
Config::Set('SIGNATURE_USE_CUSTOM_FONT', true);
173173
Config::Set('SIGNATURE_FONT_PATH', SITE_ROOT.'/lib/fonts/tahoma.ttf');
174174
Config::Set('SIGNATURE_FONT_SIZE', '10');
175175
Config::Set('SIGNATURE_X_OFFSET', '10');
176176
Config::Set('SIGNATURE_Y_OFFSET', '17');
177-
Config::Set('SIGNATURE_FONT_PADDING', 4);
177+
Config::Set('SIGNATURE_FONT_PADDING', 4);
178178
Config::Set('SIGNATURE_SHOW_EARNINGS', true);
179179
Config::Set('SIGNATURE_SHOW_RANK_IMAGE', true);
180180
Config::Set('SIGNATURE_SHOW_COPYRIGHT', true);
@@ -216,7 +216,7 @@
216216
phpvms will use the phpVMS API server
217217
*/
218218

219-
Config::Set('AIRPORT_LOOKUP_SERVER', 'geonames');
219+
Config::Set('AIRPORT_LOOKUP_SERVER', 'geonames');
220220
Config::Set('PHPVMS_API_SERVER', 'http://api.phpvms.net');
221221
Config::Set('PHPVMS_NEWS_FEED', 'http://feeds.feedburner.com/phpvms');
222222
Config::Set('VACENTRAL_NEWS_FEED', 'http://feeds.feedburner.com/vacentral');
@@ -242,7 +242,7 @@
242242
*/
243243
Config::Set('DAYS_COMPACT', array('Su', 'M', 'T', 'W', 'Th', 'F', 'S', 'Su'));
244244

245-
Config::Set('DAYS_LONG',
245+
Config::Set('DAYS_LONG',
246246
array('Sunday',
247247
'Monday',
248248
'Tuesday',
@@ -260,38 +260,38 @@
260260

261261
/**
262262
* *******************************************************
263-
*
264-
*
265-
*
266-
*
267-
*
268-
*
263+
*
264+
*
265+
*
266+
*
267+
*
268+
*
269269
* Advanced options, don't edit unless you
270270
* know what you're doing!!
271-
*
271+
*
272272
* Actually, don't change them, at all. Please.
273273
* For your sake. And mine. :)
274-
*
275-
*
276-
*
277-
*
278-
*
279-
*
280-
*
281-
*
282-
*
283-
*
284-
*
285-
*
286-
*
287-
*
288-
*
289-
*
290-
*
291-
*
292-
*
293-
*
294-
*
274+
*
275+
*
276+
*
277+
*
278+
*
279+
*
280+
*
281+
*
282+
*
283+
*
284+
*
285+
*
286+
*
287+
*
288+
*
289+
*
290+
*
291+
*
292+
*
293+
*
294+
*
295295
*/
296296

297297
$revision = file_get_contents(CORE_PATH.'/version');
@@ -305,19 +305,19 @@
305305
Config::Set('BASE_TEMPLATE_PATH', SITE_ROOT.'/core/templates');
306306

307307
if(defined('ADMIN_PANEL') && ADMIN_PANEL === true)
308-
{
308+
{
309309
Template::SetTemplatePath(SITE_ROOT.'/admin/templates');
310-
310+
311311
define('CODON_MODULES_PATH', SITE_ROOT.'/admin/modules');
312312
define('CODON_DEFAULT_MODULE', 'Dashboard');
313313
}
314-
else
315-
{
314+
else
315+
{
316316
Template::SetTemplatePath(Config::Get('BASE_TEMPLATE_PATH'));
317-
317+
318318
define('CODON_MODULES_PATH', SITE_ROOT.'/core/modules');
319319
define('CODON_DEFAULT_MODULE', 'Frontpage');
320-
320+
321321
/*Config::Set('MODULES_PATH', SITE_ROOT.'/core/modules');
322322
Config::Set('DEFAULT_MODULE', 'Frontpage');
323323
Config::Set('MODULES_AUTOLOAD', true);*/
@@ -333,19 +333,19 @@
333333
'default' => array(
334334
'duration' => '+10 minutes',
335335
),
336-
336+
337337
'short' => array(
338338
'duration' => '+3 minutes',
339339
),
340-
340+
341341
'15minute' => array(
342342
'duration' => '+15 minutes',
343343
),
344-
344+
345345
'medium' => array(
346346
'duration' => '+1 hour',
347347
),
348-
348+
349349
'long' => array(
350350
'duration' => '+6 hours'
351351
),
@@ -379,36 +379,36 @@
379379

380380

381381
Config::Set('TABLE_LIST', array(
382-
'acarsdata',
383-
'adminlog',
384-
'aircraft',
385-
'airlines',
386-
'airports',
387-
'awards',
382+
'acarsdata',
383+
'adminlog',
384+
'aircraft',
385+
'airlines',
386+
'airports',
387+
'awards',
388388
'awardsgranted',
389389
'bids',
390390
'customfields',
391-
'downloads',
392-
'expenselog',
393-
'expenses',
394-
'fieldvalues',
395-
'financedata',
396-
'fuelprices',
397-
'groupmembers',
398-
'groups',
399-
'navdata',
400-
'news',
401-
'pages',
402-
'pilots',
403-
'pirepcomments',
404-
'pirepfields',
405-
'pireps',
406-
'pirepvalues',
407-
'ranks',
408-
'schedules',
409-
'sessions',
410-
'settings',
411-
'updates'
391+
'downloads',
392+
'expenselog',
393+
'expenses',
394+
'fieldvalues',
395+
'financedata',
396+
'fuelprices',
397+
'groupmembers',
398+
'groups',
399+
'navdata',
400+
'news',
401+
'pages',
402+
'pilots',
403+
'pirepcomments',
404+
'pirepfields',
405+
'pireps',
406+
'pirepvalues',
407+
'ranks',
408+
'schedules',
409+
'sessions',
410+
'settings',
411+
'updates'
412412
)
413413
);
414414

@@ -422,26 +422,26 @@
422422
/**
423423
* Constants
424424
* Do not modify these! All sorts of weird shit can happen
425-
*/
425+
*/
426426
# Set the type of flights we have
427427
Config::Set(
428-
'FLIGHT_TYPES', array(
428+
'FLIGHT_TYPES', array(
429429
'P'=>'Passenger',
430430
'C'=>'Cargo',
431431
'H'=>'Charter'
432432
)
433433
);
434-
434+
435435
# Set the types of expenses we have
436436
Config::Set(
437-
'EXPENSE_TYPES', array(
437+
'EXPENSE_TYPES', array(
438438
'M'=>'Monthly',
439439
'F'=>'Per Flight',
440440
'P'=>'Percent (month)',
441441
'G'=>'Percent (per flight)'
442442
)
443443
);
444-
444+
445445
define('SIGNATURE_PATH', '/lib/signatures');
446446
define('AVATAR_PATH', '/lib/avatars');
447447

@@ -476,10 +476,10 @@
476476
# Bit-masks for permission sets
477477
$permission_set = array
478478
(/*'NO_ADMIN_ACCESS' => 0,*/
479-
'EDIT_NEWS' => 0x1,
480-
'EDIT_PAGES' => 0x2,
479+
'EDIT_NEWS' => 0x1,
480+
'EDIT_PAGES' => 0x2,
481481
'EDIT_DOWNLOADS' => 0x4,
482-
'EMAIL_PILOTS' => 0x8,
482+
'EMAIL_PILOTS' => 0x8,
483483
'EDIT_AIRLINES' => 0x10,
484484
'EDIT_FLEET' => 0x20,
485485
'EDIT_SCHEDULES' => 0x80,
@@ -499,9 +499,9 @@
499499
'ACCESS_ADMIN' => 0x2000000,
500500
'FULL_ADMIN' => 35651519);
501501

502-
Config::Set('permission_set', $permission_set);
502+
Config::Set('permission_set', $permission_set);
503503
define('NO_ADMIN_ACCESS', 0);
504504
foreach($permission_set as $key=>$value)
505505
{
506506
define($key, $value);
507-
}
507+
}

0 commit comments

Comments
 (0)