Remove access description lines and cleanup the url helper
diff --git a/system/helpers/url_helper.php b/system/helpers/url_helper.php
index 2ae1fd3..5576c27 100644
--- a/system/helpers/url_helper.php
+++ b/system/helpers/url_helper.php
@@ -25,8 +25,6 @@
* @filesource
*/
-// ------------------------------------------------------------------------
-
/**
* CodeIgniter URL Helpers
*
@@ -45,7 +43,6 @@
* Create a local URL based on your basepath. Segments can be passed via the
* first parameter either as a string or an array.
*
- * @access public
* @param string
* @return string
*/
@@ -67,8 +64,7 @@
* Segments can be passed in as a string or an array, same as site_url
* or a URL to a file can be passed in, e.g. to an image file.
*
- * @access public
- * @param string
+ * @param string
* @return string
*/
if ( ! function_exists('base_url'))
@@ -88,7 +84,6 @@
* Returns the full URL (including segments) of the page where this
* function is placed
*
- * @access public
* @return string
*/
if ( ! function_exists('current_url'))
@@ -106,7 +101,6 @@
*
* Returns the URI segments.
*
- * @access public
* @return string
*/
if ( ! function_exists('uri_string'))
@@ -125,7 +119,6 @@
*
* Returns the "index_page" from your config file
*
- * @access public
* @return string
*/
if ( ! function_exists('index_page'))
@@ -144,7 +137,6 @@
*
* Creates an anchor based on the local URL.
*
- * @access public
* @param string the URL
* @param string the link title
* @param mixed any attributes
@@ -158,7 +150,7 @@
if ( ! is_array($uri))
{
- $site_url = ( ! preg_match('!^\w+://! i', $uri)) ? site_url($uri) : $uri;
+ $site_url = preg_match('!^\w+://! i', $uri) ? $uri : site_url($uri);
}
else
{
@@ -187,7 +179,6 @@
* Creates an anchor based on the local URL. The link
* opens a new window based on the attributes specified.
*
- * @access public
* @param string the URL
* @param string the link title
* @param mixed any attributes
@@ -198,7 +189,7 @@
function anchor_popup($uri = '', $title = '', $attributes = FALSE)
{
$title = (string) $title;
- $site_url = ( ! preg_match('!^\w+://! i', $uri)) ? site_url($uri) : $uri;
+ $site_url = preg_match('!^\w+://! i', $uri) ? $uri : site_url($uri);
if ($title == '')
{
@@ -207,7 +198,7 @@
if ($attributes === FALSE)
{
- return "<a href='javascript:void(0);' onclick=\"window.open('".$site_url."', '_blank');\">".$title."</a>";
+ return "<a href='javascript:void(0);' onclick=\"window.open('".$site_url."', '_blank');\">".$title.'</a>';
}
if ( ! is_array($attributes))
@@ -217,7 +208,7 @@
foreach (array('width' => '800', 'height' => '600', 'scrollbars' => 'yes', 'status' => 'yes', 'resizable' => 'yes', 'screenx' => '0', 'screeny' => '0', ) as $key => $val)
{
- $atts[$key] = ( ! isset($attributes[$key])) ? $val : $attributes[$key];
+ $atts[$key] = isset($attributes[$key]) ? $attributes[$key] : $val;
unset($attributes[$key]);
}
@@ -226,7 +217,7 @@
$attributes = _parse_attributes($attributes);
}
- return "<a href='javascript:void(0);' onclick=\"window.open('".$site_url."', '_blank', '"._parse_attributes($atts, TRUE)."');\"$attributes>".$title."</a>";
+ return "<a href='javascript:void(0);' onclick=\"window.open('".$site_url."', '_blank', '"._parse_attributes($atts, TRUE)."');\"".$attributes.'>'.$title.'</a>';
}
}
@@ -235,7 +226,6 @@
/**
* Mailto Link
*
- * @access public
* @param string the email address
* @param string the link title
* @param mixed any attributes
@@ -263,7 +253,6 @@
*
* Create a spam-protected mailto link written in Javascript
*
- * @access public
* @param string the email address
* @param string the link title
* @param mixed any attributes
@@ -373,10 +362,9 @@
*
* Automatically links URL and Email addresses.
* Note: There's a bit of extra code here to deal with
- * URLs or emails that end in a period. We'll strip these
+ * URLs or emails that end in a period. We'll strip these
* off and add them after the link.
*
- * @access public
* @param string the string
* @param string the type: email, url, or both
* @param bool whether to create pop-up links
@@ -440,7 +428,6 @@
*
* Simply adds the http:// part if no scheme is included
*
- * @access public
* @param string the URL
* @return string
*/
@@ -470,12 +457,12 @@
* Create URL Title
*
* Takes a "title" string as input and creates a
- * human-friendly URL string with a "separator" string
+ * human-friendly URL string with a "separator" string
* as the word separator.
*
- * @access public
* @param string the string
* @param string the separator
+ * @param bool
* @return string
*/
if ( ! function_exists('url_title'))
@@ -484,21 +471,21 @@
{
if ($separator === 'dash')
{
- $separator = '-';
+ $separator = '-';
}
- else if ($separator == 'underscore')
+ elseif ($separator === 'underscore')
{
- $separator = '_';
+ $separator = '_';
}
-
+
$q_separator = preg_quote($separator);
$trans = array(
- '&.+?;' => '',
- '[^a-z0-9 _-]' => '',
- '\s+' => $separator,
- '('.$q_separator.')+' => $separator
- );
+ '&.+?;' => '',
+ '[^a-z0-9 _-]' => '',
+ '\s+' => $separator,
+ '('.$q_separator.')+' => $separator
+ );
$str = strip_tags($str);
foreach ($trans as $key => $val)
@@ -524,7 +511,6 @@
* For very fine grained control over headers, you could use the Output
* Library's set_header() function.
*
- * @access public
* @param string the URL
* @param string the method: location or refresh
* @return string
@@ -564,7 +550,6 @@
*
* Some of the functions use this
*
- * @access private
* @param array
* @param bool
* @return string
@@ -583,15 +568,15 @@
{
if ($javascript == TRUE)
{
- $att .= $key . '=' . $val . ',';
+ $att .= $key.'='.$val.',';
}
else
{
- $att .= ' ' . $key . '="' . $val . '"';
+ $att .= ' '.$key.'="'.$val.'"';
}
}
- if ($javascript == TRUE AND $att != '')
+ if ($javascript == TRUE && $att != '')
{
return substr($att, 0, -1);
}
@@ -601,4 +586,4 @@
}
/* End of file url_helper.php */
-/* Location: ./system/helpers/url_helper.php */
+/* Location: ./system/helpers/url_helper.php */
\ No newline at end of file