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

Commit b17d2fb

Browse files
author
nshahzad
committed
VMS-253 VMS-254 VMS-255 VMS-256 VMS-257 #resolve fixed
git-svn-id: file:///var/svn/phpvms/trunk@922 e188d3d8-5a48-0410-b2de-ed2772025908
1 parent 4e97aac commit b17d2fb

File tree

12 files changed

+42
-44
lines changed

12 files changed

+42
-44
lines changed

‎admin/modules/Operations/Operations.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,6 @@ public function schedulegrid()
382382
'id' => $row->id,
383383
'cell' => array(
384384
# Each column, in order
385-
$row->id,
386385
$row->code,
387386
$row->flightnum,
388387
$row->depicao,

‎admin/templates/ops_schedules.tpl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,9 @@ $("#grid").jqGrid({
1313
url: '<?php echo adminaction('/operations/schedulegrid');?>',
1414
datatype: 'json',
1515
mtype: 'GET',
16-
colNames: ['','Code', 'Flight Num', 'Departure', 'Arrival', 'Aircraft', 'Registration', 'Route', 'Days',
16+
colNames: ['Code', 'Flight Num', 'Departure', 'Arrival', 'Aircraft', 'Registration', 'Route', 'Days',
1717
'Distance', 'Flown', 'Edit', 'Delete'],
1818
colModel : [
19-
{index: 'id', name: 'id', hidden: true, search: false },
2019
{index: 'code', name : 'code', width: 40, sortable : true, align: 'center', search: 'true', searchoptions:{sopt:['eq','ne']}},
2120
{index: 'flightnum', name : 'flightnum', width: 65, sortable : true, align: 'center', searchoptions:{sopt:['eq','ne']}},
2221
{index: 'depicao', name : 'depicao', width: 60, sortable : true, align: 'center',searchoptions:{sopt:['eq','ne']}},
@@ -55,7 +54,8 @@ function deleteschedule(id)
5554
5655
function showroute(schedule_id)
5756
{
58-
$('#jqmdialog').jqm({ajax:'<?php echo adminaction('/operations/viewmap');?>?type=schedule&id='+schedule_id});
59-
$("#jqmdialog").jqmShow();
57+
$('#jqmdialog').jqm({
58+
ajax:'<?php echo adminaction('/operations/viewmap');?>?type=schedule&id='+schedule_id
59+
}).jqmShow();
6060
}
6161
</script>

‎core/app.config.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434

3535
# Page encoding options
3636
Config::Set('PAGE_ENCODING', 'UTF-8');
37+
Config::Set('DB_CHARSET_NAME', 'utf8');
3738

3839
# Maintenance mode - this disables the site to non-admins
3940
Config::Set('MAINTENANCE_MODE', false);

‎core/classes/MainController.class.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public static function loadEngineTasks()
5252
CodonRewrite::ProcessRewrite();
5353
Vars::setParameters();
5454

55-
self::$activeModule = CodonRewrite::$current_module;
55+
self::$activeModule = strtoupper(CodonRewrite::$current_module);
5656
Config::loadSettings();
5757
self::loadModules();
5858
}

‎core/classes/ezdb/ezdb_mysql.class.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ public function query($query)
260260
{
261261
// Take note of column info
262262
$i=0;
263-
263+
$num_rows = 0;
264264
if(is_resource($this->result))
265265
{
266266
while ($i < mysql_num_fields($this->result))
@@ -270,8 +270,6 @@ public function query($query)
270270
}
271271

272272
// Store Query Results
273-
$num_rows=0;
274-
275273
while($row = mysql_fetch_object($this->result))
276274
{
277275
// Store relults as an objects within main array

‎core/classes/ezdb/ezdb_mysqli.class.php

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -261,25 +261,19 @@ public function query($query)
261261
$is_insert = true;
262262
}
263263

264-
// Return number fo rows affected
264+
// Return number of rows affected
265265
$return_val = $this->rows_affected;
266266
}
267267
// Query was a select
268268
else
269269
{
270270
// Take note of column info
271-
$i=0;
272-
273-
if($result)
274-
{
275-
while ($finfo = $result->fetch_field())
276-
{
277-
$this->col_info[$i] = $finfo;
278-
$i++;
279-
}
280-
271+
$num_rows = 0;
272+
if($result instanceof MySQLi_Result)
273+
{
274+
$this->col_info = $result->fetch_fields();
275+
281276
// Store Query Results
282-
$num_rows=0;
283277
while($row = $result->fetch_object())
284278
{
285279
$this->last_result[$num_rows] = $row;

‎core/codon.config.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,12 @@
106106
Debug::showCritical(Lang::gs('database.connection.failed').' ('.DB::$errno.': '.DB::$error.')');
107107
die();
108108
}
109+
110+
# Set the charset type to send to mysql
111+
if(Config::Get('DB_CHARSET_NAME') !== '')
112+
{
113+
DB::query('SET NAMES \''.Config::Get('DB_CHARSET_NAME').'\'');
114+
}
109115
}
110116

111117
include CORE_PATH.DS.'bootstrap.inc.php';

‎core/modules/Pages/Pages.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class Pages extends CodonModule
2121
{
2222
public function NavBar()
2323
{
24-
$this->set('allpages', SiteData::GetAllPages(true, Auth::$loggedin));
24+
$this->set('allpages', SiteData::getAllPages(true, Auth::$loggedin));
2525
$this->render('pages_items.tpl');
2626
}
2727

‎core/version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
921
1+
922

‎install/hashlist

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ d41d8cd98f00b204e9800998ecf8427e *./core/templates/profile_myroutesmap.tpl
132132
5b06756bb3b7c86aaf9d5c43f4bff27c *./core/templates/fsfk_pirep_config.tpl
133133
12b22ed160deeac0c98fa1ee6de251e5 *./core/templates/pirep_editform.tpl
134134
dacd66a26ab705b8ac74131635e2d28a *./core/bootstrap.inc.php
135-
34db6d6ad1e0825d3685c0a5c3547ec7 *./core/codon.config.php
135+
abb06860202b982b28e7061df7db8867 *./core/codon.config.php
136136
3329577ddb4c1cdaba833209d75f7f70 *./core/classes/Lang.class.php
137137
c1e6bb7c33856c0723f1139ccf20ad9f *./core/classes/CodonData.class.php
138138
e925bb9b152fd0ea94e888cde3927b9f *./core/classes/Debug.class.php
@@ -141,7 +141,7 @@ e925bb9b152fd0ea94e888cde3927b9f *./core/classes/Debug.class.php
141141
3db6aa18a749c9d6b5afa028038e34bd *./core/classes/CodonCache.class.php
142142
5ba6c886b93edf142519b533b573d547 *./core/classes/CodonWebService.class.php
143143
8e037ce1a5333ee8c02e7b0f533e013c *./core/classes/TemplateSet.class.php
144-
709768f0cb31537a47c7b8387fcaf663 *./core/classes/MainController.class.php
144+
f2b45112b95baf6d5ad06a174306297b *./core/classes/MainController.class.php
145145
fd37aa8d637c2ba981952ab95c5f89f5 *./core/classes/CodonForm.class.php
146146
4e7d803938f29eabaa2f26ec3fb51982 *./core/classes/Util.class.php
147147
d410514a6b5f8e3f436b8ae3ffd47b8c *./core/classes/CodonRewrite.class.php
@@ -153,15 +153,15 @@ a9028d246a90f26f329f3c76af93f4a1 *./core/classes/Template.class.php
153153
74f79f15db7476a6ce4a8521996eeeef *./core/classes/CodonCondenser.class.php
154154
9f4fc814a95c20dc8e12aad766d108ea *./core/classes/ezdb/ezdb.class.php
155155
acb1aa72916605b20258cc487c19f106 *./core/classes/ezdb/ezdb_base.class.php
156-
fec4c80f40a7e42ba74c22fe90c02080 *./core/classes/ezdb/ezdb_mysqli.class.php
157-
3ad770e4a3ceb958e42d4a64783ab46a *./core/classes/ezdb/ezdb_mysql.class.php
156+
b91d08223cbd16892191af87870e0bcf *./core/classes/ezdb/ezdb_mysqli.class.php
157+
cbc5eb7865a3f59a4f679b386377d0c1 *./core/classes/ezdb/ezdb_mysql.class.php
158158
f45b5714e950fb9f0b7baadb5b1f08d1 *./core/classes/ezdb/ezdb_oracle.class.php
159159
189019f52bcd504a7bd357f79089f3df *./core/hooks/client/post-load.php
160160
51b3757f22b72a957adfa28cc3b53d5f *./core/hooks/system/autoload.php.1
161161
c56b2790383f5891808777c40c03e269 *./core/hooks/system/postmoduleload.php.1
162162
d41d8cd98f00b204e9800998ecf8427e *./core/index.php
163163
d41d8cd98f00b204e9800998ecf8427e *./core/pages/index.php
164-
c1a8c3426e8b8c96d39a8f32ec3e5b24 *./core/app.config.php
164+
c7e138b27019ee369b9e31eec21df39f *./core/app.config.php
165165
00e89835b48e67d7eaa87ed5dea64ce5 *./core/modules/Schedules/Schedules.php
166166
e58ee78f8e857ad150badae9ba04dddc *./core/modules/news/news.php
167167
935862c6f2d8c067c49c4af2797abebd *./core/modules/XML/XML.php
@@ -182,7 +182,7 @@ b01833a6d48116007100f0d4e7b1b198 *./core/modules/ACARS/xacars.php
182182
a5e67fddae9c3f77e262cee30771db05 *./core/modules/Logout/Logout.php
183183
48ddf21cb9e0b7f226b597914bd96550 *./core/modules/PIREPS/PIREPS.php
184184
11ac1fae888d5cfdd25eef39b4037749 *./core/modules/Finances/Finances.php
185-
469b106005f7bae51741e9a20f725708 *./core/modules/Pages/Pages.php
185+
713228773df8c23688125f98e9cb8f17 *./core/modules/Pages/Pages.php
186186
925c6ea3907403895286aff5d9838916 *./core/modules/Login/Login.php
187187
ad702069274d2c2fcafebc86806fc55f *./core/modules/RouteMap/RouteMap.php
188188
b6a7b95650eefadf97f1ee941b42e430 *./index.php
@@ -228,7 +228,7 @@ d074c0e9c23845e55f9a2b3dcb6063f2 *./admin/templates/settings_addcustomfield.tpl
228228
1b0a33f246cfde24ddb15a080ebc8702 *./admin/templates/ops_airportlist.tpl
229229
713a3b7f8bc9f3976664dfa43aba820a *./admin/templates/sidebar_pirepfields.tpl
230230
c6e5f16b6f088fb5f455e1b84c84e687 *./admin/templates/import_form.tpl
231-
9aac8266ea765f8ef6d246c22758f342 *./admin/templates/ops_schedules.tpl
231+
add3241ab1d897d16f88069c99ee3679 *./admin/templates/ops_schedules.tpl
232232
f6859dd73bb69367fa470ec32ee4096b *./admin/templates/settings_customfieldsform.tpl
233233
998c822282b68f3eaf12e3f178b6fa85 *./admin/templates/core_htmlreq.tpl
234234
81011a56d0b63f6d66f4343fccfc0f00 *./admin/templates/pilots_addawards.tpl
@@ -301,7 +301,7 @@ c1de104017f08ab3f33a2635c0a6acf2 *./admin/modules/Logs/Logs.php
301301
7f8afe3dfe944a0a010c23bcbd7e2467 *./admin/modules/Downloads/Downloads.php
302302
2184a2fe0b3e89301b3c0171b9435d0a *./admin/modules/MassMailer/MassMailer.php
303303
fb4ca464f4e518e63c31b409e48588bf *./admin/modules/SiteCMS/SiteCMS.php
304-
350e370e18818cd9abe481e4b7b909f9 *./admin/modules/Operations/Operations.php
304+
aadc3acff1299ac81e7fe8bb45a6481d *./admin/modules/Operations/Operations.php
305305
daa524b086eb1068ae81f9110688ff6d *./admin/modules/Import/Import.php
306306
086a4da89e7f2c4f6dba1284cc3ddc3a *./admin/modules/Settings/Settings.php
307307
e5e27bd5fd7b8b5732f173cdfeed7a0d *./admin/modules/Maintenance/Maintenance.php
@@ -323,7 +323,7 @@ a73cd5d722a7390595c51e0ccf6fa82f *./lib/js/jquery.colorbox.js
323323
7c6967f5c1ddbb9d61f69e7b19d88056 *./lib/js/acarsmap.js
324324
168c89d09d780812785edabdcc649b2e *./lib/js/jquery.bigiframe.js
325325
fdf811e16f70717f1082e279a1cc52cc *./lib/js/jquery.colorbox-min.js
326-
4a0c8b810f30144b184910f6dd1b034c *./lib/js/phpvms.js
326+
5a7a34667a27f8469854ed332c261447 *./lib/js/phpvms.js
327327
ccf14f48623a2413286b3dfb7e43d163 *./lib/js/jquery.metadata.js
328328
2e06583b6d440b4cc60bf7484e696311 *./lib/js/jquery.pstrength.js
329329
0e35751d9b92233a155bbf2b9fde9bcb *./lib/js/jquery-calendar.js

0 commit comments

Comments
 (0)