aboutsummaryrefslogtreecommitdiff
path: root/views
diff options
context:
space:
mode:
Diffstat (limited to 'views')
-rw-r--r--views/default/input/url.php17
-rw-r--r--views/default/output/url.php54
2 files changed, 20 insertions, 51 deletions
diff --git a/views/default/input/url.php b/views/default/input/url.php
index 1271bd3be..29f5edb30 100644
--- a/views/default/input/url.php
+++ b/views/default/input/url.php
@@ -5,22 +5,17 @@
*
* @package Elgg
* @subpackage Core
- *
- * @uses $vars['value'] The current value, if any
- * @uses $vars['js'] Any Javascript to enter into the input tag
- * @uses $vars['internalname'] The name of the input field
- * @uses $vars['class'] Class override
*/
-$class = $vars['class'];
-if (!$class) {
- $class = "input_url";
-}
+$defaults = array(
+ 'class' => 'input_url',
+);
+
+$vars = array_merge($defaults, $vars);
if (!isset($vars['value']) || $vars['value'] === FALSE) {
$vars['value'] = elgg_get_sticky_value($vars['internalname']);
}
-
?>
-<input type="text" <?php if ($vars['disabled']) echo ' disabled="yes" '; ?> <?php echo $vars['js']; ?> name="<?php echo $vars['internalname']; ?>" <?php if (isset($vars['internalid'])) echo "id=\"{$vars['internalid']}\""; ?> value="<?php echo htmlentities($vars['value'], ENT_QUOTES, 'UTF-8'); ?>" class="<?php echo $class; ?>"/> \ No newline at end of file
+<input type="text" <?php echo elgg_format_attributes($vars); ?> />
diff --git a/views/default/output/url.php b/views/default/output/url.php
index c857d24d1..23b774198 100644
--- a/views/default/output/url.php
+++ b/views/default/output/url.php
@@ -6,68 +6,42 @@
* @package Elgg
* @subpackage Core
*
- * @uses string $vars['href'] The URL.
- * @uses string $vars['text'] The string between the <a></a> tags.
- * @uses string $vars['target'] Set the target="" attribute.
- * @uses bool $vars['encode_text'] Run $vars['text'] through htmlentities()?
- * @uses string $vars['class'] what to add in class=""
- * @uses string $vars['js'] Javascript to insert in <a> tag
- * @uses string $vars['title'] Title attribute to <a> tag
- * @uses bool $vars['is_action'] Is this a link to an action?
+ * @uses string $vars['text'] The string between the <a></a> tags.
+ * @uses bool $vars['encode_text'] Run $vars['text'] through htmlentities()?
+ * @uses bool $vars['is_action'] Is this a link to an action?
*
*/
$url = trim($vars['href']);
if (!$url and isset($vars['value'])) {
$url = trim($vars['value']);
+ unset($vars['value']);
}
-if (!empty($url)) {
- if (isset($vars['target'])) {
- $target = "target = \"{$vars['target']}\"";
- } else {
- $target = '';
- }
-
- if (isset($vars['class'])) {
- $class = "class = \"{$vars['class']}\"";
- } else {
- $class = '';
- }
-
- if (isset($vars['internalid'])) {
- $id = "id = \"{$vars['internalid']}\"";
- } else {
- $id = '';
- }
-
- if (isset($vars['js'])) {
- $js = "{$vars['js']}";
- } else {
- $js = '';
- }
-
+if (!empty($url)) {
if (isset($vars['text'])) {
if (isset($vars['encode_text']) && $vars['encode_text']) {
$text = htmlentities($vars['text'], ENT_QUOTES, 'UTF-8');
} else {
$text = $vars['text'];
}
+
+ unset($vars['text']);
} else {
$text = htmlentities($url, ENT_QUOTES, 'UTF-8');
}
+ unset($vars['encode_text']);
+
$url = elgg_normalize_url($url);
if (isset($vars['is_action'])) {
$url = elgg_add_action_tokens_to_url($url);
+ unset($vars['is_action']);
}
- if (isset($vars['title'])) {
- $title = 'title="' . htmlentities($vars['title']) . '"';
- } else {
- $title = '';
- }
-
- echo "<a href=\"{$url}\" $target $class $id $js $title>$text</a>";
+ $vars['href'] = $url;
+
+ $attributes = elgg_format_attributes($vars);
+ echo "<a $attributes>$text</a>";
} \ No newline at end of file