summaryrefslogtreecommitdiffstats
path: root/system/core
diff options
context:
space:
mode:
Diffstat (limited to 'system/core')
-rw-r--r--system/core/Benchmark.php3
-rw-r--r--system/core/CodeIgniter.php43
-rw-r--r--system/core/Common.php14
-rw-r--r--system/core/Config.php8
-rw-r--r--system/core/Controller.php5
-rw-r--r--system/core/Exceptions.php3
-rw-r--r--system/core/Hooks.php6
-rw-r--r--system/core/Input.php7
-rw-r--r--system/core/Lang.php7
-rw-r--r--system/core/Loader.php191
-rw-r--r--system/core/Log.php18
-rw-r--r--system/core/Model.php5
-rw-r--r--system/core/Output.php11
-rw-r--r--system/core/Router.php5
-rw-r--r--system/core/Security.php12
-rw-r--r--system/core/URI.php5
-rw-r--r--system/core/Utf8.php5
-rw-r--r--system/core/compat/hash.php3
-rw-r--r--system/core/compat/mbstring.php3
-rw-r--r--system/core/compat/password.php3
-rw-r--r--system/core/compat/standard.php3
21 files changed, 176 insertions, 184 deletions
diff --git a/system/core/Benchmark.php b/system/core/Benchmark.php
index 86f3ae1aa..e420f62a1 100644
--- a/system/core/Benchmark.php
+++ b/system/core/Benchmark.php
@@ -131,6 +131,3 @@ class CI_Benchmark {
}
}
-
-/* End of file Benchmark.php */
-/* Location: ./system/core/Benchmark.php */ \ No newline at end of file
diff --git a/system/core/CodeIgniter.php b/system/core/CodeIgniter.php
index 59fdba0e5..d830c1829 100644
--- a/system/core/CodeIgniter.php
+++ b/system/core/CodeIgniter.php
@@ -159,6 +159,29 @@ if ( ! is_php('5.4'))
/*
* ------------------------------------------------------
+ * Should we use a Composer autoloader?
+ * ------------------------------------------------------
+ */
+ if ($composer_autoload = config_item('composer_autoload'))
+ {
+ if ($composer_autoload === TRUE)
+ {
+ file_exists(APPPATH.'vendor/autoload.php')
+ ? require_once(APPPATH.'vendor/autoload.php')
+ : log_message('error', '$config[\'composer_autoload\'] is set to TRUE but '.APPPATH.'vendor/autoload.php was not found.');
+ }
+ elseif (file_exists($composer_autoload))
+ {
+ require_once($composer_autoload);
+ }
+ else
+ {
+ log_message('error', 'Could not find the specified $config[\'composer_autoload\'] path: '.$composer_autoload);
+ }
+ }
+
+/*
+ * ------------------------------------------------------
* Start the timer... tick tock tick tock...
* ------------------------------------------------------
*/
@@ -461,23 +484,6 @@ if ( ! is_php('5.4'))
/*
* ------------------------------------------------------
- * Should we use a Composer autoloader?
- * ------------------------------------------------------
- */
- if ($composer_autoload = config_item('composer_autoload'))
- {
- if ($composer_autoload === TRUE && file_exists(APPPATH.'vendor/autoload.php'))
- {
- require_once(APPPATH.'vendor/autoload.php');
- }
- elseif (file_exists($composer_autoload))
- {
- require_once($composer_autoload);
- }
- }
-
-/*
- * ------------------------------------------------------
* Is there a "pre_controller" hook?
* ------------------------------------------------------
*/
@@ -533,6 +539,3 @@ if ( ! is_php('5.4'))
* ------------------------------------------------------
*/
$EXT->call_hook('post_system');
-
-/* End of file CodeIgniter.php */
-/* Location: ./system/core/CodeIgniter.php */ \ No newline at end of file
diff --git a/system/core/Common.php b/system/core/Common.php
index b5a36636e..c3198b31f 100644
--- a/system/core/Common.php
+++ b/system/core/Common.php
@@ -54,7 +54,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
if ( ! function_exists('is_php'))
{
/**
- * Determines if the current version of PHP is greater then the supplied value
+ * Determines if the current version of PHP is equal to or greater than the supplied value
*
* @param string
* @return bool TRUE if the current version is $version or higher
@@ -555,15 +555,14 @@ if ( ! function_exists('set_status_header'))
}
}
- $server_protocol = isset($_SERVER['SERVER_PROTOCOL']) ? $_SERVER['SERVER_PROTOCOL'] : FALSE;
-
if (strpos(PHP_SAPI, 'cgi') === 0)
{
header('Status: '.$code.' '.$text, TRUE);
}
else
{
- header(($server_protocol ? $server_protocol : 'HTTP/1.1').' '.$code.' '.$text, TRUE, $code);
+ $server_protocol = isset($_SERVER['SERVER_PROTOCOL']) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.1';
+ header($server_protocol.' '.$code.' '.$text, TRUE, $code);
}
}
}
@@ -615,7 +614,7 @@ if ( ! function_exists('_error_handler'))
$_error->log_exception($severity, $message, $filepath, $line);
// Should we display the error?
- if (ini_get('display_errors'))
+ if (str_ireplace(array('off', 'none', 'no', 'false', 'null'), '', ini_get('display_errors')))
{
$_error->show_php_error($severity, $message, $filepath, $line);
}
@@ -650,7 +649,7 @@ if ( ! function_exists('_exception_handler'))
$_error->log_exception('error', 'Exception: '.$exception->getMessage(), $exception->getFile(), $exception->getLine());
// Should we display the error?
- if (ini_get('display_errors'))
+ if (str_ireplace(array('off', 'none', 'no', 'false', 'null'), '', ini_get('display_errors')))
{
$_error->show_exception($exception);
}
@@ -842,6 +841,3 @@ if ( ! function_exists('function_usable'))
return FALSE;
}
}
-
-/* End of file Common.php */
-/* Location: ./system/core/Common.php */ \ No newline at end of file
diff --git a/system/core/Config.php b/system/core/Config.php
index d5ce91f48..a191a7727 100644
--- a/system/core/Config.php
+++ b/system/core/Config.php
@@ -72,6 +72,8 @@ class CI_Config {
*/
public $_config_paths = array(APPPATH);
+ // --------------------------------------------------------------------
+
/**
* Class constructor
*
@@ -82,7 +84,6 @@ class CI_Config {
public function __construct()
{
$this->config =& get_config();
- log_message('debug', 'Config Class Initialized');
// Set the base_url automatically if none was provided
if (empty($this->config['base_url']))
@@ -101,6 +102,8 @@ class CI_Config {
$this->set_item('base_url', $base_url);
}
+
+ log_message('info', 'Config Class Initialized');
}
// --------------------------------------------------------------------
@@ -356,6 +359,3 @@ class CI_Config {
}
}
-
-/* End of file Config.php */
-/* Location: ./system/core/Config.php */ \ No newline at end of file
diff --git a/system/core/Controller.php b/system/core/Controller.php
index 06005b058..a0d97baa2 100644
--- a/system/core/Controller.php
+++ b/system/core/Controller.php
@@ -77,7 +77,7 @@ class CI_Controller {
$this->load =& load_class('Loader', 'core');
$this->load->initialize();
- log_message('debug', 'Controller Class Initialized');
+ log_message('info', 'Controller Class Initialized');
}
// --------------------------------------------------------------------
@@ -94,6 +94,3 @@ class CI_Controller {
}
}
-
-/* End of file Controller.php */
-/* Location: ./system/core/Controller.php */ \ No newline at end of file
diff --git a/system/core/Exceptions.php b/system/core/Exceptions.php
index 550e03b78..fc25f57e6 100644
--- a/system/core/Exceptions.php
+++ b/system/core/Exceptions.php
@@ -273,6 +273,3 @@ class CI_Exceptions {
}
}
-
-/* End of file Exceptions.php */
-/* Location: ./system/core/Exceptions.php */ \ No newline at end of file
diff --git a/system/core/Hooks.php b/system/core/Hooks.php
index 429d6bceb..08479b133 100644
--- a/system/core/Hooks.php
+++ b/system/core/Hooks.php
@@ -88,8 +88,7 @@ class CI_Hooks {
public function __construct()
{
$CFG =& load_class('Config', 'core');
-
- log_message('debug', 'Hooks Class Initialized');
+ log_message('info', 'Hooks Class Initialized');
// If hooks are not enabled in the config file
// there is nothing else to do
@@ -265,6 +264,3 @@ class CI_Hooks {
}
}
-
-/* End of file Hooks.php */
-/* Location: ./system/core/Hooks.php */ \ No newline at end of file
diff --git a/system/core/Input.php b/system/core/Input.php
index 358417c79..72425c1c1 100644
--- a/system/core/Input.php
+++ b/system/core/Input.php
@@ -123,8 +123,6 @@ class CI_Input {
*/
public function __construct()
{
- log_message('debug', 'Input Class Initialized');
-
$this->_allow_get_array = (config_item('allow_get_array') === TRUE);
$this->_enable_xss = (config_item('global_xss_filtering') === TRUE);
$this->_enable_csrf = (config_item('csrf_protection') === TRUE);
@@ -140,6 +138,8 @@ class CI_Input {
// Sanitize global arrays
$this->_sanitize_globals();
+
+ log_message('info', 'Input Class Initialized');
}
// --------------------------------------------------------------------
@@ -847,6 +847,3 @@ class CI_Input {
}
}
-
-/* End of file Input.php */
-/* Location: ./system/core/Input.php */ \ No newline at end of file
diff --git a/system/core/Lang.php b/system/core/Lang.php
index fe1dc1a9d..deb955414 100644
--- a/system/core/Lang.php
+++ b/system/core/Lang.php
@@ -69,7 +69,7 @@ class CI_Lang {
*/
public function __construct()
{
- log_message('debug', 'Language Class Initialized');
+ log_message('info', 'Language Class Initialized');
}
// --------------------------------------------------------------------
@@ -172,7 +172,7 @@ class CI_Lang {
$this->is_loaded[$langfile] = $idiom;
$this->language = array_merge($this->language, $lang);
- log_message('debug', 'Language file loaded: language/'.$idiom.'/'.$langfile);
+ log_message('info', 'Language file loaded: language/'.$idiom.'/'.$langfile);
return TRUE;
}
@@ -201,6 +201,3 @@ class CI_Lang {
}
}
-
-/* End of file Lang.php */
-/* Location: ./system/core/Lang.php */ \ No newline at end of file
diff --git a/system/core/Loader.php b/system/core/Loader.php
index d930dbfa8..ff7838640 100644
--- a/system/core/Loader.php
+++ b/system/core/Loader.php
@@ -138,7 +138,7 @@ class CI_Loader {
$this->_ci_ob_level = ob_get_level();
$this->_ci_classes =& is_loaded();
- log_message('debug', 'Loader Class Initialized');
+ log_message('info', 'Loader Class Initialized');
}
// --------------------------------------------------------------------
@@ -215,7 +215,7 @@ class CI_Loader {
$params = NULL;
}
- $this->_ci_load_class($library, $params, $object_name);
+ $this->_ci_load_library($library, $params, $object_name);
return $this;
}
@@ -577,7 +577,7 @@ class CI_Loader {
include_once($base_helper);
$this->_ci_helpers[$helper] = TRUE;
- log_message('debug', 'Helper loaded: '.$helper);
+ log_message('info', 'Helper loaded: '.$helper);
continue;
}
@@ -589,7 +589,7 @@ class CI_Loader {
include_once($path.'helpers/'.$helper.'.php');
$this->_ci_helpers[$helper] = TRUE;
- log_message('debug', 'Helper loaded: '.$helper);
+ log_message('info', 'Helper loaded: '.$helper);
break;
}
}
@@ -914,7 +914,7 @@ class CI_Loader {
include($_ci_path); // include() vs include_once() allows for multiple views with the same name
}
- log_message('debug', 'File loaded: '.$_ci_path);
+ log_message('info', 'File loaded: '.$_ci_path);
// Return the file data if requested
if ($_ci_return === TRUE)
@@ -949,17 +949,17 @@ class CI_Loader {
// --------------------------------------------------------------------
/**
- * Internal CI Class Loader
+ * Internal CI Library Loader
*
* @used-by CI_Loader::library()
- * @uses CI_Loader::_ci_init_class()
+ * @uses CI_Loader::_ci_init_library()
*
* @param string $class Class name to load
* @param mixed $params Optional parameters to pass to the class constructor
* @param string $object_name Optional object name to assign to
* @return void
*/
- protected function _ci_load_class($class, $params = NULL, $object_name = NULL)
+ protected function _ci_load_library($class, $params = NULL, $object_name = NULL)
{
// Get the class name, and while we're at it trim any slashes.
// The directory path can be included as part of the class name,
@@ -982,47 +982,22 @@ class CI_Loader {
}
$class = ucfirst($class);
- $subclass = APPPATH.'libraries/'.$subdir.config_item('subclass_prefix').$class.'.php';
- // Is this a class extension request?
- if (file_exists($subclass))
+ // Is this a stock library? There are a few special conditions if so ...
+ if (file_exists(BASEPATH.'libraries/'.$subdir.$class.'.php'))
{
- $baseclass = BASEPATH.'libraries/'.$subdir.$class.'.php';
-
- if ( ! file_exists($baseclass))
- {
- log_message('error', 'Unable to load the requested class: '.$class);
- show_error('Unable to load the requested class: '.$class);
- }
-
- // Safety: Was the class already loaded by a previous call?
- if (class_exists(config_item('subclass_prefix').$class, FALSE))
- {
- // Before we deem this to be a duplicate request, let's see
- // if a custom object name is being supplied. If so, we'll
- // return a new instance of the object
- if ($object_name !== NULL)
- {
- $CI =& get_instance();
- if ( ! isset($CI->$object_name))
- {
- return $this->_ci_init_class($class, config_item('subclass_prefix'), $params, $object_name);
- }
- }
-
- log_message('debug', $class.' class already loaded. Second attempt ignored.');
- return;
- }
-
- include_once($baseclass);
- include_once($subclass);
-
- return $this->_ci_init_class($class, config_item('subclass_prefix'), $params, $object_name);
+ return $this->_ci_load_stock_library($class, $subdir, $params, $object_name);
}
// Let's search for the requested library file and load it.
foreach ($this->_ci_library_paths as $path)
{
+ // BASEPATH has already been checked for
+ if ($path === BASEPATH)
+ {
+ continue;
+ }
+
$filepath = $path.'libraries/'.$subdir.$class.'.php';
// Safety: Was the class already loaded by a previous call?
@@ -1036,7 +1011,7 @@ class CI_Loader {
$CI =& get_instance();
if ( ! isset($CI->$object_name))
{
- return $this->_ci_init_class($class, '', $params, $object_name);
+ return $this->_ci_init_library($class, '', $params, $object_name);
}
}
@@ -1050,13 +1025,13 @@ class CI_Loader {
}
include_once($filepath);
- return $this->_ci_init_class($class, '', $params, $object_name);
+ return $this->_ci_init_library($class, '', $params, $object_name);
}
// One last attempt. Maybe the library is in a subdirectory, but it wasn't specified?
if ($subdir === '')
{
- return $this->_ci_load_class($class.'/'.$class, $params, $object_name);
+ return $this->_ci_load_library($class.'/'.$class, $params, $object_name);
}
// If we got this far we were unable to find the requested class.
@@ -1067,9 +1042,84 @@ class CI_Loader {
// --------------------------------------------------------------------
/**
- * Internal CI Class Instantiator
+ * Internal CI Stock Library Loader
+ *
+ * @used-by CI_Loader::_ci_load_library()
+ * @uses CI_Loader::_ci_init_library()
+ *
+ * @param string $library Library name to load
+ * @param string $file_path Path to the library filename, relative to libraries/
+ * @param mixed $params Optional parameters to pass to the class constructor
+ * @param string $object_name Optional object name to assign to
+ * @return void
+ */
+ protected function _ci_load_stock_library($library_name, $file_path, $params, $object_name)
+ {
+ $prefix = 'CI_';
+
+ if (class_exists($prefix.$library_name, FALSE))
+ {
+ if (class_exists(config_item('subclass_prefix').$library_name, FALSE))
+ {
+ $prefix = config_item('subclass_prefix');
+ }
+
+ // Before we deem this to be a duplicate request, let's see
+ // if a custom object name is being supplied. If so, we'll
+ // return a new instance of the object
+ if ($object_name !== NULL)
+ {
+ $CI =& get_instance();
+ if ( ! isset($CI->$object_name))
+ {
+ return $this->_ci_init_library($library_name, $prefix, $params, $object_name);
+ }
+ }
+
+ log_message('debug', $library_name.' class already loaded. Second attempt ignored.');
+ return;
+ }
+ elseif (file_exists(APPPATH.'libraries/'.$file_path.$library_name.'.php'))
+ {
+ // Override
+ include_once(APPPATH.'libraries/'.$file_path.$library_name.'.php');
+ if (class_exists($prefix.$library_name, FALSE))
+ {
+ return $this->_ci_init_library($library_name, $prefix, $params, $object_name);
+ }
+ else
+ {
+ log_message('debug', APPPATH.'libraries/'.$file_path.$library_name.'.php exists, but does not declare '.$prefix.$library_name);
+ }
+ }
+
+ include_once(BASEPATH.'libraries/'.$file_path.$library_name.'.php');
+
+ // Check for extensions
+ $subclass = config_item('subclass_prefix').$library_name;
+ if (file_exists(APPPATH.'libraries/'.$file_path.$subclass.'.php'))
+ {
+ include_once(APPPATH.'libraries/'.$file_path.$subclass.'.php');
+ if (class_exists($subclass, FALSE))
+ {
+ $prefix = config_item('subclass_prefix');
+ }
+ else
+ {
+ log_message('debug', APPPATH.'libraries/'.$file_path.$subclass.'.php exists, but does not declare '.$subclass);
+ }
+ }
+
+ return $this->_ci_init_library($library_name, $prefix, $params, $object_name);
+ }
+
+ // --------------------------------------------------------------------
+
+ /**
+ * Internal CI Library Instantiator
*
- * @used-by CI_Loader::_ci_load_class()
+ * @used-by CI_Loader::_ci_load_stock_library()
+ * @used-by CI_Loader::_ci_load_library()
*
* @param string $class Class name
* @param string $prefix Class name prefix
@@ -1080,7 +1130,7 @@ class CI_Loader {
* @param string $object_name Optional object name to assign to
* @return void
*/
- protected function _ci_init_class($class, $prefix = '', $config = FALSE, $object_name = NULL)
+ protected function _ci_init_library($class, $prefix, $config = FALSE, $object_name = NULL)
{
// Is there an associated config file for this class? Note: these should always be lowercase
if ($config === NULL)
@@ -1128,31 +1178,13 @@ class CI_Loader {
}
}
- if ($prefix === '')
- {
- if (class_exists('CI_'.$class, FALSE))
- {
- $name = 'CI_'.$class;
- }
- elseif (class_exists(config_item('subclass_prefix').$class, FALSE))
- {
- $name = config_item('subclass_prefix').$class;
- }
- else
- {
- $name = $class;
- }
- }
- else
- {
- $name = $prefix.$class;
- }
+ $class_name = $prefix.$class;
// Is the class name valid?
- if ( ! class_exists($name, FALSE))
+ if ( ! class_exists($class_name, FALSE))
{
- log_message('error', 'Non-existent class: '.$name);
- show_error('Non-existent class: '.$name);
+ log_message('error', 'Non-existent class: '.$class_name);
+ show_error('Non-existent class: '.$class_name);
}
// Set the variable name we will assign the class to
@@ -1170,13 +1202,13 @@ class CI_Loader {
$CI =& get_instance();
if (isset($CI->$object_name))
{
- if ($CI->$object_name instanceof $name)
+ if ($CI->$object_name instanceof $class_name)
{
- log_message('debug', $class." has already been instantiated as '".$object_name."'. Second attempt aborted.");
+ log_message('debug', $class_name." has already been instantiated as '".$object_name."'. Second attempt aborted.");
return;
}
- show_error("Resource '".$object_name."' already exists and is not a ".$class." instance.");
+ show_error("Resource '".$object_name."' already exists and is not a ".$class_name." instance.");
}
// Save the class name and object name
@@ -1184,8 +1216,8 @@ class CI_Loader {
// Instantiate the class
$CI->$object_name = isset($config)
- ? new $name($config)
- : new $name();
+ ? new $class_name($config)
+ : new $class_name();
}
// --------------------------------------------------------------------
@@ -1200,7 +1232,11 @@ class CI_Loader {
*/
protected function _ci_autoloader()
{
- include(APPPATH.'config/autoload.php');
+ if (file_exists(APPPATH.'config/autoload.php'))
+ {
+ include(APPPATH.'config/autoload.php');
+ }
+
if (file_exists(APPPATH.'config/'.ENVIRONMENT.'/autoload.php'))
{
include(APPPATH.'config/'.ENVIRONMENT.'/autoload.php');
@@ -1333,6 +1369,3 @@ class CI_Loader {
}
}
-
-/* End of file Loader.php */
-/* Location: ./system/core/Loader.php */ \ No newline at end of file
diff --git a/system/core/Log.php b/system/core/Log.php
index 7d318ed57..833316273 100644
--- a/system/core/Log.php
+++ b/system/core/Log.php
@@ -198,7 +198,20 @@ class CI_Log {
return FALSE;
}
- $message .= $level.' - '.date($this->_date_fmt).' --> '.$msg."\n";
+ // Instantiating DateTime with microseconds appended to initial date is needed for proper support of this format
+ if (strpos($this->_date_fmt, 'u') !== FALSE)
+ {
+ $microtime_full = microtime(TRUE);
+ $microtime_short = sprintf("%06d", ($microtime_full - floor($microtime_full)) * 1000000);
+ $date = new DateTime(date('Y-m-d H:i:s.'.$microtime_short, $microtime_full));
+ $date = $date->format($this->_date_fmt);
+ }
+ else
+ {
+ $date = date($this->_date_fmt);
+ }
+
+ $message .= $level.' - '.$date.' --> '.$msg."\n";
flock($fp, LOCK_EX);
@@ -222,6 +235,3 @@ class CI_Log {
}
}
-
-/* End of file Log.php */
-/* Location: ./system/core/Log.php */ \ No newline at end of file
diff --git a/system/core/Model.php b/system/core/Model.php
index 1cb00f742..a0469de11 100644
--- a/system/core/Model.php
+++ b/system/core/Model.php
@@ -55,7 +55,7 @@ class CI_Model {
*/
public function __construct()
{
- log_message('debug', 'Model Class Initialized');
+ log_message('info', 'Model Class Initialized');
}
// --------------------------------------------------------------------
@@ -78,6 +78,3 @@ class CI_Model {
}
}
-
-/* End of file Model.php */
-/* Location: ./system/core/Model.php */ \ No newline at end of file
diff --git a/system/core/Output.php b/system/core/Output.php
index beac6b377..02f66936c 100644
--- a/system/core/Output.php
+++ b/system/core/Output.php
@@ -141,7 +141,7 @@ class CI_Output {
// Get mime types for later
$this->mimes =& get_mimes();
- log_message('debug', 'Output Class Initialized');
+ log_message('info', 'Output Class Initialized');
}
// --------------------------------------------------------------------
@@ -391,7 +391,7 @@ class CI_Output {
/**
* Display Output
*
- * Processes sends the sends finalized output data to the browser along
+ * Processes and sends finalized output data to the browser along
* with any server headers and profile data. It also stops benchmark
* timers so the page rendering speed and memory usage can be shown.
*
@@ -491,7 +491,7 @@ class CI_Output {
}
echo $output;
- log_message('debug', 'Final output sent to browser');
+ log_message('info', 'Final output sent to browser');
log_message('debug', 'Total execution time: '.$elapsed);
return;
}
@@ -528,7 +528,7 @@ class CI_Output {
echo $output; // Send it to the browser!
}
- log_message('debug', 'Final output sent to browser');
+ log_message('info', 'Final output sent to browser');
log_message('debug', 'Total execution time: '.$elapsed);
}
@@ -777,6 +777,3 @@ class CI_Output {
}
}
-
-/* End of file Output.php */
-/* Location: ./system/core/Output.php */ \ No newline at end of file
diff --git a/system/core/Router.php b/system/core/Router.php
index b21335fc2..eb3da2285 100644
--- a/system/core/Router.php
+++ b/system/core/Router.php
@@ -147,7 +147,7 @@ class CI_Router {
}
}
- log_message('debug', 'Router Class Initialized');
+ log_message('info', 'Router Class Initialized');
}
// --------------------------------------------------------------------
@@ -525,6 +525,3 @@ class CI_Router {
}
}
-
-/* End of file Router.php */
-/* Location: ./system/core/Router.php */ \ No newline at end of file
diff --git a/system/core/Security.php b/system/core/Security.php
index 2bf0f6284..7c18c7406 100644
--- a/system/core/Security.php
+++ b/system/core/Security.php
@@ -75,7 +75,7 @@ class CI_Security {
/**
* Character set
*
- * Will be overriden by the constructor.
+ * Will be overridden by the constructor.
*
* @var string
*/
@@ -192,7 +192,7 @@ class CI_Security {
$this->charset = strtoupper(config_item('charset'));
- log_message('debug', 'Security Class Initialized');
+ log_message('info', 'Security Class Initialized');
}
// --------------------------------------------------------------------
@@ -244,7 +244,7 @@ class CI_Security {
$this->_csrf_set_hash();
$this->csrf_set_cookie();
- log_message('debug', 'CSRF token verified');
+ log_message('info', 'CSRF token verified');
return $this;
}
@@ -275,7 +275,7 @@ class CI_Security {
$secure_cookie,
config_item('cookie_httponly')
);
- log_message('debug', 'CRSF cookie Set');
+ log_message('info', 'CRSF cookie sent');
return $this;
}
@@ -533,7 +533,6 @@ class CI_Security {
return ($str === $converted_string);
}
- log_message('debug', 'XSS Filtering completed');
return $str;
}
@@ -998,6 +997,3 @@ class CI_Security {
}
}
-
-/* End of file Security.php */
-/* Location: ./system/core/Security.php */ \ No newline at end of file
diff --git a/system/core/URI.php b/system/core/URI.php
index 39d1a8f30..9bc34ace7 100644
--- a/system/core/URI.php
+++ b/system/core/URI.php
@@ -140,7 +140,7 @@ class CI_URI {
}
}
- log_message('debug', 'URI Class Initialized');
+ log_message('info', 'URI Class Initialized');
}
// --------------------------------------------------------------------
@@ -639,6 +639,3 @@ class CI_URI {
}
}
-
-/* End of file URI.php */
-/* Location: ./system/core/URI.php */ \ No newline at end of file
diff --git a/system/core/Utf8.php b/system/core/Utf8.php
index bca95c206..9d8ac41e1 100644
--- a/system/core/Utf8.php
+++ b/system/core/Utf8.php
@@ -74,7 +74,7 @@ class CI_Utf8 {
log_message('debug', 'UTF-8 Support Disabled');
}
- log_message('debug', 'Utf8 Class Initialized');
+ log_message('info', 'Utf8 Class Initialized');
}
// --------------------------------------------------------------------
@@ -162,6 +162,3 @@ class CI_Utf8 {
}
}
-
-/* End of file Utf8.php */
-/* Location: ./system/core/Utf8.php */ \ No newline at end of file
diff --git a/system/core/compat/hash.php b/system/core/compat/hash.php
index aeacabdb9..477535dca 100644
--- a/system/core/compat/hash.php
+++ b/system/core/compat/hash.php
@@ -196,6 +196,3 @@ if ( ! function_exists('hash_pbkdf2'))
return substr($raw_output ? $hash : bin2hex($hash), 0, $length);
}
}
-
-/* End of file hash.php */
-/* Location: ./system/core/compat/hash.php */ \ No newline at end of file
diff --git a/system/core/compat/mbstring.php b/system/core/compat/mbstring.php
index 52ca6d02f..ddb2bae47 100644
--- a/system/core/compat/mbstring.php
+++ b/system/core/compat/mbstring.php
@@ -147,6 +147,3 @@ if ( ! function_exists('mb_substr'))
: substr($str, $start);
}
}
-
-/* End of file mbstring.php */
-/* Location: ./system/core/compat/mbstring.php */ \ No newline at end of file
diff --git a/system/core/compat/password.php b/system/core/compat/password.php
index 00befb022..7b933aa04 100644
--- a/system/core/compat/password.php
+++ b/system/core/compat/password.php
@@ -231,6 +231,3 @@ if ( ! function_exists('password_verify'))
return ($compare === 0);
}
}
-
-/* End of file password.php */
-/* Location: ./system/core/compat/password.php */ \ No newline at end of file
diff --git a/system/core/compat/standard.php b/system/core/compat/standard.php
index f24f7f8ae..5a428c114 100644
--- a/system/core/compat/standard.php
+++ b/system/core/compat/standard.php
@@ -387,6 +387,3 @@ if ( ! function_exists('quoted_printable_encode'))
return $output;
}
}
-
-/* End of file standard.php */
-/* Location: ./system/core/compat/standard.php */ \ No newline at end of file
generated by cgit v1.2.3-24-g4f1b (git 2.32.0) at 2024-11-06 06:36:48 +0100