Skip to content

Commit cb4f0f1

Browse files
nguyenanhungnguyenanhung
authored
Merge pull request #7 from nguyenanhung/v3.1.14-develop
V3.1.14 develop
2 parents 63dfca2 + e71dca2 commit cb4f0f1

File tree

11 files changed

+143
-28
lines changed

11 files changed

+143
-28
lines changed

‎config/constants.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
defined('BASEPATH') or exit('No direct script access allowed');
23
/**
34
* Project codeigniter-framework
45
* Created by PhpStorm

‎config/doctypes.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?php
22
defined('BASEPATH') OR exit('No direct script access allowed');
3-
43
$_doctypes = array(
54
'xhtml11' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "https://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">',
65
'xhtml1-strict' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "https://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">',

‎config/rest_server.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<?php
2-
32
defined('BASEPATH') or exit('No direct script access allowed');
43

54
/*

‎custom/HungNG_CI_Base_Controller_Default_Page.php‎

Lines changed: 107 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,107 @@
1+
<?php
2+
defined('BASEPATH') or exit('No direct script access allowed');
3+
/**
4+
* Project codeigniter-framework
5+
* Created by PhpStorm
6+
* User: 713uk13m <dev@nguyenanhung.com>
7+
* Copyright: 713uk13m <dev@nguyenanhung.com>
8+
* Date: 22/02/2023
9+
* Time: 23:06
10+
*/
11+
if (!class_exists('HungNG_CI_Base_Controller_Default_Page')) {
12+
/**
13+
* Class HungNG_CI_Base_Controller_Default_Page
14+
*
15+
* @author 713uk13m <dev@nguyenanhung.com>
16+
* @copyright 713uk13m <dev@nguyenanhung.com>
17+
*/
18+
class HungNG_CI_Base_Controller_Default_Page extends HungNG_CI_Base_Controllers
19+
{
20+
public $template = 'Custom/';
21+
22+
/**
23+
* HungNG_CI_Base_Controller_Default_Page constructor.
24+
*
25+
* @author : 713uk13m <dev@nguyenanhung.com>
26+
* @copyright: 713uk13m <dev@nguyenanhung.com>
27+
*/
28+
public function __construct()
29+
{
30+
parent::__construct();
31+
$this->load->helper(array('url', 'html'));
32+
$this->load->library('parser');
33+
}
34+
35+
/**
36+
* Function index
37+
*
38+
* @author : 713uk13m <dev@nguyenanhung.com>
39+
* @copyright: 713uk13m <dev@nguyenanhung.com>
40+
* @time : 22/02/2023 08:10
41+
*/
42+
public function index()
43+
{
44+
$this->load->view('welcome');
45+
}
46+
47+
/**
48+
* Function maintenance
49+
*
50+
* @author : 713uk13m <dev@nguyenanhung.com>
51+
* @copyright: 713uk13m <dev@nguyenanhung.com>
52+
* @time : 22/02/2023 08:07
53+
*/
54+
public function maintenance()
55+
{
56+
$this->load->view($this->template . 'Maintenance');
57+
}
58+
59+
/**
60+
* Function under_construction
61+
*
62+
* @author : 713uk13m <dev@nguyenanhung.com>
63+
* @copyright: 713uk13m <dev@nguyenanhung.com>
64+
* @time : 22/02/2023 08:05
65+
*/
66+
public function under_construction()
67+
{
68+
$data = array(
69+
'title' => 'Coming Soon',
70+
'heading' => 'I\'ll be back',
71+
'site_name' => config_item('cms_site_name'),
72+
'site_author' => POWERED_HUNGNG_NAME . ' - ' . POWERED_HUNGNG_EMAIL,
73+
'url_assets' => assets_themes('Clouds'),
74+
'url_facebook' => site_url(),
75+
'url_twitter' => site_url(),
76+
'url_briefcase' => site_url(),
77+
'url_transit' => site_url()
78+
);
79+
$this->parser->parse($this->template . 'Clouds_under_construction', $data);
80+
}
81+
82+
/**
83+
* Function error404
84+
*
85+
* @author : 713uk13m <dev@nguyenanhung.com>
86+
* @copyright: 713uk13m <dev@nguyenanhung.com>
87+
* @time : 22/02/2023 08:01
88+
*/
89+
public function error404()
90+
{
91+
$data = array(
92+
'name' => '404',
93+
'title' => 'PAGE NOT FOUND',
94+
'heading' => 'The page you requested was not found.',
95+
'site_name' => config_item('cms_site_name'),
96+
'site_author' => POWERED_HUNGNG_NAME . ' - ' . POWERED_HUNGNG_EMAIL,
97+
'site_link' => config_item('base_url'),
98+
'url_assets' => assets_themes('Sailors'),
99+
'url_facebook' => site_url(),
100+
'url_twitter' => site_url(),
101+
'url_briefcase' => site_url(),
102+
'url_transit' => site_url()
103+
);
104+
$this->parser->parse($this->template . 'Sailor_error', $data);
105+
}
106+
}
107+
}

