Skip to content

Commit 7e6ad3e

Browse files
nguyenanhungnguyenanhung
authored
Merge pull request #44 from nguyenanhung/v3.2.0-develop
Update at 2024-03-06 05:06:01 on Mac-mini-M1--Home
2 parents 2374eeb + 7f67a0e commit 7e6ad3e

12 files changed

+376
-376
lines changed

‎custom/HungNG_CI_Base_Controller_Default_Page.php‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -69,15 +69,15 @@ public function maintenance()
6969
public function under_construction()
7070
{
7171
$data = array(
72-
'title' => 'Coming Soon',
73-
'heading' => 'I\'ll be back',
74-
'site_name' => config_item('cms_site_name'),
75-
'site_author' => POWERED_HUNGNG_NAME . ' - ' . POWERED_HUNGNG_EMAIL,
76-
'url_assets' => assets_themes('Clouds'),
77-
'url_facebook' => site_url(),
78-
'url_twitter' => site_url(),
72+
'title' => 'Coming Soon',
73+
'heading' => 'I\'ll be back',
74+
'site_name' => config_item('cms_site_name'),
75+
'site_author' => POWERED_HUNGNG_NAME . ' - ' . POWERED_HUNGNG_EMAIL,
76+
'url_assets' => assets_themes('Clouds'),
77+
'url_facebook' => site_url(),
78+
'url_twitter' => site_url(),
7979
'url_briefcase' => site_url(),
80-
'url_transit' => site_url()
80+
'url_transit' => site_url()
8181
);
8282
$this->parser->parse($this->template . 'Clouds_under_construction', $data);
8383
}
@@ -92,17 +92,17 @@ public function under_construction()
9292
public function error404()
9393
{
9494
$data = array(
95-
'name' => '404',
96-
'title' => 'PAGE NOT FOUND',
97-
'heading' => 'The page you requested was not found.',
98-
'site_name' => config_item('cms_site_name'),
99-
'site_author' => POWERED_HUNGNG_NAME . ' - ' . POWERED_HUNGNG_EMAIL,
100-
'site_link' => config_item('base_url'),
101-
'url_assets' => assets_themes('Sailors'),
102-
'url_facebook' => site_url(),
103-
'url_twitter' => site_url(),
95+
'name' => '404',
96+
'title' => 'PAGE NOT FOUND',
97+
'heading' => 'The page you requested was not found.',
98+
'site_name' => config_item('cms_site_name'),
99+
'site_author' => POWERED_HUNGNG_NAME . ' - ' . POWERED_HUNGNG_EMAIL,
100+
'site_link' => config_item('base_url'),
101+
'url_assets' => assets_themes('Sailors'),
102+
'url_facebook' => site_url(),
103+
'url_twitter' => site_url(),
104104
'url_briefcase' => site_url(),
105-
'url_transit' => site_url()
105+
'url_transit' => site_url()
106106
);
107107
$this->parser->parse($this->template . 'Sailor_error', $data);
108108
}

‎custom/HungNG_CI_Base_Hooks_Log_Query.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public function __construct()
4343
}
4444

