Remove access description lines and cleanup the html helper
diff --git a/system/helpers/html_helper.php b/system/helpers/html_helper.php
index b8c4f36..0417bd2 100644
--- a/system/helpers/html_helper.php
+++ b/system/helpers/html_helper.php
@@ -25,8 +25,6 @@
* @filesource
*/
-// ------------------------------------------------------------------------
-
/**
* CodeIgniter HTML Helpers
*
@@ -42,12 +40,10 @@
/**
* Heading
*
- * Generates an HTML heading tag. First param is the data.
- * Second param is the size of the heading tag.
+ * Generates an HTML heading tag.
*
- * @access public
- * @param string
- * @param integer
+ * @param string content
+ * @param int heading level
* @return string
*/
if ( ! function_exists('heading'))
@@ -65,7 +61,6 @@
*
* Generates an HTML unordered list from an single or multi-dimensional array.
*
- * @access public
* @param array
* @param mixed
* @return string
@@ -85,7 +80,6 @@
*
* Generates an HTML ordered list from an single or multi-dimensional array.
*
- * @access public
* @param array
* @param mixed
* @return string
@@ -105,11 +99,10 @@
*
* Generates an HTML ordered list from an single or multi-dimensional array.
*
- * @access private
* @param string
* @param mixed
* @param mixed
- * @param integer
+ * @param int
* @return string
*/
if ( ! function_exists('_list'))
@@ -131,13 +124,13 @@
$atts = '';
foreach ($attributes as $key => $val)
{
- $atts .= ' ' . $key . '="' . $val . '"';
+ $atts .= ' '.$key.'="'.$val.'"';
}
$attributes = $atts;
}
- elseif (is_string($attributes) AND strlen($attributes) > 0)
+ elseif (is_string($attributes) && strlen($attributes) > 0)
{
- $attributes = ' '. $attributes;
+ $attributes = ' '.$attributes;
}
// Write the opening list tag
@@ -175,8 +168,7 @@
/**
* Generates HTML BR tags based on number supplied
*
- * @access public
- * @param integer
+ * @param int
* @return string
*/
if ( ! function_exists('br'))
@@ -194,8 +186,8 @@
*
* Generates an <img /> element
*
- * @access public
* @param mixed
+ * @param bool
* @return string
*/
if ( ! function_exists('img'))
@@ -217,7 +209,7 @@
foreach ($src as $k => $v)
{
- if ($k === 'src' AND strpos($v, '://') === FALSE)
+ if ($k === 'src' && strpos($v, '://') === FALSE)
{
$CI =& get_instance();
@@ -232,7 +224,7 @@
}
else
{
- $img .= " $k=\"$v\"";
+ $img .= ' '.$k.'="'.$v.'"';
}
}
@@ -248,10 +240,9 @@
* Generates a page document type declaration
*
* Valid options are xhtml-11, xhtml-strict, xhtml-trans, xhtml-frame,
- * html4-strict, html4-trans, and html4-frame. Values are saved in the
+ * html4-strict, html4-trans, and html4-frame. Values are saved in the
* doctypes config file.
*
- * @access public
* @param string type The doctype to be generated
* @return string
*/
@@ -263,7 +254,7 @@
if ( ! is_array($_doctypes))
{
- if (defined('ENVIRONMENT') AND is_file(APPPATH.'config/'.ENVIRONMENT.'/doctypes.php'))
+ if (defined('ENVIRONMENT') && is_file(APPPATH.'config/'.ENVIRONMENT.'/doctypes.php'))
{
include(APPPATH.'config/'.ENVIRONMENT.'/doctypes.php');
}
@@ -278,7 +269,7 @@
}
}
- return (isset($_doctypes[$type])) ? $_doctypes[$type] : FALSE;
+ return isset($_doctypes[$type]) ? $_doctypes[$type] : FALSE;
}
}
@@ -289,13 +280,12 @@
*
* Generates link to a CSS file
*
- * @access public
* @param mixed stylesheet hrefs or an array
* @param string rel
* @param string type
* @param string title
* @param string media
- * @param boolean should index_page be added to the css path
+ * @param bool should index_page be added to the css path
* @return string
*/
if ( ! function_exists('link_tag'))
@@ -309,7 +299,7 @@
{
foreach ($href as $k => $v)
{
- if ($k === 'href' AND strpos($v, '://') === FALSE)
+ if ($k === 'href' && strpos($v, '://') === FALSE)
{
if ($index_page === TRUE)
{
@@ -322,11 +312,9 @@
}
else
{
- $link .= "$k=\"$v\" ";
+ $link .= $k.'="'.$v.'" ';
}
}
-
- $link .= '/>';
}
else
{
@@ -354,11 +342,9 @@
{
$link .= 'title="'.$title.'" ';
}
-
- $link .= '/>';
}
- return $link."\n";
+ return $link."/>\n";
}
}
@@ -367,8 +353,10 @@
/**
* Generates meta tags from an array of key/values
*
- * @access public
* @param array
+ * @param string
+ * @param string
+ * @param string
* @return string
*/
if ( ! function_exists('meta'))
@@ -381,13 +369,10 @@
{
$name = array(array('name' => $name, 'content' => $content, 'type' => $type, 'newline' => $newline));
}
- else
+ elseif (isset($name['name']))
{
// Turn single array into multidimensional
- if (isset($name['name']))
- {
- $name = array($name);
- }
+ $name = array($name);
}
$str = '';
@@ -410,8 +395,7 @@
/**
* Generates non-breaking space entities based on number supplied
*
- * @access public
- * @param integer
+ * @param int
* @return string
*/
if ( ! function_exists('nbs'))
@@ -423,4 +407,4 @@
}
/* End of file html_helper.php */
-/* Location: ./system/helpers/html_helper.php */
+/* Location: ./system/helpers/html_helper.php */
\ No newline at end of file