Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update at 2024-03-06 05:06:01 on Mac-mini-M1--Home #44

Merged
merged 1 commit into from
Mar 5, 2024
Merged

Update at 2024-03-06 05:06:01 on Mac-mini-M1--Home #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 18 additions & 18 deletions custom/HungNG_CI_Base_Controller_Default_Page.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,15 +69,15 @@ public function maintenance()
public function under_construction()
{
$data = array(
'title' => 'Coming Soon',
'heading' => 'I\'ll be back',
'site_name' => config_item('cms_site_name'),
'site_author' => POWERED_HUNGNG_NAME . ' - ' . POWERED_HUNGNG_EMAIL,
'url_assets' => assets_themes('Clouds'),
'url_facebook' => site_url(),
'url_twitter' => site_url(),
'title' => 'Coming Soon',
'heading' => 'I\'ll be back',
'site_name' => config_item('cms_site_name'),
'site_author' => POWERED_HUNGNG_NAME . ' - ' . POWERED_HUNGNG_EMAIL,
'url_assets' => assets_themes('Clouds'),
'url_facebook' => site_url(),
'url_twitter' => site_url(),
'url_briefcase' => site_url(),
'url_transit' => site_url()
'url_transit' => site_url()
);
$this->parser->parse($this->template . 'Clouds_under_construction', $data);
}
Expand All @@ -92,17 +92,17 @@ public function under_construction()
public function error404()
{
$data = array(
'name' => '404',
'title' => 'PAGE NOT FOUND',
'heading' => 'The page you requested was not found.',
'site_name' => config_item('cms_site_name'),
'site_author' => POWERED_HUNGNG_NAME . ' - ' . POWERED_HUNGNG_EMAIL,
'site_link' => config_item('base_url'),
'url_assets' => assets_themes('Sailors'),
'url_facebook' => site_url(),
'url_twitter' => site_url(),
'name' => '404',
'title' => 'PAGE NOT FOUND',
'heading' => 'The page you requested was not found.',
'site_name' => config_item('cms_site_name'),
'site_author' => POWERED_HUNGNG_NAME . ' - ' . POWERED_HUNGNG_EMAIL,
'site_link' => config_item('base_url'),
'url_assets' => assets_themes('Sailors'),
'url_facebook' => site_url(),
'url_twitter' => site_url(),
'url_briefcase' => site_url(),
'url_transit' => site_url()
'url_transit' => site_url()
);
$this->parser->parse($this->template . 'Sailor_error', $data);
}
Expand Down
6 changes: 3 additions & 3 deletions custom/HungNG_CI_Base_Hooks_Log_Query.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public function __construct()
}

