All line endings are now Unix-style.

git-svn-id: https://code.elgg.org/elgg/trunk@3451 36083f99-b078-4883-b0ff-0f9b5a30f544

13 files changed, 380 insertions, 380 deletions

diff --git a/views/default/input/access.php b/views/default/input/access.php
index ccb38b54f..461fbf625 100644
--- a/views/default/input/access.php
+++ b/views/default/input/access.php
@@ -1,55 +1,55 @@
-<?php

-

-	/**

-	 * Elgg access level input

-	 * Displays a pulldown input field

-	 * 

-	 * @package Elgg

-	 * @subpackage Core

-
-	 * @author Curverider Ltd

-
-	 * @link http://elgg.org/

-	 * 

-	 * @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

-	 * 

-	 */

-

-	if (isset($vars['class'])) $class = $vars['class'];

-	if (!$class) $class = "input-access";

-	

-	if (!array_key_exists('value', $vars) || $vars['value'] == ACCESS_DEFAULT)

-		$vars['value'] = get_default_access();

-			

-

-		if ((!isset($vars['options'])) || (!is_array($vars['options'])))

-		{

-			$vars['options'] = array();

-			$vars['options'] = get_write_access_array();

-		}

-		

-		if (is_array($vars['options']) && sizeof($vars['options']) > 0) {	 

-			 

-?>

-

-<select <?php if (isset($vars['internalid'])) echo "id=\"{$vars['internalid']}\""; ?> name="<?php echo $vars['internalname']; ?>" <?php if (isset($vars['js'])) echo $vars['js']; ?> <?php if ((isset($vars['disabled'])) && ($vars['disabled'])) echo ' disabled="yes" '; ?> class="<?php echo $class; ?>">

-<?php

-

-    foreach($vars['options'] as $key => $option) {

-        if ($key != $vars['value']) {

-            echo "<option value=\"{$key}\">". htmlentities($option, ENT_QUOTES, 'UTF-8') ."</option>";

-        } else {

-            echo "<option value=\"{$key}\" selected=\"selected\">". htmlentities($option, ENT_QUOTES, 'UTF-8') ."</option>";

-        }

-    }

-

-?> 

-</select>

-

-<?php

-

-		}		

-

+<?php
+
+	/**
+	 * Elgg access level input
+	 * Displays a pulldown input field
+	 * 
+	 * @package Elgg
+	 * @subpackage Core
+
+	 * @author Curverider Ltd
+
+	 * @link http://elgg.org/
+	 * 
+	 * @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
+	 * 
+	 */
+
+	if (isset($vars['class'])) $class = $vars['class'];
+	if (!$class) $class = "input-access";
+	
+	if (!array_key_exists('value', $vars) || $vars['value'] == ACCESS_DEFAULT)
+		$vars['value'] = get_default_access();
+			
+
+		if ((!isset($vars['options'])) || (!is_array($vars['options'])))
+		{
+			$vars['options'] = array();
+			$vars['options'] = get_write_access_array();
+		}
+		
+		if (is_array($vars['options']) && sizeof($vars['options']) > 0) {	 
+			 
+?>
+
+<select <?php if (isset($vars['internalid'])) echo "id=\"{$vars['internalid']}\""; ?> name="<?php echo $vars['internalname']; ?>" <?php if (isset($vars['js'])) echo $vars['js']; ?> <?php if ((isset($vars['disabled'])) && ($vars['disabled'])) echo ' disabled="yes" '; ?> class="<?php echo $class; ?>">
+<?php
+
+    foreach($vars['options'] as $key => $option) {
+        if ($key != $vars['value']) {
+            echo "<option value=\"{$key}\">". htmlentities($option, ENT_QUOTES, 'UTF-8') ."</option>";
+        } else {
+            echo "<option value=\"{$key}\" selected=\"selected\">". htmlentities($option, ENT_QUOTES, 'UTF-8') ."</option>";
+        }
+    }
+
+?> 
+</select>
+
+<?php
+
+		}		
+
 ?>
