summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
Diffstat (limited to 'system')
-rw-r--r--system/core/Common.php17
-rw-r--r--system/core/Output.php24
-rw-r--r--system/core/Security.php4
-rw-r--r--system/database/DB_forge.php4
-rw-r--r--system/database/DB_query_builder.php68
-rw-r--r--system/database/drivers/cubrid/cubrid_forge.php2
-rw-r--r--system/language/english/form_validation_lang.php52
-rw-r--r--system/libraries/Email.php34
-rw-r--r--system/libraries/Encrypt.php6
-rw-r--r--system/libraries/Form_validation.php43
-rw-r--r--system/libraries/Session/drivers/Session_cookie.php2
-rw-r--r--system/libraries/Zip.php4
12 files changed, 147 insertions, 113 deletions
diff --git a/system/core/Common.php b/system/core/Common.php
index 7feb16bfd..c7ab387a3 100644
--- a/system/core/Common.php
+++ b/system/core/Common.php
@@ -681,17 +681,22 @@ if ( ! function_exists('function_usable'))
{
if ( ! isset($_suhosin_func_blacklist))
{
- $_suhosin_func_blacklist = extension_loaded('suhosin')
- ? array()
- : explode(',', trim(@ini_get('suhosin.executor.func.blacklist')));
+ if (extension_loaded('suhosin'))
+ {
+ $_suhosin_func_blacklist = explode(',', trim(@ini_get('suhosin.executor.func.blacklist')));
- if ( ! in_array('eval', $_suhosin_func_blacklist, TRUE) && @ini_get('suhosin.executor.disable_eval'))
+ if ( ! in_array('eval', $_suhosin_func_blacklist, TRUE) && @ini_get('suhosin.executor.disable_eval'))
+ {
+ $_suhosin_func_blacklist[] = 'eval';
+ }
+ }
+ else
{
- $_suhosin_func_blacklist[] = 'eval';
+ $_suhosin_func_blacklist = array();
}
}
- return in_array($function_name, $_suhosin_func_blacklist, TRUE);
+ return ! in_array($function_name, $_suhosin_func_blacklist, TRUE);
}
return FALSE;
diff --git a/system/core/Output.php b/system/core/Output.php
index 98deff55c..0ba0a5743 100644
--- a/system/core/Output.php
+++ b/system/core/Output.php
@@ -143,7 +143,7 @@ class CI_Output {
* Sets the output string.
*
* @param string $output Output data
- * @return object $this
+ * @return CI_Output
*/
public function set_output($output)
{
@@ -159,7 +159,7 @@ class CI_Output {
* Appends data onto the output string.
*
* @param string $output Data to append
- * @return object $this
+ * @return CI_Output
*/
public function append_output($output)
{
@@ -187,7 +187,7 @@ class CI_Output {
*
* @param string $header Header
* @param bool $replace Whether to replace the old header value, if already set
- * @return object $this
+ * @return CI_Output
*/
public function set_header($header, $replace = TRUE)
{
@@ -211,7 +211,7 @@ class CI_Output {
*
* @param string $mime_type Extension of the file we're outputting
* @param string $charset Character set (default: NULL)
- * @return object $this
+ * @return CI_Output
*/
public function set_content_type($mime_type, $charset = NULL)
{
@@ -308,7 +308,7 @@ class CI_Output {
*
* @param int $code Status code (default: 200)
* @param string $text Optional message
- * @return object $this
+ * @return CI_Output
*/
public function set_status_header($code = 200, $text = '')
{
@@ -322,7 +322,7 @@ class CI_Output {
* Enable/disable Profiler
*
* @param bool $val TRUE to enable or FALSE to disable
- * @return object $this
+ * @return CI_Output
*/
public function enable_profiler($val = TRUE)
{
@@ -339,7 +339,7 @@ class CI_Output {
* Profiler section display.
*
* @param array $sections Profiler sections
- * @return object $this
+ * @return CI_Output
*/
public function set_profiler_sections($sections)
{
@@ -363,7 +363,7 @@ class CI_Output {
* Set Cache
*
* @param int $time Cache expiration time in seconds
- * @return object $this
+ * @return CI_Output
*/
public function cache($time)
{
@@ -780,6 +780,7 @@ class CI_Output {
break;
case 'text/css':
+ case 'text/javascript':
//Remove CSS comments
$output = preg_replace('!/\*[^*]*\*+([^/][^*]*\*+)*/!', '', $output);
@@ -788,11 +789,12 @@ class CI_Output {
// semi-colons, parenthesis, commas
$output = preg_replace('!\s*(:|;|,|}|{|\(|\))\s*!', '$1', $output);
- break;
+ // Remove spaces
+ $output = preg_replace('/ /s', ' ', $output);
- case 'text/javascript':
+ // Remove breaklines and tabs
+ $output = preg_replace('/[\r\n\t]/', '', $output);
- // Currently leaves JavaScript untouched.
break;
default: break;
diff --git a/system/core/Security.php b/system/core/Security.php
index 70e9e973c..8c70e85de 100644
--- a/system/core/Security.php
+++ b/system/core/Security.php
@@ -151,7 +151,7 @@ class CI_Security {
/**
* CSRF Verify
*
- * @return object
+ * @return CI_Security
*/
public function csrf_verify()
{
@@ -202,7 +202,7 @@ class CI_Security {
* CSRF Set Cookie
*
* @codeCoverageIgnore
- * @return object
+ * @return CI_Security
*/
public function csrf_set_cookie()
{
diff --git a/system/database/DB_forge.php b/system/database/DB_forge.php
index 59c3baf8b..5c782f875 100644
--- a/system/database/DB_forge.php
+++ b/system/database/DB_forge.php
@@ -229,7 +229,7 @@ abstract class CI_DB_forge {
*
* @param string $key
* @param bool $primary
- * @return object
+ * @return CI_DB_forge
*/
public function add_key($key = '', $primary = FALSE)
{
@@ -266,7 +266,7 @@ abstract class CI_DB_forge {
* Add Field
*
* @param array $field
- * @return object
+ * @return CI_DB_forge
*/
public function add_field($field = '')
{
diff --git a/system/database/DB_query_builder.php b/system/database/DB_query_builder.php
index b0e86ed2c..1aa73baab 100644
--- a/system/database/DB_query_builder.php
+++ b/system/database/DB_query_builder.php
@@ -254,7 +254,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
*
* @param string
* @param mixed
- * @return object
+ * @return CI_DB_query_builder
*/
public function select($select = '*', $escape = NULL)
{
@@ -296,7 +296,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
*
* @param string the field
* @param string an alias
- * @return object
+ * @return CI_DB_query_builder
*/
public function select_max($select = '', $alias = '')
{
@@ -312,7 +312,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
*
* @param string the field
* @param string an alias
- * @return object
+ * @return CI_DB_query_builder
*/
public function select_min($select = '', $alias = '')
{
@@ -328,7 +328,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
*
* @param string the field
* @param string an alias
- * @return object
+ * @return CI_DB_query_builder
*/
public function select_avg($select = '', $alias = '')
{
@@ -344,7 +344,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
*
* @param string the field
* @param string an alias
- * @return object
+ * @return CI_DB_query_builder
*/
public function select_sum($select = '', $alias = '')
{
@@ -364,7 +364,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
* @param string $select Field name
* @param string $alias
* @param string $type
- * @return object
+ * @return CI_DB_query_builder
*/
protected function _max_min_avg_sum($select = '', $alias = '', $type = 'MAX')
{
@@ -426,7 +426,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
* Sets a flag which tells the query string compiler to add DISTINCT
*
* @param bool $val
- * @return object
+ * @return CI_DB_query_builder
*/
public function distinct($val = TRUE)
{
@@ -442,7 +442,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
* Generates the FROM portion of the query
*
* @param mixed $from can be a string or array
- * @return object
+ * @return CI_DB_query_builder
*/
public function from($from)
{
@@ -496,7 +496,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
* @param string the join condition
* @param string the type of join
* @param string whether not to try to escape identifiers
- * @return object
+ * @return CI_DB_query_builder
*/
public function join($table, $cond, $type = '', $escape = NULL)
{
@@ -584,7 +584,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
* @param mixed
* @param mixed
* @param bool
- * @return object
+ * @return CI_DB_query_builder
*/
public function where($key, $value = NULL, $escape = NULL)
{
@@ -602,7 +602,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
* @param mixed
* @param mixed
* @param bool
- * @return object
+ * @return CI_DB_query_builder
*/
public function or_where($key, $value = NULL, $escape = NULL)
{
@@ -624,7 +624,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
* @param mixed $value
* @param string $type
* @param bool $escape
- * @return object
+ * @return CI_DB_query_builder
*/
protected function _wh($qb_key, $key, $value = NULL, $type = 'AND ', $escape = NULL)
{
@@ -685,7 +685,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
* @param string $key The field to search
* @param array $values The values searched on
* @param bool $escape
- * @return object
+ * @return CI_DB_query_builder
*/
public function where_in($key = NULL, $values = NULL, $escape = NULL)
{
@@ -703,7 +703,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
* @param string $key The field to search
* @param array $values The values searched on
* @param bool $escape
- * @return object
+ * @return CI_DB_query_builder
*/
public function or_where_in($key = NULL, $values = NULL, $escape = NULL)
{
@@ -721,7 +721,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
* @param string $key The field to search
* @param array $values The values searched on
* @param bool $escape
- * @return object
+ * @return CI_DB_query_builder
*/
public function where_not_in($key = NULL, $values = NULL, $escape = NULL)
{
@@ -739,7 +739,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
* @param string $key The field to search
* @param array $values The values searched on
* @param bool $escape
- * @return object
+ * @return CI_DB_query_builder
*/
public function or_where_not_in($key = NULL, $values = NULL, $escape = NULL)
{
@@ -761,7 +761,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
* @param bool $not If the statement would be IN or NOT IN
* @param string $type
* @param bool $escape
- * @return object
+ * @return CI_DB_query_builder
*/
protected function _where_in($key = NULL, $values = NULL, $not = FALSE, $type = 'AND ', $escape = NULL)
{
@@ -813,7 +813,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
* @param string $match
* @param string $side
* @param bool $escape
- * @return object
+ * @return CI_DB_query_builder
*/
public function like($field, $match = '', $side = 'both', $escape = NULL)
{
@@ -832,7 +832,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
* @param string $match
* @param string $side
* @param bool $escape
- * @return object
+ * @return CI_DB_query_builder
*/
public function not_like($field, $match = '', $side = 'both', $escape = NULL)
{
@@ -851,7 +851,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
* @param string $match
* @param string $side
* @param bool $escape
- * @return object
+ * @return CI_DB_query_builder
*/
public function or_like($field, $match = '', $side = 'both', $escape = NULL)
{
@@ -870,7 +870,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
* @param string $match
* @param string $side
* @param bool $escape
- * @return object
+ * @return CI_DB_query_builder
*/
public function or_not_like($field, $match = '', $side = 'both', $escape = NULL)
{
@@ -893,7 +893,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
* @param string $side
* @param string $not
* @param bool $escape
- * @return object
+ * @return CI_DB_query_builder
*/
protected function _like($field, $match = '', $type = 'AND ', $side = 'both', $not = '', $escape = NULL)
{
@@ -952,7 +952,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
*
* @param string $not (Internal use only)
* @param string $type (Internal use only)
- * @return object
+ * @return CI_DB_query_builder
*/
public function group_start($not = '', $type = 'AND ')
{
@@ -979,7 +979,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
/**
* Starts a query group, but ORs the group
*
- * @return object
+ * @return CI_DB_query_builder
*/
public function or_group_start()
{
@@ -991,7 +991,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
/**
* Starts a query group, but NOTs the group
*
- * @return object
+ * @return CI_DB_query_builder
*/
public function not_group_start()
{
@@ -1003,7 +1003,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
/**
* Starts a query group, but OR NOTs the group
*
- * @return object
+ * @return CI_DB_query_builder
*/
public function or_not_group_start()
{
@@ -1015,7 +1015,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
/**
* Ends a query group
*
- * @return object
+ * @return CI_DB_query_builder
*/
public function group_end()
{
@@ -1065,7 +1065,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
*
* @param string $by
* @param bool $escape
- * @return object
+ * @return CI_DB_query_builder
*/
public function group_by($by, $escape = NULL)
{
@@ -1140,7 +1140,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
* @param string $orderby
* @param string $direction ASC or DESC
* @param bool $escape
- * @return object
+ * @return CI_DB_query_builder
*/
public function order_by($orderby, $direction = '', $escape = NULL)
{
@@ -1198,7 +1198,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
*
* @param int $value LIMIT value
* @param int $offset OFFSET value
- * @return object
+ * @return CI_DB_query_builder
*/
public function limit($value, $offset = FALSE)
{
@@ -1214,7 +1214,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
* Sets the OFFSET value
*
* @param int $offset OFFSET value
- * @return object
+ * @return CI_DB_query_builder
*/
public function offset($offset)
{
@@ -1247,7 +1247,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
* @param mixed
* @param string
* @param bool
- * @return object
+ * @return CI_DB_query_builder
*/
public function set($key, $value = '', $escape = NULL)
{
@@ -1469,7 +1469,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
* @param mixed
* @param string
* @param bool
- * @return object
+ * @return CI_DB_query_builder
*/
public function set_insert_batch($key, $value = '', $escape = NULL)
{
@@ -1860,7 +1860,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
* @param array
* @param string
* @param bool
- * @return object
+ * @return CI_DB_query_builder
*/
public function set_update_batch($key, $index = '', $escape = NULL)
{
diff --git a/system/database/drivers/cubrid/cubrid_forge.php b/system/database/drivers/cubrid/cubrid_forge.php
index 2a737c5ed..db1ce5f70 100644
--- a/system/database/drivers/cubrid/cubrid_forge.php
+++ b/system/database/drivers/cubrid/cubrid_forge.php
@@ -109,7 +109,7 @@ class CI_DB_cubrid_forge extends CI_DB_forge {
else
{
$alter_type = empty($field[$i]['new_name']) ? ' MODIFY ' : ' CHANGE ';
- $sqls[] = $sql.$alter_type$this->_process_column($field[$i]);
+ $sqls[] = $sql.$alter_type.$this->_process_column($field[$i]);
}
}
diff --git a/system/language/english/form_validation_lang.php b/system/language/english/form_validation_lang.php
index 8788f5dac..a809f1fa8 100644
--- a/system/language/english/form_validation_lang.php
+++ b/system/language/english/form_validation_lang.php
@@ -26,32 +26,32 @@
*/
defined('BASEPATH') OR exit('No direct script access allowed');
-$lang['required'] = 'The %s field is required.';
-$lang['isset'] = 'The %s field must have a value.';
-$lang['valid_email'] = 'The %s field must contain a valid email address.';
-$lang['valid_emails'] = 'The %s field must contain all valid email addresses.';
-$lang['valid_url'] = 'The %s field must contain a valid URL.';
-$lang['valid_ip'] = 'The %s field must contain a valid IP.';
-$lang['min_length'] = 'The %s field must be at least %s characters in length.';
-$lang['max_length'] = 'The %s field cannot exceed %s characters in length.';
-$lang['exact_length'] = 'The %s field must be exactly %s characters in length.';
-$lang['alpha'] = 'The %s field may only contain alphabetical characters.';
-$lang['alpha_numeric'] = 'The %s field may only contain alpha-numeric characters.';
-$lang['alpha_dash'] = 'The %s field may only contain alpha-numeric characters, underscores, and dashes.';
-$lang['numeric'] = 'The %s field must contain only numbers.';
-$lang['is_numeric'] = 'The %s field must contain only numeric characters.';
-$lang['integer'] = 'The %s field must contain an integer.';
-$lang['regex_match'] = 'The %s field is not in the correct format.';
-$lang['matches'] = 'The %s field does not match the %s field.';
-$lang['differs'] = 'The %s field must differ from the %s field.';
-$lang['is_unique'] = 'The %s field must contain a unique value.';
-$lang['is_natural'] = 'The %s field must only contain digits.';
-$lang['is_natural_no_zero'] = 'The %s field must only contain digits and must be greater than zero.';
-$lang['decimal'] = 'The %s field must contain a decimal number.';
-$lang['less_than'] = 'The %s field must contain a number less than %s.';
-$lang['less_than_equal_to'] = 'The %s field must contain a number less than or equal to %s.';
-$lang['greater_than'] = 'The %s field must contain a number greater than %s.';
-$lang['greater_than_equal_to'] = 'The %s field must contain a number greater than or equal to %s.';
+$lang['form_validation_required'] = 'The {field} field is required.';
+$lang['form_validation_isset'] = 'The {field} field must have a value.';
+$lang['form_validation_valid_email'] = 'The {field} field must contain a valid email address.';
+$lang['form_validation_valid_emails'] = 'The {field} field must contain all valid email addresses.';
+$lang['form_validation_valid_url'] = 'The {field} field must contain a valid URL.';
+$lang['form_validation_valid_ip'] = 'The {field} field must contain a valid IP.';
+$lang['form_validation_min_length'] = 'The {field} field must be at least {param} characters in length.';
+$lang['form_validation_max_length'] = 'The {field} field cannot exceed {param} characters in length.';
+$lang['form_validation_exact_length'] = 'The {field} field must be exactly {param} characters in length.';
+$lang['form_validation_alpha'] = 'The {field} field may only contain alphabetical characters.';
+$lang['form_validation_alpha_numeric'] = 'The {field} field may only contain alpha-numeric characters.';
+$lang['form_validation_alpha_dash'] = 'The {field} field may only contain alpha-numeric characters, underscores, and dashes.';
+$lang['form_validation_numeric'] = 'The {field} field must contain only numbers.';
+$lang['form_validation_is_numeric'] = 'The {field} field must contain only numeric characters.';
+$lang['form_validation_integer'] = 'The {field} field must contain an integer.';
+$lang['form_validation_regex_match'] = 'The {field} field is not in the correct format.';
+$lang['form_validation_matches'] = 'The {field} field does not match the {param} field.';
+$lang['form_validation_differs'] = 'The {field} field must differ from the {param} field.';
+$lang['form_validation_is_unique'] = 'The {field} field must contain a unique value.';
+$lang['form_validation_is_natural'] = 'The {field} field must only contain digits.';
+$lang['form_validation_is_natural_no_zero'] = 'The {field} field must only contain digits and must be greater than zero.';
+$lang['form_validation_decimal'] = 'The {field} field must contain a decimal number.';
+$lang['form_validation_less_than'] = 'The {field} field must contain a number less than {param}.';
+$lang['form_validation_less_than_equal_to'] = 'The {field} field must contain a number less than or equal to {param}.';
+$lang['form_validation_greater_than'] = 'The {field} field must contain a number greater than {param}.';
+$lang['form_validation_greater_than_equal_to'] = 'The {field} field must contain a number greater than or equal to {param}.';
/* End of file form_validation_lang.php */
/* Location: ./system/language/english/form_validation_lang.php */ \ No newline at end of file
diff --git a/system/libraries/Email.php b/system/libraries/Email.php
index 5d8fc8aea..365a8bc79 100644
--- a/system/libraries/Email.php
+++ b/system/libraries/Email.php
@@ -406,7 +406,7 @@ class CI_Email {
* Initialize preferences
*
* @param array
- * @return void
+ * @return CI_Email
*/
public function initialize($config = array())
{
@@ -440,7 +440,7 @@ class CI_Email {
* Initialize the Email Data
*
* @param bool
- * @return object
+ * @return CI_Email
*/
public function clear($clear_attachments = FALSE)
{
@@ -474,7 +474,7 @@ class CI_Email {
* @param string $from
* @param string $name
* @param string $return_path = NULL Return-Path
- * @return object
+ * @return CI_Email
*/
public function from($from, $name = '', $return_path = NULL)
{
@@ -522,7 +522,7 @@ class CI_Email {
*
* @param string
* @param string
- * @return object
+ * @return CI_Email
*/
public function reply_to($replyto, $name = '')
{
@@ -558,7 +558,7 @@ class CI_Email {
* Set Recipients
*
* @param string
- * @return object
+ * @return CI_Email
*/
public function to($to)
{
@@ -586,7 +586,7 @@ class CI_Email {
* Set CC
*
* @param string
- * @return object
+ * @return CI_Email
*/
public function cc($cc)
{
@@ -614,7 +614,7 @@ class CI_Email {
*
* @param string
* @param string
- * @return object
+ * @return CI_Email
*/
public function bcc($bcc, $limit = '')
{
@@ -649,7 +649,7 @@ class CI_Email {
* Set Email Subject
*
* @param string
- * @return object
+ * @return CI_Email
*/
public function subject($subject)
{
@@ -664,7 +664,7 @@ class CI_Email {
* Set Body
*
* @param string
- * @return object
+ * @return CI_Email
*/
public function message($body)
{
@@ -693,7 +693,7 @@ class CI_Email {
* @param string $disposition = 'attachment'
* @param string $newname = NULL
* @param string $mime = ''
- * @return object
+ * @return CI_Email
*/
public function attach($filename, $disposition = '', $newname = NULL, $mime = '')
{
@@ -746,7 +746,7 @@ class CI_Email {
* Set Multipart Value
*
* @param string
- * @return object
+ * @return CI_Email
*/
public function set_alt_message($str = '')
{
@@ -760,7 +760,7 @@ class CI_Email {
* Set Mailtype
*
* @param string
- * @return object
+ * @return CI_Email
*/
public function set_mailtype($type = 'text')
{
@@ -774,7 +774,7 @@ class CI_Email {
* Set Wordwrap
*
* @param bool
- * @return object
+ * @return CI_Email
*/
public function set_wordwrap($wordwrap = TRUE)
{
@@ -788,7 +788,7 @@ class CI_Email {
* Set Protocol
*
* @param string
- * @return object
+ * @return CI_Email
*/
public function set_protocol($protocol = 'mail')
{
@@ -802,7 +802,7 @@ class CI_Email {
* Set Priority
*
* @param int
- * @return object
+ * @return CI_Email
*/
public function set_priority($n = 3)
{
@@ -816,7 +816,7 @@ class CI_Email {
* Set Newline Character
*
* @param string
- * @return object
+ * @return CI_Email
*/
public function set_newline($newline = "\n")
{
@@ -830,7 +830,7 @@ class CI_Email {
* Set CRLF
*
* @param string
- * @return object
+ * @return CI_Email
*/
public function set_crlf($crlf = "\n")
{
diff --git a/system/libraries/Encrypt.php b/system/libraries/Encrypt.php
index cdb0a6452..e54ce4950 100644
--- a/system/libraries/Encrypt.php
+++ b/system/libraries/Encrypt.php
@@ -122,7 +122,7 @@ class CI_Encrypt {
* Set the encryption key
*
* @param string
- * @return object
+ * @return CI_Encrypt
*/
public function set_key($key = '')
{
@@ -419,7 +419,7 @@ class CI_Encrypt {
* Set the Mcrypt Cipher
*
* @param int
- * @return object
+ * @return CI_Encrypt
*/
public function set_cipher($cipher)
{
@@ -433,7 +433,7 @@ class CI_Encrypt {
* Set the Mcrypt Mode
*
* @param int
- * @return object
+ * @return CI_Encrypt
*/
public function set_mode($mode)
{
diff --git a/system/libraries/Form_validation.php b/system/libraries/Form_validation.php
index e4eac04ba..32f7da1b1 100644
--- a/system/libraries/Form_validation.php
+++ b/system/libraries/Form_validation.php
@@ -149,7 +149,7 @@ class CI_Form_validation {
* @param mixed $field
* @param string $label
* @param mixed $rules
- * @return object
+ * @return CI_Form_validation
*/
public function set_rules($field, $label = '', $rules = '')
{
@@ -266,7 +266,7 @@ class CI_Form_validation {
*
* @param array
* @param string
- * @return object
+ * @return CI_Form_validation
*/
public function set_message($lang, $val = '')
{
@@ -288,7 +288,7 @@ class CI_Form_validation {
*
* @param string
* @param string
- * @return object
+ * @return CI_Form_validation
*/
public function set_error_delimiters($prefix = '<p>', $suffix = '</p>')
{
@@ -609,13 +609,15 @@ class CI_Form_validation {
{
$line = $this->_error_messages[$type];
}
- elseif (FALSE === ($line = $this->CI->lang->line($type)))
+ elseif (FALSE === ($line = $this->CI->lang->line('form_validation_'.$type))
+ // DEPRECATED support for non-prefixed keys
+ && FALSE === ($line = $this->CI->lang->line($type, FALSE)))
{
$line = 'The field was not set';
}
// Build the error message
- $message = sprintf($line, $this->_translate_fieldname($row['label']));
+ $message = $this->_build_error_msg($line, $this->_translate_fieldname($row['label']));
// Save the error message
$this->_field_data[$row['field']]['error'] = $message;
@@ -749,7 +751,9 @@ class CI_Form_validation {
{
if ( ! isset($this->_error_messages[$rule]))
{
- if (FALSE === ($line = $this->CI->lang->line($rule)))
+ if (FALSE === ($line = $this->CI->lang->line('form_validation_'.$rule))
+ // DEPRECATED support for non-prefixed keys
+ && FALSE === ($line = $this->CI->lang->line($rule, FALSE)))
{
$line = 'Unable to access an error message corresponding to your field name.';
}
@@ -767,7 +771,7 @@ class CI_Form_validation {
}
// Build the error message
- $message = sprintf($line, $this->_translate_fieldname($row['label']), $param);
+ $message = $this->_build_error_msg($line, $this->_translate_fieldname($row['label']), $param);
// Save the error message
$this->_field_data[$row['field']]['error'] = $message;
@@ -797,7 +801,9 @@ class CI_Form_validation {
if (sscanf($fieldname, 'lang:%s', $line) === 1)
{
// Were we able to translate the field name? If not we use $line
- if (FALSE === ($fieldname = $this->CI->lang->line($line)))
+ if (FALSE === ($fieldname = $this->CI->lang->line('form_validation_'.$line))
+ // DEPRECATED support for non-prefixed keys
+ && FALSE === ($fieldname = $this->CI->lang->line($line, FALSE)))
{
return $line;
}
@@ -809,6 +815,27 @@ class CI_Form_validation {
// --------------------------------------------------------------------
/**
+ * Build an error message using the field and param.
+ *
+ * @param string The error message line
+ * @param string A field's human name
+ * @param mixed A rule's optional parameter
+ * @return string
+ */
+ protected function _build_error_msg($line, $field = '', $param = '')
+ {
+ // Check for %s in the string for legacy support.
+ if (strpos($line, '%s') !== FALSE)
+ {
+ return sprintf($line, $field, $param);
+ }
+
+ return str_replace(array('{field}', '{param}'), array($field, $param), $line);
+ }
+
+ // --------------------------------------------------------------------
+
+ /**
* Get the value from a form
*
* Permits you to repopulate a form field with the value it was submitted
diff --git a/system/libraries/Session/drivers/Session_cookie.php b/system/libraries/Session/drivers/Session_cookie.php
index 6d926ae3d..9392a4dbe 100644
--- a/system/libraries/Session/drivers/Session_cookie.php
+++ b/system/libraries/Session/drivers/Session_cookie.php
@@ -457,7 +457,7 @@ class CI_Session_cookie extends CI_Session_driver {
}
// No result? Kill it!
- if ($query->num_rows() === 0)
+ if (empty($query) OR $query->num_rows() === 0)
{
$this->sess_destroy();
return FALSE;
diff --git a/system/libraries/Zip.php b/system/libraries/Zip.php
index 9ecd0de9f..740e99c72 100644
--- a/system/libraries/Zip.php
+++ b/system/libraries/Zip.php
@@ -133,7 +133,7 @@ class CI_Zip {
protected function _get_mod_time($dir)
{
// filemtime() may return false, but raises an error for non-existing files
- $date = file_exists($dir) ? filemtime($dir) : getdate($this->now);
+ $date = file_exists($dir) ? @filemtime($dir) : getdate($this->now);
return array(
'file_mtime' => ($date['hours'] << 11) + ($date['minutes'] << 5) + $date['seconds'] / 2,
@@ -438,7 +438,7 @@ class CI_Zip {
* Lets you clear current zip data. Useful if you need to create
* multiple zips with different data.
*
- * @return object
+ * @return CI_Zip
*/
public function clear_data()
{