Skip to content
Browse files

"Unfixed" license spacing and removed redundant isset/empty pairs

Signed-off-by: dchill42 <dchill42@gmail.com>
  • Loading branch information...
1 parent b069d72 commit f09f66edc7e0ffea26190c01ca8e037193957892 @dchill42 committed Oct 2, 2012
View
6 system/core/CodeIgniter.php
@@ -9,7 +9,7 @@
* Licensed under the Open Software License version 3.0
*
* This source file is subject to the Open Software License (OSL 3.0) that is
- * bundled with this package in the files license.txt / license.rst. It is
+ * bundled with this package in the files license.txt / license.rst. It is
* also available through the world wide web at this URL:
* http://opensource.org/licenses/OSL-3.0
* If you did not receive a copy of the license and are unable to obtain it
@@ -197,6 +197,7 @@ public static function &instance($basepath = NULL, $apppath = NULL, $env = NULL)
// Check for existing instance
if (is_null(self::$instance))
{
+ // Reference $assign_to_config from index.php
global $assign_to_config;
// Determine base and application paths
@@ -621,6 +622,7 @@ protected function _load_base()
*/
protected function _load_routing()
{
+ // Reference $routing from index.php
global $routing;
// Load the UTF-8 class (depends on Config)
@@ -639,7 +641,7 @@ protected function _load_routing()
$this->router->_set_routing();
// Set any routing overrides that may exist in the main index file
- if ( isset($routing) && ! empty($routing))
+ if ( ! empty($routing))
{
$this->router->_set_overrides($routing);
}
View
2 system/core/Common.php
@@ -9,7 +9,7 @@
* Licensed under the Open Software License version 3.0
*
* This source file is subject to the Open Software License (OSL 3.0) that is
- * bundled with this package in the files license.txt / license.rst. It is
+ * bundled with this package in the files license.txt / license.rst. It is
* also available through the world wide web at this URL:
* http://opensource.org/licenses/OSL-3.0
* If you did not receive a copy of the license and are unable to obtain it
View
2 system/core/Config.php
@@ -9,7 +9,7 @@
* Licensed under the Open Software License version 3.0
*
* This source file is subject to the Open Software License (OSL 3.0) that is
- * bundled with this package in the files license.txt / license.rst. It is
+ * bundled with this package in the files license.txt / license.rst. It is
* also available through the world wide web at this URL:
* http://opensource.org/licenses/OSL-3.0
* If you did not receive a copy of the license and are unable to obtain it
View
2 system/core/Exceptions.php
@@ -9,7 +9,7 @@
* Licensed under the Open Software License version 3.0
*
* This source file is subject to the Open Software License (OSL 3.0) that is
- * bundled with this package in the files license.txt / license.rst. It is
+ * bundled with this package in the files license.txt / license.rst. It is
* also available through the world wide web at this URL:
* http://opensource.org/licenses/OSL-3.0
* If you did not receive a copy of the license and are unable to obtain it
View
2 system/core/Loader.php
@@ -9,7 +9,7 @@
* Licensed under the Open Software License version 3.0
*
* This source file is subject to the Open Software License (OSL 3.0) that is
- * bundled with this package in the files license.txt / license.rst. It is
+ * bundled with this package in the files license.txt / license.rst. It is
* also available through the world wide web at this URL:
* http://opensource.org/licenses/OSL-3.0
* If you did not receive a copy of the license and are unable to obtain it
View
27 system/core/Log.php
@@ -9,7 +9,7 @@
* Licensed under the Open Software License version 3.0
*
* This source file is subject to the Open Software License (OSL 3.0) that is
- * bundled with this package in the files license.txt / license.rst. It is
+ * bundled with this package in the files license.txt / license.rst. It is
* also available through the world wide web at this URL:
* http://opensource.org/licenses/OSL-3.0
* If you did not receive a copy of the license and are unable to obtain it
@@ -48,42 +48,42 @@ class CI_Log {
*
* @var int
*/
- protected $_threshold = 1;
+ protected $_threshold = 1;
/**
* Highest level of logging
*
* @var int
*/
- protected $_threshold_max = 0;
+ protected $_threshold_max = 0;
/**
* Array of threshold levels to log
*
* @var array
*/
- protected $_threshold_array = array();
+ protected $_threshold_array = array();
/**
* Format of timestamp for log files
*
* @var string
*/
- protected $_date_fmt = 'Y-m-d H:i:s';
+ protected $_date_fmt = 'Y-m-d H:i:s';
/**
* Whether or not the logger can write to the log files
*
* @var bool
*/
- protected $_enabled = TRUE;
+ protected $_enabled = TRUE;
/**
* Predefined logging levels
*
* @var array
*/
- protected $_levels = array('ERROR' => 1, 'DEBUG' => 2, 'INFO' => 3, 'ALL' => 4);
+ protected $_levels = array('ERROR' => 1, 'DEBUG' => 2, 'INFO' => 3, 'ALL' => 4);
/**
* Configure Logging class
@@ -95,8 +95,7 @@ class CI_Log {
*/
public function configure($config)
{
- $this->_log_path = (isset($config['log_path']) && ! empty($config['log_path']))
- ? $config['log_path'] : APPPATH.'logs/';
+ $this->_log_path = empty($config['log_path']) ? APPPATH.'logs/' : $config['log_path'];
if ( ! is_dir($this->_log_path) OR ! is_really_writable($this->_log_path))
{
@@ -116,7 +115,7 @@ public function configure($config)
}
}
- if (isset($config['log_date_format']) && ! empty($config['log_date_format']))
+ if ( ! empty($config['log_date_format']))
{
$this->_date_fmt = $config['log_date_format'];
}
@@ -129,10 +128,10 @@ public function configure($config)
*
* Generally this function will be called using the global log_message() function
*
- * @param string the error level
- * @param string the error message
- * @param bool whether the error is a native PHP error
- * @return bool
+ * @param string Error level
+ * @param string Error message
+ * @param bool Whether the error is a native PHP error
+ * @return bool TRUE on success, otherwise FALSE
*/
public function write_log($level = 'error', $msg, $php_error = FALSE)
{
View
2 system/core/Output.php
@@ -9,7 +9,7 @@
* Licensed under the Open Software License version 3.0
*
* This source file is subject to the Open Software License (OSL 3.0) that is
- * bundled with this package in the files license.txt / license.rst. It is
+ * bundled with this package in the files license.txt / license.rst. It is
* also available through the world wide web at this URL:
* http://opensource.org/licenses/OSL-3.0
* If you did not receive a copy of the license and are unable to obtain it
View
2 system/core/Router.php
@@ -9,7 +9,7 @@
* Licensed under the Open Software License version 3.0
*
* This source file is subject to the Open Software License (OSL 3.0) that is
- * bundled with this package in the files license.txt / license.rst. It is
+ * bundled with this package in the files license.txt / license.rst. It is
* also available through the world wide web at this URL:
* http://opensource.org/licenses/OSL-3.0
* If you did not receive a copy of the license and are unable to obtain it
View
2 system/libraries/Session/drivers/Session_cookie.php
@@ -9,7 +9,7 @@
* Licensed under the Open Software License version 3.0
*
* This source file is subject to the Open Software License (OSL 3.0) that is
- * bundled with this package in the files license.txt / license.rst. It is
+ * bundled with this package in the files license.txt / license.rst. It is
* also available through the world wide web at this URL:
* http://opensource.org/licenses/OSL-3.0
* If you did not receive a copy of the license and are unable to obtain it
View
2 system/libraries/Session/drivers/Session_native.php
@@ -9,7 +9,7 @@
* Licensed under the Open Software License version 3.0
*
* This source file is subject to the Open Software License (OSL 3.0) that is
- * bundled with this package in the files license.txt / license.rst. It is
+ * bundled with this package in the files license.txt / license.rst. It is
* also available through the world wide web at this URL:
* http://opensource.org/licenses/OSL-3.0
* If you did not receive a copy of the license and are unable to obtain it

0 comments on commit f09f66e

Please sign in to comment.
Something went wrong with that request. Please try again.