Don't use error suppression on realpath() + style adjustments
diff --git a/system/helpers/form_helper.php b/system/helpers/form_helper.php
index a724406..2592890 100644
--- a/system/helpers/form_helper.php
+++ b/system/helpers/form_helper.php
@@ -54,16 +54,16 @@
{
$CI =& get_instance();
+ // If no action is provided then set to the current url
+ if ( ! $action)
+ {
+ $action = $CI->config->site_url($CI->uri->uri_string());
+ }
// If an action is not a full URL then turn it into one
- if ($action && strpos($action, '://') === FALSE)
+ elseif (strpos($action, '://') === FALSE)
{
$action = $CI->config->site_url($action);
}
- elseif ( ! $action)
- {
- // If no action is provided then set to the current url
- $action = $CI->config->site_url($CI->uri->uri_string());
- }
$attributes = _attributes_to_string($attributes);
@@ -80,7 +80,7 @@
$form = '<form action="'.$action.'"'.$attributes.">\n";
// Add CSRF field if enabled, but leave it out for GET requests and requests to external websites
- if ($CI->config->item('csrf_protection') === TRUE && ! (strpos($action, $CI->config->base_url()) === FALSE OR stripos($form, 'method="get"')))
+ if ($CI->config->item('csrf_protection') === TRUE && strpos($action, $CI->config->base_url()) !== FALSE && ! stripos($form, 'method="get"'))
{
$hidden[$CI->security->get_csrf_token_name()] = $CI->security->get_csrf_hash();
}
@@ -153,6 +153,7 @@
{
form_hidden($key, $val, TRUE);
}
+
return $form;
}
@@ -187,7 +188,11 @@
*/
function form_input($data = '', $value = '', $extra = '')
{
- $defaults = array('type' => 'text', 'name' => ( ! is_array($data) ? $data : ''), 'value' => $value);
+ $defaults = array(
+ 'type' => 'text',
+ 'name' => is_array($data) ? '' : $data,
+ 'value' => $value
+ );
return '<input '._parse_form_attributes($data, $defaults).$extra." />\n";
}
@@ -209,11 +214,7 @@
*/
function form_password($data = '', $value = '', $extra = '')
{
- if ( ! is_array($data))
- {
- $data = array('name' => $data);
- }
-
+ is_array($data) OR $data = array('name' => $data);
$data['type'] = 'password';
return form_input($data, $value, $extra);
}
@@ -256,7 +257,11 @@
*/
function form_textarea($data = '', $value = '', $extra = '')
{
- $defaults = array('name' => ( ! is_array($data) ? $data : ''), 'cols' => '40', 'rows' => '10');
+ $defaults = array(
+ 'name' => is_array($data) ? '' : $data,
+ 'cols' => '40',
+ 'rows' => '10'
+ );
if ( ! is_array($data) OR ! isset($data['value']))
{
@@ -434,11 +439,7 @@
*/
function form_radio($data = '', $value = '', $checked = FALSE, $extra = '')
{
- if ( ! is_array($data))
- {
- $data = array('name' => $data);
- }
-
+ is_array($data) OR $data = array('name' => $data);
$data['type'] = 'radio';
return form_checkbox($data, $value, $checked, $extra);
}
@@ -458,7 +459,12 @@
*/
function form_submit($data = '', $value = '', $extra = '')
{
- $defaults = array('type' => 'submit', 'name' => ( ! is_array($data) ? $data : ''), 'value' => $value);
+ $defaults = array(
+ 'type' => 'submit',
+ 'name' => is_array($data) ? '' : $data,
+ 'value' => $value
+ );
+
return '<input '._parse_form_attributes($data, $defaults).$extra." />\n";
}
}
@@ -477,7 +483,12 @@
*/
function form_reset($data = '', $value = '', $extra = '')
{
- $defaults = array('type' => 'reset', 'name' => ( ! is_array($data) ? $data : ''), 'value' => $value);
+ $defaults = array(
+ 'type' => 'reset',
+ 'name' => is_array($data) ? '' : $data,
+ 'value' => $value
+ );
+
return '<input '._parse_form_attributes($data, $defaults).$extra." />\n";
}
}
@@ -496,7 +507,11 @@
*/
function form_button($data = '', $content = '', $extra = '')
{
- $defaults = array('name' => ( ! is_array($data) ? $data : ''), 'type' => 'button');
+ $defaults = array(
+ 'name' => is_array($data) ? '' : $data,
+ 'type' => 'button'
+ );
+
if (is_array($data) && isset($data['content']))
{
$content = $data['content'];