summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2013-02-15 21:13:53 +0100
committerAndrey Andreev <narf@bofh.bg>2013-02-15 21:13:53 +0100
commit73abf95a507879d3893d933cc769e11275dbad75 (patch)
tree338d0a3322bc84268e99323131ff43b4620fee79
parent3ba26413f3fabe64f77f936a357845d118f950f5 (diff)
parent62f7cdf3a6f5d701430267ef9ba9bfd92650deab (diff)
Merge pull request #2243 from chrispassas/develop
Update system/core/Log.php
-rw-r--r--application/config/config.php11
-rw-r--r--system/core/Log.php7
-rw-r--r--user_guide_src/source/changelog.rst1
3 files changed, 18 insertions, 1 deletions
diff --git a/application/config/config.php b/application/config/config.php
index 415474e06..6f597b1e2 100644
--- a/application/config/config.php
+++ b/application/config/config.php
@@ -226,6 +226,17 @@ $config['log_path'] = '';
/*
|--------------------------------------------------------------------------
+| Log File Extension
+|--------------------------------------------------------------------------
+|
+| Leave this BLANK unless you would like to set something other than the default
+| 'php'. For example you could change it to 'log'.
+|
+*/
+$config['log_file_extension'] = '';
+
+/*
+|--------------------------------------------------------------------------
| Date Format for Logs
|--------------------------------------------------------------------------
|
diff --git a/system/core/Log.php b/system/core/Log.php
index f5d091e14..0749de8ba 100644
--- a/system/core/Log.php
+++ b/system/core/Log.php
@@ -97,6 +97,8 @@ class CI_Log {
$this->_log_path = ($config['log_path'] !== '') ? $config['log_path'] : APPPATH.'logs/';
+ $this->_log_ext = ($config['log_file_extension'] !== '') ? ltrim($config['log_file_extension'], '.') : $this->_log_ext;
+
file_exists($this->_log_path) OR mkdir($this->_log_path, DIR_WRITE_MODE, TRUE);
if ( ! is_dir($this->_log_path) OR ! is_really_writable($this->_log_path))
@@ -153,7 +155,10 @@ class CI_Log {
if ( ! file_exists($filepath))
{
$newfile = TRUE;
- $message .= '<'."?php defined('BASEPATH') OR exit('No direct script access allowed'); ?".">\n\n";
+ if($this->_log_ext === 'php')
+ {
+ $message .= '<'."?php defined('BASEPATH') OR exit('No direct script access allowed'); ?".">\n\n";
+ }
}
if ( ! $fp = @fopen($filepath, FOPEN_WRITE_CREATE))
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 3969943f6..140fda8e7 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -55,6 +55,7 @@ Release Date: Not Released
- Updated *ip_address* database field lengths from 16 to 45 for supporting IPv6 address on :doc:`Trackback Library <libraries/trackback>` and :doc:`Captcha Helper <helpers/captcha_helper>`.
- Removed *cheatsheets* and *quick_reference* PDFs from the documentation.
- Added availability checks where usage of dangerous functions like ``eval()`` and ``exec()`` is required.
+ - Added support for changing the file extension of CodeIgniter log files using $config['log_file_extension'].
- Helpers