\ No newline at end of file
diff --git a/views/default/input/calendar.php b/views/default/input/calendar.php
index 69ef01ee7..9dd5b2dc0 100644
--- a/views/default/input/calendar.php
+++ b/views/default/input/calendar.php
@@ -1,44 +1,44 @@
-<?php 

-

-	/**

-	 * Elgg calendar input

-	 * Displays a calendar input field

-	 * 

-	 * @package Elgg

-	 * @subpackage Core

+<?php 
 
-	 * @author Curverider Ltd

+	/**
+	 * Elgg calendar input
+	 * Displays a calendar input field
+	 * 
+	 * @package Elgg
+	 * @subpackage Core
 
-	 * @link http://elgg.org/

-	 * 

-	 * @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

-	 * 

-	 */

-

-    static $calendarjs;

-    if (empty($calendarjs)) {

-        

-        echo <<< END

-        

-<script language="JavaScript" src="{$vars['url']}vendors/calendarpopup/CalendarPopup.js"></script>

-        

-END;

-        $calendarjs = 1;

-    }

-    $strippedname = sanitise_string($vars['internalname']);

-    $js = "cal" . $strippedname;

-

-    if ($vars['value'] > 86400) {

-        $val = date("F j, Y",$vars['value']);

-    } else {

-        $val = $vars['value'];

-    }

-    

-?>

-<script language="JavaScript">

-    var cal<?php echo $strippedname; ?> = new CalendarPopup();

-</script>

-<input type="text" <?php echo $vars['js']; ?> name="<?php echo $vars['internalname']; ?>" id="<?php echo $strippedname; ?>" value="<?php echo $val; ?>" />

+	 * @author Curverider Ltd
+
+	 * @link http://elgg.org/
+	 * 
+	 * @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
+	 * 
+	 */
+
+    static $calendarjs;
+    if (empty($calendarjs)) {
+        
+        echo <<< END
+        
+<script language="JavaScript" src="{$vars['url']}vendors/calendarpopup/CalendarPopup.js"></script>
+        
+END;
+        $calendarjs = 1;
+    }
+    $strippedname = sanitise_string($vars['internalname']);
+    $js = "cal" . $strippedname;
+
+    if ($vars['value'] > 86400) {
+        $val = date("F j, Y",$vars['value']);
+    } else {
+        $val = $vars['value'];
+    }
+    
+?>
+<script language="JavaScript">
+    var cal<?php echo $strippedname; ?> = new CalendarPopup();
+</script>
+<input type="text" <?php echo $vars['js']; ?> name="<?php echo $vars['internalname']; ?>" id="<?php echo $strippedname; ?>" value="<?php echo $val; ?>" />
 <a href="#" onclick="<?php echo $js; ?>.select(document.getElementById('<?php echo $strippedname; ?>'),'anchor<?php echo $strippedname; ?>','MMM dd, yyyy'); return false;" TITLE="<?php echo $js; ?>.select(document.forms[0].<?php echo $strippedname; ?>,'anchor<?php echo $strippedname; ?>','MMM dd, yyyy'); return false;" NAME="anchor<?php echo $strippedname; ?>" ID="anchor<?php echo $strippedname; ?>">select</a> 
\ No newline at end of file
diff --git a/views/default/input/checkboxes.php b/views/default/input/checkboxes.php
index 7e6c70a54..4e806bbfc 100644
--- a/views/default/input/checkboxes.php
+++ b/views/default/input/checkboxes.php
@@ -1,52 +1,52 @@
-<?php

-

-	/**

-	 * Elgg checkbox input

-	 * Displays a checkbox input field

-	 * 

-	 * @package Elgg

-	 * @subpackage Core

+<?php
 
-	 * @author Curverider Ltd

+	/**
+	 * Elgg checkbox input
+	 * Displays a checkbox input field
+	 * 
+	 * @package Elgg
+	 * @subpackage Core
 
-	 * @link http://elgg.org/

-	 * 

-	 * @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['options'] An array of strings representing the label => options for the checkbox field

-	 * 

-	 */