‎custom/HungNG_CI_Base_Hooks_Log_Query.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
defined('BASEPATH') or exit('No direct script access allowed');
23
/**
34
* Project codeigniter-framework
45
* Created by PhpStorm

‎helpers/codeigniter_modular.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
defined('BASEPATH') or exit('No direct script access allowed');
23
/**
34
* Project codeigniter-framework
45
* Created by PhpStorm

‎system/core/Format.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ class CI_Format
5555
*
5656
* @var mixed
5757
*/
58-
protected $_data = [];
58+
protected $_data = array();
5959

6060
/**
6161
* Type to convert from.
@@ -134,7 +134,7 @@ public function to_array($data = null)
134134
$data = (array) $data;
135135
}
136136

137-
$array = [];
137+
$array = array();
138138
foreach ((array) $data as $key => $value) {
139139
if (is_object($value) === true || is_array($value) === true) {
140140
$array[$key] = $this->to_array($value);
@@ -241,7 +241,7 @@ public function to_html($data = null)
241241
} else {
242242
// Single array
243243
$headings = array_keys($data);
244-
$data = [$data];
244+
$data = array($data);
245245
}
246246

247247
// Load the table library
@@ -308,7 +308,7 @@ public function to_csv($data = null, $delimiter = ',', $enclosure = '"')
308308
} else {
309309
// Single array
310310
$headings = array_keys($data);
311-
$data = [$data];
311+
$data = array($data);
312312
}
313313

314314
// Apply the headings

‎thirdParty/MX/Loader.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -509,7 +509,7 @@ public function view($view, $vars = array(), $return = false)
509509
}
510510

511511
if ($path != false) {
512-
$this->_ci_view_paths = [$path => true] + $this->_ci_view_paths;
512+
$this->_ci_view_paths = array($path => true) + $this->_ci_view_paths;
513513
$view = $_view;
514514
}
515515

‎thirdParty/REST/Format.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ class Format
7272
*
7373
* @var mixed
7474
*/
75-
protected $_data = [];
75+
protected $_data = array();
7676

7777
/**
7878
* Type to convert from.
@@ -151,7 +151,7 @@ public function to_array($data = null)
151151
$data = (array) $data;
152152
}
153153

154-
$array = [];
154+
$array = array();
155155
foreach ((array) $data as $key => $value) {
156156
if (is_object($value) === true || is_array($value) === true) {
157157
$array[$key] = $this->to_array($value);
@@ -258,7 +258,7 @@ public function to_html($data = null)
258258
} else {
259259
// Single array
260260
$headings = array_keys($data);
261-
$data = [$data];
261+
$data = array($data);
262262
}
263263

264264
// Load the table library
@@ -325,7 +325,7 @@ public function to_csv($data = null, $delimiter = ',', $enclosure = '"')
325325
} else {
326326
// Single array
327327
$headings = array_keys($data);
328-
$data = [$data];
328+
$data = array($data);
329329
}
330330

331331
// Apply the headings

‎thirdParty/REST/Request.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ public function getBodyParams()
9999
// PHP has already parsed the body so we have all params in $_POST
100100
$this->_bodyParams = $_POST;
101101
} else {
102-
$this->_bodyParams = [];
102+
$this->_bodyParams = array();
103103
mb_parse_str($this->getRawBody(), $this->_bodyParams);
104104
}
105105
}

0 commit comments

Comments
 (0)