@@ -32,7 +32,7 @@ discard block |
||
32 | 32 | array( |
33 | 33 | 'db' => 'id', |
34 | 34 | 'dt' => 'DT_RowId', |
35 | - 'formatter' => function ($d, $row) { |
|
35 | + 'formatter' => function($d, $row) { |
|
36 | 36 | // Technically a DOM id cannot start with an integer, so we prefix |
37 | 37 | // a string. This can also be useful if you have multiple tables |
38 | 38 | // to ensure that the id is unique with a different prefix |
@@ -40,20 +40,20 @@ discard block |
||
40 | 40 | }, |
41 | 41 | ), |
42 | 42 | array('db' => 'first_name', 'dt' => 'first_name'), |
43 | - array('db' => 'last_name', 'dt' => 'last_name'), |
|
44 | - array('db' => 'position', 'dt' => 'position'), |
|
45 | - array('db' => 'office', 'dt' => 'office'), |
|
43 | + array('db' => 'last_name', 'dt' => 'last_name'), |
|
44 | + array('db' => 'position', 'dt' => 'position'), |
|
45 | + array('db' => 'office', 'dt' => 'office'), |
|
46 | 46 | array( |
47 | 47 | 'db' => 'start_date', |
48 | 48 | 'dt' => 'start_date', |
49 | - 'formatter' => function ($d, $row) { |
|
49 | + 'formatter' => function($d, $row) { |
|
50 | 50 | return date('jS M y', strtotime($d)); |
51 | 51 | }, |
52 | 52 | ), |
53 | 53 | array( |
54 | 54 | 'db' => 'salary', |
55 | 55 | 'dt' => 'salary', |
56 | - 'formatter' => function ($d, $row) { |
|
56 | + 'formatter' => function($d, $row) { |
|
57 | 57 | return '$'.number_format($d); |
58 | 58 | }, |
59 | 59 | ), |
@@ -30,20 +30,20 @@ |
||
30 | 30 | // parameter names |
31 | 31 | $columns = array( |
32 | 32 | array('db' => 'first_name', 'dt' => 'first_name'), |
33 | - array('db' => 'last_name', 'dt' => 'last_name'), |
|
34 | - array('db' => 'position', 'dt' => 'position'), |
|
35 | - array('db' => 'office', 'dt' => 'office'), |
|
33 | + array('db' => 'last_name', 'dt' => 'last_name'), |
|
34 | + array('db' => 'position', 'dt' => 'position'), |
|
35 | + array('db' => 'office', 'dt' => 'office'), |
|
36 | 36 | array( |
37 | 37 | 'db' => 'start_date', |
38 | 38 | 'dt' => 'start_date', |
39 | - 'formatter' => function ($d, $row) { |
|
39 | + 'formatter' => function($d, $row) { |
|
40 | 40 | return date('jS M y', strtotime($d)); |
41 | 41 | }, |
42 | 42 | ), |
43 | 43 | array( |
44 | 44 | 'db' => 'salary', |
45 | 45 | 'dt' => 'salary', |
46 | - 'formatter' => function ($d, $row) { |
|
46 | + 'formatter' => function($d, $row) { |
|
47 | 47 | return '$'.number_format($d); |
48 | 48 | }, |
49 | 49 | ), |
@@ -32,7 +32,7 @@ discard block |
||
32 | 32 | array( |
33 | 33 | 'db' => 'id', |
34 | 34 | 'dt' => 'DT_RowId', |
35 | - 'formatter' => function ($d, $row) { |
|
35 | + 'formatter' => function($d, $row) { |
|
36 | 36 | // Technically a DOM id cannot start with an integer, so we prefix |
37 | 37 | // a string. This can also be useful if you have multiple tables |
38 | 38 | // to ensure that the id is unique with a different prefix |
@@ -40,20 +40,20 @@ discard block |
||
40 | 40 | }, |
41 | 41 | ), |
42 | 42 | array('db' => 'first_name', 'dt' => 0), |
43 | - array('db' => 'last_name', 'dt' => 1), |
|
44 | - array('db' => 'position', 'dt' => 2), |
|
45 | - array('db' => 'office', 'dt' => 3), |
|
43 | + array('db' => 'last_name', 'dt' => 1), |
|
44 | + array('db' => 'position', 'dt' => 2), |
|
45 | + array('db' => 'office', 'dt' => 3), |
|
46 | 46 | array( |
47 | 47 | 'db' => 'start_date', |
48 | 48 | 'dt' => 4, |
49 | - 'formatter' => function ($d, $row) { |
|
49 | + 'formatter' => function($d, $row) { |
|
50 | 50 | return date('jS M y', strtotime($d)); |
51 | 51 | }, |
52 | 52 | ), |
53 | 53 | array( |
54 | 54 | 'db' => 'salary', |
55 | 55 | 'dt' => 5, |
56 | - 'formatter' => function ($d, $row) { |
|
56 | + 'formatter' => function($d, $row) { |
|
57 | 57 | return '$'.number_format($d); |
58 | 58 | }, |
59 | 59 | ), |
@@ -30,20 +30,20 @@ discard block |
||
30 | 30 | // indexes |
31 | 31 | $columns = array( |
32 | 32 | array('db' => 'first_name', 'dt' => 0), |
33 | - array('db' => 'last_name', 'dt' => 1), |
|
34 | - array('db' => 'position', 'dt' => 2), |
|
35 | - array('db' => 'office', 'dt' => 3), |
|
33 | + array('db' => 'last_name', 'dt' => 1), |
|
34 | + array('db' => 'position', 'dt' => 2), |
|
35 | + array('db' => 'office', 'dt' => 3), |
|
36 | 36 | array( |
37 | 37 | 'db' => 'start_date', |
38 | 38 | 'dt' => 4, |
39 | - 'formatter' => function ($d, $row) { |
|
39 | + 'formatter' => function($d, $row) { |
|
40 | 40 | return date('jS M y', strtotime($d)); |
41 | 41 | }, |
42 | 42 | ), |
43 | 43 | array( |
44 | 44 | 'db' => 'salary', |
45 | 45 | 'dt' => 5, |
46 | - 'formatter' => function ($d, $row) { |
|
46 | + 'formatter' => function($d, $row) { |
|
47 | 47 | return '$'.number_format($d); |
48 | 48 | }, |
49 | 49 | ), |
@@ -64,8 +64,7 @@ discard block |
||
64 | 64 | |
65 | 65 | // Validate the JSONP to make use it is an okay Javascript function to execute |
66 | 66 | $jsonp = preg_match('/^[$A-Z_][0-9A-Z_$]*$/i', $_GET['callback']) ? |
67 | - $_GET['callback'] : |
|
68 | - false; |
|
67 | + $_GET['callback'] : false; |
|
69 | 68 | |
70 | 69 | if ($jsonp) { |
71 | 70 | echo $jsonp.'('.json_encode( |
@@ -127,8 +127,7 @@ discard block |
||
127 | 127 | |
128 | 128 | if ($requestColumn['orderable'] == 'true') { |
129 | 129 | $dir = $request['order'][$i]['dir'] === 'asc' ? |
130 | - 'ASC' : |
|
131 | - 'DESC'; |
|
130 | + 'ASC' : 'DESC'; |
|
132 | 131 | |
133 | 132 | $orderBy[] = '`'.$column['db'].'` '.$dir; |
134 | 133 | } |
@@ -203,8 +202,7 @@ discard block |
||
203 | 202 | |
204 | 203 | if (count($columnSearch)) { |
205 | 204 | $where = $where === '' ? |
206 | - implode(' AND ', $columnSearch) : |
|
207 | - $where.' AND '.implode(' AND ', $columnSearch); |
|
205 | + implode(' AND ', $columnSearch) : $where.' AND '.implode(' AND ', $columnSearch); |
|
208 | 206 | } |
209 | 207 | |
210 | 208 | if ($where !== '') { |
@@ -268,8 +266,7 @@ discard block |
||
268 | 266 | */ |
269 | 267 | return array( |
270 | 268 | 'draw' => isset($request['draw']) ? |
271 | - intval($request['draw']) : |
|
272 | - 0, |
|
269 | + intval($request['draw']) : 0, |
|
273 | 270 | 'recordsTotal' => intval($recordsTotal), |
274 | 271 | 'recordsFiltered' => intval($recordsFiltered), |
275 | 272 | 'data' => self::data_output($columns, $data), |
@@ -318,14 +315,12 @@ discard block |
||
318 | 315 | |
319 | 316 | if ($whereResult) { |
320 | 317 | $where = $where ? |
321 | - $where.' AND '.$whereResult : |
|
322 | - 'WHERE '.$whereResult; |
|
318 | + $where.' AND '.$whereResult : 'WHERE '.$whereResult; |
|
323 | 319 | } |
324 | 320 | |
325 | 321 | if ($whereAll) { |
326 | 322 | $where = $where ? |
327 | - $where.' AND '.$whereAll : |
|
328 | - 'WHERE '.$whereAll; |
|
323 | + $where.' AND '.$whereAll : 'WHERE '.$whereAll; |
|
329 | 324 | |
330 | 325 | $whereAllSql = 'WHERE '.$whereAll; |
331 | 326 | } |
@@ -360,8 +355,7 @@ discard block |
||
360 | 355 | */ |
361 | 356 | return array( |
362 | 357 | 'draw' => isset($request['draw']) ? |
363 | - intval($request['draw']) : |
|
364 | - 0, |
|
358 | + intval($request['draw']) : 0, |
|
365 | 359 | 'recordsTotal' => intval($recordsTotal), |
366 | 360 | 'recordsFiltered' => intval($recordsFiltered), |
367 | 361 | 'data' => self::data_output($columns, $data), |
@@ -16,20 +16,20 @@ |
||
16 | 16 | // parameter names |
17 | 17 | $columns = array( |
18 | 18 | array('db' => 'first_name', 'dt' => 'first_name'), |
19 | - array('db' => 'last_name', 'dt' => 'last_name'), |
|
20 | - array('db' => 'position', 'dt' => 'position'), |
|
21 | - array('db' => 'office', 'dt' => 'office'), |
|
19 | + array('db' => 'last_name', 'dt' => 'last_name'), |
|
20 | + array('db' => 'position', 'dt' => 'position'), |
|
21 | + array('db' => 'office', 'dt' => 'office'), |
|
22 | 22 | array( |
23 | 23 | 'db' => 'start_date', |
24 | 24 | 'dt' => 'start_date', |
25 | - 'formatter' => function ($d, $row) { |
|
25 | + 'formatter' => function($d, $row) { |
|
26 | 26 | return date('jS M y', strtotime($d)); |
27 | 27 | }, |
28 | 28 | ), |
29 | 29 | array( |
30 | 30 | 'db' => 'salary', |
31 | 31 | 'dt' => 'salary', |
32 | - 'formatter' => function ($d, $row) { |
|
32 | + 'formatter' => function($d, $row) { |
|
33 | 33 | return '$'.number_format($d); |
34 | 34 | }, |
35 | 35 | ), |
@@ -30,20 +30,20 @@ |
||
30 | 30 | // indexes |
31 | 31 | $columns = array( |
32 | 32 | array('db' => 'first_name', 'dt' => 0), |
33 | - array('db' => 'last_name', 'dt' => 1), |
|
34 | - array('db' => 'position', 'dt' => 2), |
|
35 | - array('db' => 'office', 'dt' => 3), |
|
33 | + array('db' => 'last_name', 'dt' => 1), |
|
34 | + array('db' => 'position', 'dt' => 2), |
|
35 | + array('db' => 'office', 'dt' => 3), |
|
36 | 36 | array( |
37 | 37 | 'db' => 'start_date', |
38 | 38 | 'dt' => 4, |
39 | - 'formatter' => function ($d, $row) { |
|
39 | + 'formatter' => function($d, $row) { |
|
40 | 40 | return date('jS M y', strtotime($d)); |
41 | 41 | }, |
42 | 42 | ), |
43 | 43 | array( |
44 | 44 | 'db' => 'salary', |
45 | 45 | 'dt' => 5, |
46 | - 'formatter' => function ($d, $row) { |
|
46 | + 'formatter' => function($d, $row) { |
|
47 | 47 | return '$'.number_format($d); |
48 | 48 | }, |
49 | 49 | ), |
@@ -96,7 +96,7 @@ |
||
96 | 96 | 'tags' => array(array('name' => 'dtc_grid.source')), |
97 | 97 | 'calls' => array( |
98 | 98 | array('autoDiscoverColumns'), |
99 | - ), ); |
|
99 | + ),); |
|
100 | 100 | |
101 | 101 | if ($columns && isset($gridColumnsNamespace) && isset($gridColumnClass)) { |
102 | 102 | $config[$serviceName]['calls'] = array( |
@@ -11,7 +11,7 @@ |
||
11 | 11 | */ |
12 | 12 | protected function fromCamelCase($str) |
13 | 13 | { |
14 | - $func = function ($str) { |
|
14 | + $func = function($str) { |
|
15 | 15 | return ' '.$str[0]; |
16 | 16 | }; |
17 | 17 |