+	 * @author Curverider Ltd
+
+	 * @link http://elgg.org/
+	 * 
+	 * @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['options'] An array of strings representing the label => options for the checkbox field
+	 * 
+	 */
 
 	$class = $vars['class'];
-	if (!$class) $class = "input-checkboxes";

-	

-    foreach($vars['options'] as $label => $option) {

-        //if (!in_array($option,$vars['value'])) {

-        if (is_array($vars['value'])) {

-        	$valarray = $vars['value'];

-        	$valarray = array_map('strtolower', $valarray);

-        	if (!in_array(strtolower($option),$valarray)) {

-	            $selected = "";

-	        } else {

-	            $selected = "checked = \"checked\"";

-	        }

+	if (!$class) $class = "input-checkboxes";
+	
+    foreach($vars['options'] as $label => $option) {
+        //if (!in_array($option,$vars['value'])) {
+        if (is_array($vars['value'])) {
+        	$valarray = $vars['value'];
+        	$valarray = array_map('strtolower', $valarray);
+        	if (!in_array(strtolower($option),$valarray)) {
+	            $selected = "";
+	        } else {
+	            $selected = "checked = \"checked\"";
+	        }
         } else {
-	    	if (strtolower($option) != strtolower($vars['value'])) {

-	            $selected = "";

-	        } else {

-	            $selected = "checked = \"checked\"";

-	        }

-        }

-        $labelint = (int) $label;

-        if ("{$label}" == "{$labelint}") {

-        	$label = $option;

+	    	if (strtolower($option) != strtolower($vars['value'])) {
+	            $selected = "";
+	        } else {
+	            $selected = "checked = \"checked\"";
+	        }
+        }
+        $labelint = (int) $label;
+        if ("{$label}" == "{$labelint}") {
+        	$label = $option;
         }
         
         if (isset($vars['internalid'])) $id = "id=\"{$vars['internalid']}\""; 
         $disabled = "";
-        if ($vars['disabled']) $disabled = ' disabled="yes" '; 

-        echo "<label><input type=\"checkbox\" $id $disabled {$vars['js']} name=\"{$vars['internalname']}[]\" value=\"".htmlentities($option, ENT_QUOTES, 'UTF-8')."\" {$selected} class=\"$class\" />{$label}</label><br />";

-    }

-

+        if ($vars['disabled']) $disabled = ' disabled="yes" '; 
+        echo "<label><input type=\"checkbox\" $id $disabled {$vars['js']} name=\"{$vars['internalname']}[]\" value=\"".htmlentities($option, ENT_QUOTES, 'UTF-8')."\" {$selected} class=\"$class\" />{$label}</label><br />";
+    }
+
 ?> 
\ No newline at end of file
diff --git a/views/default/input/email.php b/views/default/input/email.php
index 75d7eec39..e1fb61eab 100644
--- a/views/default/input/email.php
+++ b/views/default/input/email.php
@@ -1,24 +1,24 @@
-<?php

-

-	/**

-	 * Elgg email input

-	 * Displays an email input field

-	 * 

-	 * @package Elgg

-	 * @subpackage Core

+<?php
 
-	 * @author Curverider Ltd

+	/**
+	 * Elgg email input
+	 * Displays an email input field
+	 * 
+	 * @package Elgg
+	 * @subpackage Core
 
-	 * @link http://elgg.org/

-	 * 

-	 * @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

-	 * 

-	 */

+	 * @author Curverider Ltd
+
+	 * @link http://elgg.org/
+	 * 
+	 * @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
+	 * 
+	 */
 
 	$class = $vars['class'];
-	if (!$class) $class = "input-text";

-?>

-

+	if (!$class) $class = "input-text";
+?>
+
 <input type="text" <?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
diff --git a/views/default/input/file.php b/views/default/input/file.php
index ec961b6d0..e707e3ee0 100644
--- a/views/default/input/file.php
+++ b/views/default/input/file.php
@@ -1,26 +1,26 @@
-<?php

-

-	/**

-	 * Elgg file input

-	 * Displays a file input field

-	 * 

-	 * @package Elgg

-	 * @subpackage Core

+<?php
 
-	 * @author Curverider Ltd

+	/**
+	 * Elgg file input
+	 * Displays a file input field
+	 * 
+	 * @package Elgg
+	 * @subpackage Core
 
-	 * @link http://elgg.org/

-	 * 

-	 * @uses $vars['js'] Any Javascript to enter into the input tag

-	 * @uses $vars['internalname'] The name of the input field

-	 * 

-	 */

-

-    if (!empty($vars['value'])) {

-        echo elgg_echo('fileexists') . "<br />";

-    }

+	 * @author Curverider Ltd
+
+	 * @link http://elgg.org/
+	 * 
+	 * @uses $vars['js'] Any Javascript to enter into the input tag
+	 * @uses $vars['internalname'] The name of the input field
+	 * 
+	 */
+
+    if (!empty($vars['value'])) {
+        echo elgg_echo('fileexists') . "<br />";
+    }
 
     $class = $vars['class'];
-	if (!$class) $class = "input-file";

-?>

+	if (!$class) $class = "input-file";
+?>
 <input type="file" size="30" <?php echo $vars['js']; ?> name="<?php echo $vars['internalname']; ?>" <?php if (isset($vars['internalid'])) echo "id=\"{$vars['internalid']}\""; ?> <?php if ($vars['disabled']) echo ' disabled="yes" '; ?> class="<?php echo $class; ?>" />
\ No newline at end of file
diff --git a/views/default/input/longtext.php b/views/default/input/longtext.php
index c17b770d4..86b0f3fc4 100644
--- a/views/default/input/longtext.php
+++ b/views/default/input/longtext.php
@@ -1,25 +1,25 @@
-<?php

-

-	/**

-	 * Elgg long text input

-	 * Displays a long text input field

-	 * 

-	 * @package Elgg

-	 * @subpackage Core

+<?php
 
-	 * @author Curverider Ltd

+	/**
+	 * Elgg long text input
+	 * Displays a long text input field
+	 * 
+	 * @package Elgg
+	 * @subpackage Core
 
-	 * @link http://elgg.org/

-	 * 

-	 * @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

-	 * 

-	 */

+	 * @author Curverider Ltd
+
+	 * @link http://elgg.org/
+	 * 
+	 * @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
+	 * 
+	 */
 
 	$class = $vars['class'];
 	if (!$class) $class = "input-textarea";
-	

-?>

-

+	
+?>
+
 <textarea class="<?php echo $class; ?>" name="<?php echo $vars['internalname']; ?>" <?php if (isset($vars['internalid'])) echo "id=\"{$vars['internalid']}\""; ?> <?php if ($vars['disabled']) echo ' disabled="yes" '; ?> <?php echo $vars['js']; ?>><?php echo htmlentities($vars['value'], ENT_QUOTES, 'UTF-8'); ?></textarea> 
\ No newline at end of file
diff --git a/views/default/input/password.php b/views/default/input/password.php
index 9a7e678fb..8ab0b6935 100644
--- a/views/default/input/password.php
+++ b/views/default/input/password.php
@@ -1,24 +1,24 @@
-<?php

-

-	/**

-	 * Elgg password input

-	 * Displays a password input field

-	 * 

-	 * @package Elgg

-	 * @subpackage Core

+<?php
 
-	 * @author Curverider Ltd

+	/**
+	 * Elgg password input
+	 * Displays a password input field
+	 * 
+	 * @package Elgg
+	 * @subpackage Core
 
-	 * @link http://elgg.org/

-	 * 

-	 * @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

-	 * 

-	 */

+	 * @author Curverider Ltd
+
+	 * @link http://elgg.org/
+	 * 
+	 * @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
+	 * 
+	 */
 
 	$class = $vars['class'];
-	if (!$class) $class = "input-password";

-?>

-

+	if (!$class) $class = "input-password";
+?>
+
 <input type="password" <?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
diff --git a/views/default/input/plaintext.php b/views/default/input/plaintext.php
index ee5854a0a..a99084a43 100644
--- a/views/default/input/plaintext.php
+++ b/views/default/input/plaintext.php
@@ -1,25 +1,25 @@
-<?php

-

-	/**

-	 * Elgg long text input (plaintext)

-	 * Displays a long text input field that should not be overridden by wysiwyg editors.

-	 * 

-	 * @package Elgg

-	 * @subpackage Core

+<?php
 
-	 * @author Curverider Ltd

+	/**
+	 * Elgg long text input (plaintext)
+	 * Displays a long text input field that should not be overridden by wysiwyg editors.
+	 * 
+	 * @package Elgg
+	 * @subpackage Core
+
+	 * @author Curverider Ltd
+
+	 * @link http://elgg.org/
+	 * 
+	 * @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
+	 * 
+	 */
+
+	$class = $vars['class'];
+	if (!$class) $class = "input-textarea";
+	
+?>
 
-	 * @link http://elgg.org/

-	 * 

-	 * @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

-	 * 

-	 */

-

-	$class = $vars['class'];

-	if (!$class) $class = "input-textarea";

-	

-?>

-

 <textarea class="<?php echo $class; ?>" name="<?php echo $vars['internalname']; ?>" <?php if (isset($vars['internalid'])) echo "id=\"{$vars['internalid']}\""; ?> <?php if ($vars['disabled']) echo ' disabled="yes" '; ?> <?php echo $vars['js']; ?>><?php echo htmlentities($vars['value'], ENT_QUOTES, 'UTF-8'); ?></textarea> 
\ No newline at end of file
diff --git a/views/default/input/pulldown.php b/views/default/input/pulldown.php
index c73e6b6c9..6aa69f428 100644
--- a/views/default/input/pulldown.php
+++ b/views/default/input/pulldown.php
@@ -1,33 +1,33 @@
-<?php

-

-	/**

-	 * Elgg pulldown input

-	 * Displays a pulldown input field

-	 * 

-	 * @package Elgg

-	 * @subpackage Core

-
-	 * @author Curverider Ltd

-
-	 * @link http://elgg.org/

-	 * 

-	 * @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['options'] An array of strings representing the options for the pulldown field

+<?php
+
+	/**
+	 * Elgg pulldown input
+	 * Displays a pulldown input field
+	 * 
+	 * @package Elgg
+	 * @subpackage Core
+
+	 * @author Curverider Ltd
+
+	 * @link http://elgg.org/
+	 * 
+	 * @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['options'] An array of strings representing the options for the pulldown field
 	 * @uses $vars['options_values'] An associative array of "value" => "option" where "value" is an internal name and "option" is 
-	 * 								 the value displayed on the button. Replaces $vars['options'] when defined. 

-	 */

+	 * 								 the value displayed on the button. Replaces $vars['options'] when defined. 
+	 */
 
 
 	$class = $vars['class'];
 	if (!$class) $class = "input-pulldown";
-

-?>

-

-

-<select name="<?php echo $vars['internalname']; ?>" <?php if (isset($vars['internalid'])) echo "id=\"{$vars['internalid']}\""; ?> <?php echo $vars['js']; ?> <?php if ($vars['disabled']) echo ' disabled="yes" '; ?> class="<?php echo $class; ?>">

-<?php

+
+?>
+
+
+<select name="<?php echo $vars['internalname']; ?>" <?php if (isset($vars['internalid'])) echo "id=\"{$vars['internalid']}\""; ?> <?php echo $vars['js']; ?> <?php if ($vars['disabled']) echo ' disabled="yes" '; ?> class="<?php echo $class; ?>">
+<?php
 	if ($vars['options_values'])
 	{
 		foreach($vars['options_values'] as $value => $option) {
@@ -39,14 +39,14 @@
 	    }
 	}
 	else
-	{

-	    foreach($vars['options'] as $option) {

-	        if ($option != $vars['value']) {

-	            echo "<option>". htmlentities($option, ENT_QUOTES, 'UTF-8') ."</option>";

-	        } else {

-	            echo "<option selected=\"selected\">". htmlentities($option, ENT_QUOTES, 'UTF-8') ."</option>";

-	        }

-	    }

-	}

-?> 

+	{
+	    foreach($vars['options'] as $option) {
+	        if ($option != $vars['value']) {
+	            echo "<option>". htmlentities($option, ENT_QUOTES, 'UTF-8') ."</option>";
+	        } else {
+	            echo "<option selected=\"selected\">". htmlentities($option, ENT_QUOTES, 'UTF-8') ."</option>";
+	        }
+	    }
+	}
+?> 
 </select>
\ No newline at end of file
diff --git a/views/default/input/radio.php b/views/default/input/radio.php
index b94ed8080..12e40ccdd 100644
--- a/views/default/input/radio.php
+++ b/views/default/input/radio.php
@@ -1,40 +1,40 @@
-<?php

-

-	/**

-	 * Elgg radio input

-	 * Displays a radio input field

-	 * 

-	 * @package Elgg

-	 * @subpackage Core

+<?php
 
-	 * @author Curverider Ltd

+	/**
+	 * Elgg radio input
+	 * Displays a radio input field
+	 * 
+	 * @package Elgg
+	 * @subpackage Core
 
-	 * @link http://elgg.org/

-	 * 

-	 * @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['options'] An array of strings representing the options for the radio field as "label" => option

-	 * 

-	 */

+	 * @author Curverider Ltd
+
+	 * @link http://elgg.org/
+	 * 
+	 * @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['options'] An array of strings representing the options for the radio field as "label" => option
+	 * 
+	 */
 	
 	$class = $vars['class'];
 	if (!$class) $class = "input-radio";
-

-    foreach($vars['options'] as $label => $option) {

-        if (strtolower($option) != strtolower($vars['value'])) {

-            $selected = "";

-        } else {

-            $selected = "checked = \"checked\"";

-        }

-        $labelint = (int) $label;

-        if ("{$label}" == "{$labelint}") {

-        	$label = $option;

+
+    foreach($vars['options'] as $label => $option) {
+        if (strtolower($option) != strtolower($vars['value'])) {
+            $selected = "";
+        } else {
+            $selected = "checked = \"checked\"";
+        }
+        $labelint = (int) $label;
+        if ("{$label}" == "{$labelint}") {
+        	$label = $option;
         }
         
         if (isset($vars['internalid'])) $id = "id=\"{$vars['internalid']}\""; 
-        if ($vars['disabled']) $disabled = ' disabled="yes" '; 

-        echo "<label><input type=\"radio\" $disabled {$vars['js']} name=\"{$vars['internalname']}\" $id value=\"".htmlentities($option, ENT_QUOTES, 'UTF-8')."\" {$selected} class=\"$class\" />{$label}</label><br />";

-    }

-

+        if ($vars['disabled']) $disabled = ' disabled="yes" '; 
+        echo "<label><input type=\"radio\" $disabled {$vars['js']} name=\"{$vars['internalname']}\" $id value=\"".htmlentities($option, ENT_QUOTES, 'UTF-8')."\" {$selected} class=\"$class\" />{$label}</label><br />";
+    }
+
 ?> 
\ No newline at end of file
diff --git a/views/default/input/tags.php b/views/default/input/tags.php
index dc38c979d..8793756e2 100644
--- a/views/default/input/tags.php
+++ b/views/default/input/tags.php
@@ -1,45 +1,45 @@
-<?php 

-

-	/**

-	 * Elgg tag input

-	 * Displays a tag input field

-	 * 

-	 * @package Elgg

-	 * @subpackage Core

+<?php 
 
-	 * @author Curverider Ltd

+	/**
+	 * Elgg tag input
+	 * Displays a tag input field
+	 * 
+	 * @package Elgg
+	 * @subpackage Core
 
-	 * @link http://elgg.org/

-	 * 

-	 * @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['value'] An array of tags

-	 * @uses $vars['class'] Class override

-	 */

+	 * @author Curverider Ltd
+
+	 * @link http://elgg.org/
+	 * 
+	 * @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['value'] An array of tags
+	 * @uses $vars['class'] Class override
+	 */
 
 	$class = $vars['class'];
 	if (!$class) $class = "input-tags";
-

-    $tags = "";

-    if (!empty($vars['value'])) {

-    	if (is_array($vars['value'])) {

-	        foreach($vars['value'] as $tag) {

-	            

-	            if (!empty($tags)) {

-	                $tags .= ", ";

-	            }

-	            if (is_string($tag)) {

-	            	$tags .= $tag;

-	            } else {

-	            	$tags .= $tag->value;

-	            }

-	            

-	        }

-    	} else {

-    		$tags = $vars['value'];

-    	}

-    }

-    

-?>

+
+    $tags = "";
+    if (!empty($vars['value'])) {
+    	if (is_array($vars['value'])) {
+	        foreach($vars['value'] as $tag) {
+	            
+	            if (!empty($tags)) {
+	                $tags .= ", ";
+	            }
+	            if (is_string($tag)) {
+	            	$tags .= $tag;
+	            } else {
+	            	$tags .= $tag->value;
+	            }
+	            
+	        }
+    	} else {
+    		$tags = $vars['value'];
+    	}
+    }
+    
+?>
 <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($tags, ENT_QUOTES, 'UTF-8'); ?>" class="<?php echo $class; ?>"/> 
\ No newline at end of file
diff --git a/views/default/input/text.php b/views/default/input/text.php
index 86950ff9d..2a30ba081 100644
--- a/views/default/input/text.php
+++ b/views/default/input/text.php
@@ -1,27 +1,27 @@
-<?php

-

-	/**

-	 * Elgg text input

-	 * Displays a text input field

-	 * 

-	 * @package Elgg

-	 * @subpackage Core

+<?php
 
-	 * @author Curverider Ltd

+	/**
+	 * Elgg text input
+	 * Displays a text input field
+	 * 
+	 * @package Elgg
+	 * @subpackage Core
 
-	 * @link http://elgg.org/

-	 * 

-	 * @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

+	 * @author Curverider Ltd
+
+	 * @link http://elgg.org/
+	 * 
+	 * @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['disabled'] If true then control is read-only
-	 * @uses $vars['class'] Class override

-	 */

+	 * @uses $vars['class'] Class override
+	 */
 
 	
 	$class = $vars['class'];
 	if (!$class) $class = "input-text";
-	

-?>

-

+	
+?>
+
 <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
diff --git a/views/default/input/url.php b/views/default/input/url.php
index ba77f486f..82fde938e 100644
--- a/views/default/input/url.php
+++ b/views/default/input/url.php
@@ -1,24 +1,24 @@
-<?php

-

-	/**

-	 * Elgg URL input

-	 * Displays a URL input field

-	 * 

-	 * @package Elgg

-	 * @subpackage Core

+<?php
 
-	 * @author Curverider Ltd

+	/**
+	 * Elgg URL input
+	 * Displays a URL input field
+	 * 
+	 * @package Elgg
+	 * @subpackage Core
 
-	 * @link http://elgg.org/

-	 * 

-	 * @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

-	 */

+	 * @author Curverider Ltd
+
+	 * @link http://elgg.org/
+	 * 
+	 * @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";

-?>

-

+	if (!$class) $class = "input-url";
+?>
+
 <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