4545
if (is_numeric($config['log_threshold'])) {
46-
$this->_threshold = (int) $config['log_threshold'];
46+
$this->_threshold = (int)$config['log_threshold'];
4747
} elseif (is_array($config['log_threshold'])) {
4848
$this->_threshold = 0;
4949
$this->_threshold_array = array_flip($config['log_threshold']);
@@ -143,8 +143,8 @@ protected static function strlen($str)
143143
* Byte-safe substr()
144144
*
145145
* @param string $str
146-
* @param int $start
147-
* @param int $length
146+
* @param int $start
147+
* @param int $length
148148
*
149149
* @return string
150150
*/

‎hungng/HungNG_CI_Base_Lib_ElasticSearch.php‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
*/
1818
class HungNG_CI_Base_Lib_ElasticSearch
1919
{
20-
private $client;
20+
private $client;
2121
protected $esHost;
2222
protected $CI;
2323

@@ -88,8 +88,8 @@ public function get_found_document($index, $type, $id)
8888
//db - collection - id
8989
$params = array(
9090
'index' => $index,
91-
'type' => $type,
92-
'id' => $id
91+
'type' => $type,
92+
'id' => $id
9393
);
9494
$results = $this->client->get($params);
9595

@@ -100,8 +100,8 @@ public function exists_document($index, $type, $id)
100100
{
101101
$params = array(
102102
'index' => $index,
103-
'type' => $type,
104-
'id' => $id
103+
'type' => $type,
104+
'id' => $id
105105
);
106106

107107
return $this->client->exists($params);
@@ -111,9 +111,9 @@ public function create_document($index, $type, $id, $body)
111111
{
112112
$params = array(
113113
'index' => $index,
114-
'type' => $type,
115-
'id' => $id,
116-
'body' => $body
114+
'type' => $type,
115+
'id' => $id,
116+
'body' => $body
117117
);
118118

119119
return $this->client->index($params);
@@ -123,9 +123,9 @@ public function update_document($index, $type, $id, $body)
123123
{
124124
$params = array(
125125
'index' => $index,
126-
'type' => $type,
127-
'id' => $id,
128-
'body' => $body
126+
'type' => $type,
127+
'id' => $id,
128+
'body' => $body
129129
);
130130

131131
return $this->client->update($params);
@@ -134,10 +134,10 @@ public function update_document($index, $type, $id, $body)
134134
public function delete_document($index, $type, $id)
135135
{
136136
$params = array(
137-
'index' => $index,
138-
'type' => $type,
137+
'index' => $index,
138+
'type' => $type,
139139
'refresh' => 'wait_for', //or true
140-
'id' => $id
140+
'id' => $id
141141
);
142142

143143
return $this->client->delete($params);
@@ -147,20 +147,20 @@ public function search_document($index, $type, $from, $size, $query, $all)
147147
{
148148
$params = array(
149149
'index' => $index,
150-
'type' => $type,
151-
'body' => array(
152-
'from' => $from,
153-
'size' => $size,
150+
'type' => $type,
151+
'body' => array(
152+
'from' => $from,
153+
'size' => $size,
154154
'query' => $query
155155
)
156156
);
157157
if ($all) {
158158
$params = array(
159159
'index' => $index,
160-
'type' => $type,
161-
'from' => $from,
162-
'size' => $size,
163-
'body' => array('query' => $query)
160+
'type' => $type,
161+
'from' => $from,
162+
'size' => $size,
163+
'body' => array('query' => $query)
164164
);
165165
}
166166

@@ -173,8 +173,8 @@ public function count_documents($index, $type, $query)
173173
if ($exists_index === 200) {
174174
$params = array(
175175
'index' => $index,
176-
'type' => $type,
177-
'body' => array('query' => $query)
176+
'type' => $type,
177+
'body' => array('query' => $query)
178178
);
179179
$response = $this->client->count($params);
180180
} else {

‎hungng/HungNG_CI_Base_Lib_Hmvc_Migration.php‎

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -28,50 +28,50 @@
2828
*
2929
* @author Michel Roca
3030
*
31-
* @property CI_Benchmark $benchmark This class enables you to mark points and calculate the time difference between them. Memory consumption can also be displayed.
32-
* @property CI_Calendar $calendar This class enables the creation of calendars
33-
* @property CI_Cache $cache Caching Class
34-
* @property CI_Cart $cart Shopping Cart Class
35-
* @property CI_Config $config This class contains functions that enable config files to be managed
36-
* @property CI_Controller $controller This class object is the super class that every library in CodeIgniter will be assigned to
37-
* @property CI_DB_forge $dbforge Database Forge Class
31+
* @property CI_Benchmark $benchmark This class enables you to mark points and calculate the time difference between them. Memory consumption can also be displayed.
32+
* @property CI_Calendar $calendar This class enables the creation of calendars
33+
* @property CI_Cache $cache Caching Class
34+
* @property CI_Cart $cart Shopping Cart Class
35+
* @property CI_Config $config This class contains functions that enable config files to be managed
36+
* @property CI_Controller $controller This class object is the super class that every library in CodeIgniter will be assigned to
37+
* @property CI_DB_forge $dbforge Database Forge Class
3838
* @property CI_DB_pdo_driver|CI_DB_query_builder|CI_DB_driver $db This is the platform-independent base Query Builder implementation class
39-
* @property CI_DB_utility $dbutil Database Utility Class
40-
* @property CI_Driver_Library $driver Driver Library Class
41-
* @property CI_Email $email Permits email to be sent using Mail, Sendmail, or SMTP
42-
* @property CI_Encrypt $encrypt Provides two-way keyed encoding using Mcrypt
43-
* @property CI_Encryption $encryption Provides two-way keyed encryption via PHP's MCrypt and/or OpenSSL extensions
44-
* @property CI_Exceptions $exceptions Exceptions Class
45-
* @property CI_Form_validation $form_validation Form Validation Class
46-
* @property CI_FTP $ftp FTP Class
47-
* @property CI_Hooks $hooks Provides a mechanism to extend the base system without hacking
48-
* @property CI_Image_lib $image_lib Image Manipulation class
49-
* @property CI_Input $input Pre-processes global input data for security
50-
* @property CI_Javascript $javascript Javascript Class
51-
* @property CI_Jquery $jquery Jquery Class
52-
* @property CI_Lang $lang Language Class
53-
* @property CI_Loader $load Loads framework components
54-
* @property CI_Log $log Logging Class
55-
* @property CI_Migration $migration All migrations should implement this, forces up() and down() and gives access to the CI super-global
56-
* @property CI_Model $model CodeIgniter Model Class
57-
* @property CI_Output $output Responsible for sending final output to the browser
58-
* @property CI_Pagination $pagination Pagination Class
59-
* @property CI_Parser $parser Parser Class
60-
* @property CI_Profiler $profiler This class enables you to display benchmark, query, and other data in order to help with debugging and optimization.
61-
* @property CI_Router $router Parses URIs and determines routing
62-
* @property CI_Security $security Security Class
63-
* @property CI_Session $session Session Class
64-
* @property CI_Table $table Lets you create tables manually or from database result objects, or arrays
65-
* @property CI_Trackback $trackback Trackback Sending/Receiving Class
66-
* @property CI_Typography $typography Typography Class
67-
* @property CI_Unit_test $unit Simple testing class
68-
* @property CI_Upload $upload File Uploading Class
69-
* @property CI_URI $uri Parses URIs and determines routing
70-
* @property CI_User_agent $agent Identifies the platform, browser, robot, or mobile device of the browsing agent
71-
* @property CI_Xmlrpc $xmlrpc XML-RPC request handler class
72-
* @property CI_Xmlrpcs $xmlrpcs XML-RPC server class
73-
* @property CI_Zip $zip Zip Compression Class
74-
* @property CI_Utf8 $utf8 Provides support for UTF-8 environments
39+
* @property CI_DB_utility $dbutil Database Utility Class
40+
* @property CI_Driver_Library $driver Driver Library Class
41+
* @property CI_Email $email Permits email to be sent using Mail, Sendmail, or SMTP
42+
* @property CI_Encrypt $encrypt Provides two-way keyed encoding using Mcrypt
43+
* @property CI_Encryption $encryption Provides two-way keyed encryption via PHP's MCrypt and/or OpenSSL extensions
44+
* @property CI_Exceptions $exceptions Exceptions Class
45+
* @property CI_Form_validation $form_validation Form Validation Class
46+
* @property CI_FTP $ftp FTP Class
47+
* @property CI_Hooks $hooks Provides a mechanism to extend the base system without hacking
48+
* @property CI_Image_lib $image_lib Image Manipulation class
49+
* @property CI_Input $input Pre-processes global input data for security
50+
* @property CI_Javascript $javascript Javascript Class
51+
* @property CI_Jquery $jquery Jquery Class
52+
* @property CI_Lang $lang Language Class
53+
* @property CI_Loader $load Loads framework components
54+
* @property CI_Log $log Logging Class
55+
* @property CI_Migration $migration All migrations should implement this, forces up() and down() and gives access to the CI super-global
56+
* @property CI_Model $model CodeIgniter Model Class
57+
* @property CI_Output $output Responsible for sending final output to the browser
58+
* @property CI_Pagination $pagination Pagination Class
59+
* @property CI_Parser $parser Parser Class
60+
* @property CI_Profiler $profiler This class enables you to display benchmark, query, and other data in order to help with debugging and optimization.
61+
* @property CI_Router $router Parses URIs and determines routing
62+
* @property CI_Security $security Security Class
63+
* @property CI_Session $session Session Class
64+
* @property CI_Table $table Lets you create tables manually or from database result objects, or arrays
65+
* @property CI_Trackback $trackback Trackback Sending/Receiving Class
66+
* @property CI_Typography $typography Typography Class
67+
* @property CI_Unit_test $unit Simple testing class
68+
* @property CI_Upload $upload File Uploading Class
69+
* @property CI_URI $uri Parses URIs and determines routing
70+
* @property CI_User_agent $agent Identifies the platform, browser, robot, or mobile device of the browsing agent
71+
* @property CI_Xmlrpc $xmlrpc XML-RPC request handler class
72+
* @property CI_Xmlrpcs $xmlrpcs XML-RPC server class
73+
* @property CI_Zip $zip Zip Compression Class
74+
* @property CI_Utf8 $utf8 Provides support for UTF-8 environments
7575
*/
7676
class HungNG_CI_Base_Lib_Hmvc_Migration
7777
{
@@ -114,9 +114,9 @@ public function __construct($config = array())
114114
// If the migrations table is missing, make it
115115
if (!$this->db->table_exists('migrations')) {
116116
$this->dbforge->add_field(array(
117-
'module' => array('type' => 'VARCHAR', 'constraint' => 20),
118-
'version' => array('type' => 'INT', 'constraint' => 3),
119-
));
117+
'module' => array('type' => 'VARCHAR', 'constraint' => 20),
118+
'version' => array('type' => 'INT', 'constraint' => 3),
119+
));
120120

121121
$this->dbforge->create_table('migrations', true);
122122

@@ -360,7 +360,7 @@ public function latest()
360360

361361
// Calculate the last migration step from existing migration
362362
// filenames and procceed to the standard version migration
363-
return $this->version((int) substr($last_migration, 0, 3));
363+
return $this->version((int)substr($last_migration, 0, 3));
364364
}
365365

366366
// --------------------------------------------------------------------
@@ -435,7 +435,7 @@ protected function _get_version($module = '')
435435
/**
436436
* Stores the current schema version
437437
*
438-
* @param int $migrations Migration reached
438+
* @param int $migrations Migration reached
439439
* @param string $module
440440
*
441441
* @return bool

0 commit comments

Comments
 (0)