if (is_numeric($config['log_threshold'])) {
$this->_threshold = (int) $config['log_threshold'];
$this->_threshold = (int)$config['log_threshold'];
} elseif (is_array($config['log_threshold'])) {
$this->_threshold = 0;
$this->_threshold_array = array_flip($config['log_threshold']);
Expand Down Expand Up @@ -143,8 +143,8 @@ protected static function strlen($str)
* Byte-safe substr()
*
* @param string $str
* @param int $start
* @param int $length
* @param int $start
* @param int $length
*
* @return string
*/
Expand Down
48 changes: 24 additions & 24 deletions hungng/HungNG_CI_Base_Lib_ElasticSearch.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
*/
class HungNG_CI_Base_Lib_ElasticSearch
{
private $client;
private $client;
protected $esHost;
protected $CI;

Expand Down Expand Up @@ -88,8 +88,8 @@ public function get_found_document($index, $type, $id)
//db - collection - id
$params = array(
'index' => $index,
'type' => $type,
'id' => $id
'type' => $type,
'id' => $id
);
$results = $this->client->get($params);

Expand All @@ -100,8 +100,8 @@ public function exists_document($index, $type, $id)
{
$params = array(
'index' => $index,
'type' => $type,
'id' => $id
'type' => $type,
'id' => $id
);

return $this->client->exists($params);
Expand All @@ -111,9 +111,9 @@ public function create_document($index, $type, $id, $body)
{
$params = array(
'index' => $index,
'type' => $type,
'id' => $id,
'body' => $body
'type' => $type,
'id' => $id,
'body' => $body
);

return $this->client->index($params);
Expand All @@ -123,9 +123,9 @@ public function update_document($index, $type, $id, $body)
{
$params = array(
'index' => $index,
'type' => $type,
'id' => $id,
'body' => $body
'type' => $type,
'id' => $id,
'body' => $body
);

return $this->client->update($params);
Expand All @@ -134,10 +134,10 @@ public function update_document($index, $type, $id, $body)
public function delete_document($index, $type, $id)
{
$params = array(
'index' => $index,
'type' => $type,
'index' => $index,
'type' => $type,
'refresh' => 'wait_for', //or true
'id' => $id
'id' => $id
);

return $this->client->delete($params);
Expand All @@ -147,20 +147,20 @@ public function search_document($index, $type, $from, $size, $query, $all)
{
$params = array(
'index' => $index,
'type' => $type,
'body' => array(
'from' => $from,
'size' => $size,
'type' => $type,
'body' => array(
'from' => $from,
'size' => $size,
'query' => $query
)
);
if ($all) {
$params = array(
'index' => $index,
'type' => $type,
'from' => $from,
'size' => $size,
'body' => array('query' => $query)
'type' => $type,
'from' => $from,
'size' => $size,
'body' => array('query' => $query)
);
}

Expand All @@ -173,8 +173,8 @@ public function count_documents($index, $type, $query)
if ($exists_index === 200) {
$params = array(
'index' => $index,
'type' => $type,
'body' => array('query' => $query)
'type' => $type,
'body' => array('query' => $query)
);
$response = $this->client->count($params);
} else {
Expand Down
96 changes: 48 additions & 48 deletions hungng/HungNG_CI_Base_Lib_Hmvc_Migration.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,50 +28,50 @@
*
* @author Michel Roca
*
* @property CI_Benchmark $benchmark This class enables you to mark points and calculate the time difference between them. Memory consumption can also be displayed.
* @property CI_Calendar $calendar This class enables the creation of calendars
* @property CI_Cache $cache Caching Class
* @property CI_Cart $cart Shopping Cart Class
* @property CI_Config $config This class contains functions that enable config files to be managed
* @property CI_Controller $controller This class object is the super class that every library in CodeIgniter will be assigned to
* @property CI_DB_forge $dbforge Database Forge Class
* @property CI_Benchmark $benchmark This class enables you to mark points and calculate the time difference between them. Memory consumption can also be displayed.
* @property CI_Calendar $calendar This class enables the creation of calendars
* @property CI_Cache $cache Caching Class
* @property CI_Cart $cart Shopping Cart Class
* @property CI_Config $config This class contains functions that enable config files to be managed
* @property CI_Controller $controller This class object is the super class that every library in CodeIgniter will be assigned to
* @property CI_DB_forge $dbforge Database Forge Class
* @property CI_DB_pdo_driver|CI_DB_query_builder|CI_DB_driver $db This is the platform-independent base Query Builder implementation class
* @property CI_DB_utility $dbutil Database Utility Class
* @property CI_Driver_Library $driver Driver Library Class
* @property CI_Email $email Permits email to be sent using Mail, Sendmail, or SMTP
* @property CI_Encrypt $encrypt Provides two-way keyed encoding using Mcrypt
* @property CI_Encryption $encryption Provides two-way keyed encryption via PHP's MCrypt and/or OpenSSL extensions
* @property CI_Exceptions $exceptions Exceptions Class
* @property CI_Form_validation $form_validation Form Validation Class
* @property CI_FTP $ftp FTP Class
* @property CI_Hooks $hooks Provides a mechanism to extend the base system without hacking
* @property CI_Image_lib $image_lib Image Manipulation class
* @property CI_Input $input Pre-processes global input data for security
* @property CI_Javascript $javascript Javascript Class
* @property CI_Jquery $jquery Jquery Class
* @property CI_Lang $lang Language Class
* @property CI_Loader $load Loads framework components
* @property CI_Log $log Logging Class
* @property CI_Migration $migration All migrations should implement this, forces up() and down() and gives access to the CI super-global
* @property CI_Model $model CodeIgniter Model Class
* @property CI_Output $output Responsible for sending final output to the browser
* @property CI_Pagination $pagination Pagination Class
* @property CI_Parser $parser Parser Class
* @property CI_Profiler $profiler This class enables you to display benchmark, query, and other data in order to help with debugging and optimization.
* @property CI_Router $router Parses URIs and determines routing
* @property CI_Security $security Security Class
* @property CI_Session $session Session Class
* @property CI_Table $table Lets you create tables manually or from database result objects, or arrays
* @property CI_Trackback $trackback Trackback Sending/Receiving Class
* @property CI_Typography $typography Typography Class
* @property CI_Unit_test $unit Simple testing class
* @property CI_Upload $upload File Uploading Class
* @property CI_URI $uri Parses URIs and determines routing
* @property CI_User_agent $agent Identifies the platform, browser, robot, or mobile device of the browsing agent
* @property CI_Xmlrpc $xmlrpc XML-RPC request handler class
* @property CI_Xmlrpcs $xmlrpcs XML-RPC server class
* @property CI_Zip $zip Zip Compression Class
* @property CI_Utf8 $utf8 Provides support for UTF-8 environments
* @property CI_DB_utility $dbutil Database Utility Class
* @property CI_Driver_Library $driver Driver Library Class
* @property CI_Email $email Permits email to be sent using Mail, Sendmail, or SMTP
* @property CI_Encrypt $encrypt Provides two-way keyed encoding using Mcrypt
* @property CI_Encryption $encryption Provides two-way keyed encryption via PHP's MCrypt and/or OpenSSL extensions
* @property CI_Exceptions $exceptions Exceptions Class
* @property CI_Form_validation $form_validation Form Validation Class
* @property CI_FTP $ftp FTP Class
* @property CI_Hooks $hooks Provides a mechanism to extend the base system without hacking
* @property CI_Image_lib $image_lib Image Manipulation class
* @property CI_Input $input Pre-processes global input data for security
* @property CI_Javascript $javascript Javascript Class
* @property CI_Jquery $jquery Jquery Class
* @property CI_Lang $lang Language Class
* @property CI_Loader $load Loads framework components
* @property CI_Log $log Logging Class
* @property CI_Migration $migration All migrations should implement this, forces up() and down() and gives access to the CI super-global
* @property CI_Model $model CodeIgniter Model Class
* @property CI_Output $output Responsible for sending final output to the browser
* @property CI_Pagination $pagination Pagination Class
* @property CI_Parser $parser Parser Class
* @property CI_Profiler $profiler This class enables you to display benchmark, query, and other data in order to help with debugging and optimization.
* @property CI_Router $router Parses URIs and determines routing
* @property CI_Security $security Security Class
* @property CI_Session $session Session Class
* @property CI_Table $table Lets you create tables manually or from database result objects, or arrays
* @property CI_Trackback $trackback Trackback Sending/Receiving Class
* @property CI_Typography $typography Typography Class
* @property CI_Unit_test $unit Simple testing class
* @property CI_Upload $upload File Uploading Class
* @property CI_URI $uri Parses URIs and determines routing
* @property CI_User_agent $agent Identifies the platform, browser, robot, or mobile device of the browsing agent
* @property CI_Xmlrpc $xmlrpc XML-RPC request handler class
* @property CI_Xmlrpcs $xmlrpcs XML-RPC server class
* @property CI_Zip $zip Zip Compression Class
* @property CI_Utf8 $utf8 Provides support for UTF-8 environments
*/
class HungNG_CI_Base_Lib_Hmvc_Migration
{
Expand Down Expand Up @@ -114,9 +114,9 @@ public function __construct($config = array())
// If the migrations table is missing, make it
if (!$this->db->table_exists('migrations')) {
$this->dbforge->add_field(array(
'module' => array('type' => 'VARCHAR', 'constraint' => 20),
'version' => array('type' => 'INT', 'constraint' => 3),
));
'module' => array('type' => 'VARCHAR', 'constraint' => 20),
'version' => array('type' => 'INT', 'constraint' => 3),
));

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

Expand Down Expand Up @@ -360,7 +360,7 @@ public function latest()

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

// --------------------------------------------------------------------
Expand Down Expand Up @@ -435,7 +435,7 @@ protected function _get_version($module = '')
/**
* Stores the current schema version
*
* @param int $migrations Migration reached
* @param int $migrations Migration reached
* @param string $module
*
* @return bool
Expand Down
Loading
Loading