10 files changed, 38 insertions, 39 deletions

diff --git a/views/default/input/button.php b/views/default/input/button.php
index c21989919..9957fdc54 100644
--- a/views/default/input/button.php
+++ b/views/default/input/button.php
@@ -33,7 +33,7 @@ switch ($vars['type']) {
 }
 
 // blank src if trying to access an offsite image. @todo why?
-if (strpos($vars['src'], elgg_get_site_url()) === false) {
+if (isset($vars['src']) && strpos($vars['src'], elgg_get_site_url()) === false) {
 	$vars['src'] = "";
 }
 ?>
diff --git a/views/default/input/date.php b/views/default/input/date.php
index 35a951a0b..828ce5520 100644
--- a/views/default/input/date.php
+++ b/views/default/input/date.php
@@ -44,11 +44,12 @@ if ($timestamp) {
 	$vars['class'] = "{$vars['class']} elgg-input-timestamp";
 	$vars['id'] = $vars['name'];
 	unset($vars['name']);
+	unset($vars['internalname']);
 }
 
 // convert timestamps to text for display
 if (is_numeric($vars['value'])) {
-	$vars['value'] = gmdate('Y/m/d', $vars['value']);
+	$vars['value'] = gmdate('Y-m-d', $vars['value']);
 }
 
 $attributes = elgg_format_attributes($vars);
diff --git a/views/default/input/friendspicker.php b/views/default/input/friendspicker.php
index ecf468da3..40708c890 100644
--- a/views/default/input/friendspicker.php
+++ b/views/default/input/friendspicker.php
@@ -9,6 +9,10 @@
  * @subpackage Core
  *
  * @uses $vars['entities'] The array of ElggUser objects
+ * @uses $vars['name']
+ * @uses $vars['value']
+ * @uses $vars['highlight']
+ * @uses $vars['callback']
  */
 
 elgg_load_js('elgg.friendspicker');
@@ -74,13 +78,9 @@ if (isset($vars['formtarget'])) {
 // Sort users by letter
 if (is_array($vars['entities']) && sizeof($vars['entities'])) {
 	foreach($vars['entities'] as $user) {
-		if (is_callable('mb_substr')) {
-			$letter = strtoupper(mb_substr($user->name,0,1));
-		} else {
-			$letter = strtoupper(substr($user->name,0,1));
-		}
+		$letter = elgg_strtoupper(elgg_substr($user->name, 0, 1));
 
-		if (!substr_count($chararray,$letter)) {
+		if (!elgg_substr_count($chararray, $letter)) {
 			$letter = "*";
 		}
 		if (!isset($users[$letter])) {
@@ -162,11 +162,7 @@ if (!isset($vars['replacement'])) {
 
 // Initialise letters
 	$chararray .= "*";
-	if (is_callable('mb_substr')) {
-		$letter = mb_substr($chararray,0,1);
-	} else {
-		$letter = substr($chararray,0,1);
-	}
+	$letter = elgg_substr($chararray, 0, 1);
 	$letpos = 0;
 	while (1 == 1) {
 		?>
@@ -187,12 +183,10 @@ if (!isset($vars['replacement'])) {
 				}
 
 				//echo "<p>" . $user->name . "</p>";
-				$label = elgg_view_entity_icon($friend, 'tiny', array('hover' => false));
+				$label = elgg_view_entity_icon($friend, 'tiny', array('use_hover' => false));
 				$options[$label] = $friend->getGUID();
 
-				if ($vars['highlight'] == 'all'
-					&& !in_array($letter,$activeletters)) {
-
+				if ($vars['highlight'] == 'all' && !in_array($letter,$activeletters)) {
 					$activeletters[] = $letter;
 				}
 
@@ -243,23 +237,14 @@ if (!isset($vars['replacement'])) {
 			</div>
 		</div>
 <?php
-			//if ($letter == 'Z') break;
 
-			if (is_callable('mb_substr')) {
-				$substr = mb_substr($chararray,strlen($chararray) - 1,1);
-			} else {
-				$substr = substr($chararray,strlen($chararray) - 1,1);
-			}
+			$substr = elgg_substr($chararray, elgg_strlen($chararray) - 1, 1);
 			if ($letter == $substr) {
 				break;
 			}
 			//$letter++;
 			$letpos++;
-			if (is_callable('mb_substr')) {
-				$letter = mb_substr($chararray,$letpos,1);
-			} else {
-				$letter = substr($chararray,$letpos,1);
-			}
+			$letter = elgg_substr($chararray, $letpos, 1);
 		}
 
 ?>
@@ -319,7 +304,7 @@ $(document).ready(function () {
 if (sizeof($activeletters) > 0)
 	//$chararray = elgg_echo('friendspicker:chararray');
 	foreach($activeletters as $letter) {
-		$tab = strpos($chararray, $letter) + 1;
+		$tab = elgg_strpos($chararray, $letter) + 1;
 ?>
 $("div#friends-picker-navigation<?php echo $friendspicker; ?> li.tab<?php echo $tab; ?> a").addClass("tabHasContent");
 <?php
diff --git a/views/default/input/longtext.php b/views/default/input/longtext.php
index 2b1462635..61dc7ca19 100644
--- a/views/default/input/longtext.php
+++ b/views/default/input/longtext.php
@@ -19,6 +19,8 @@ if (isset($vars['class'])) {
 
 $defaults = array(
 	'value' => '',
+	'rows' => '10',
+	'cols' => '50',
 	'id' => 'elgg-input-' . rand(), //@todo make this more robust
 );
 
diff --git a/views/default/input/plaintext.php b/views/default/input/plaintext.php
index cd0aaafcf..e92c61ced 100644
--- a/views/default/input/plaintext.php
+++ b/views/default/input/plaintext.php
@@ -20,6 +20,8 @@ if (isset($vars['class'])) {
 
 $defaults = array(
 	'value' => '',
+	'rows' => '10',
+	'cols' => '50',
 	'disabled' => false,
 );
 
diff --git a/views/default/input/pulldown.php b/views/default/input/pulldown.php
index 705329691..fc0595300 100644
--- a/views/default/input/pulldown.php
+++ b/views/default/input/pulldown.php
@@ -5,5 +5,5 @@
  * @deprecated 1.8
  */
 
-elgg_deprecated_notice("input/pulldown was deprecated by input/dropdown", 1.8);
+elgg_deprecated_notice("input/pulldown was deprecated by input/dropdown", 1.8, 2);
 echo elgg_view('input/dropdown', $vars);
diff --git a/views/default/input/reset.php b/views/default/input/reset.php
index 12866421e..082da8669 100644
--- a/views/default/input/reset.php
+++ b/views/default/input/reset.php
@@ -4,8 +4,11 @@
  *
  * @package Elgg
  * @subpackage Core
+ * 
+ * @uses $vars['class'] CSS class that replaces elgg-button-cancel
  */
 
 $vars['type'] = 'reset';
+$vars['class'] = elgg_extract('class', $vars, 'elgg-button-cancel');
 
 echo elgg_view('input/button', $vars);
\ No newline at end of file
diff --git a/views/default/input/submit.php b/views/default/input/submit.php
index 64b135afa..df369b3b4 100644
--- a/views/default/input/submit.php
+++ b/views/default/input/submit.php
@@ -4,6 +4,8 @@
  *
  * @package Elgg
  * @subpackage Core
+ *
+ * @uses $vars['class'] CSS class that replaces elgg-button-submit
  */
 
 $vars['type'] = 'submit';
diff --git a/views/default/input/text.php b/views/default/input/text.php
index 707a50179..07ce5c710 100644
--- a/views/default/input/text.php
+++ b/views/default/input/text.php
@@ -23,5 +23,4 @@ $defaults = array(
 $vars = array_merge($defaults, $vars);
 
 ?>
-
 <input type="text" <?php echo elgg_format_attributes($vars); ?> />
\ No newline at end of file
diff --git a/views/default/input/userpicker.php b/views/default/input/userpicker.php
index 87cc6e24a..8b64d7df5 100644
--- a/views/default/input/userpicker.php
+++ b/views/default/input/userpicker.php
@@ -9,17 +9,18 @@
  *
  * The name of the hidden fields is members[]
  *
- * Defaults to lazy load user lists in paginated alphabetical order. User needs
+ * @warning Only a single input/userpicker is supported per web page.
+ *
+ * Defaults to lazy load user lists in alphabetical order. User needs
  * to type two characters before seeing the user popup list.
  *
- * As users are checked they move down to a "users" box.
+ * As users are selected they move down to a "users" box.
  * When this happens, a hidden input is created with the
  * name of members[] and a value of the GUID.
- *
- * @warning: this is not stable
  */
 
 elgg_load_js('elgg.userpicker');
+elgg_load_js('jquery.ui.autocomplete.html');
 
 function user_picker_add_user($user_id) {
 	$user = get_entity($user_id);
@@ -27,8 +28,9 @@ function user_picker_add_user($user_id) {
 		return false;
 	}
 	
-	$icon = elgg_view_entity_icon($user, 'tiny', array('hover' => false));
+	$icon = elgg_view_entity_icon($user, 'tiny', array('use_hover' => false));
 
+	// this html must be synced with the userpicker.js library
 	$code = '<li><div class="elgg-image-block">';
 	$code .= "<div class='elgg-image'>$icon</div>";
 	$code .= "<div class='elgg-image-alt'><a href='#' class='elgg-userpicker-remove'>X</a></div>";
@@ -61,10 +63,13 @@ foreach ($vars['value'] as $user_id) {
 ?>
 <div class="elgg-user-picker">
 	<input type="text" class="elgg-input-user-picker" size="30"/>
-	<input type="checkbox" name="match_on" value="true" />
-	<label><?php echo elgg_echo('userpicker:only_friends'); ?></label>
+	<label>
+		<input type="checkbox" name="match_on" value="true" />
+		<?php echo elgg_echo('userpicker:only_friends'); ?>
+	</label>
 	<ul class="elgg-user-picker-list"><?php echo $user_list; ?></ul>
 </div>
 <script type="text/javascript">
+	// @todo grab the values in the init function rather than using inline JS
 	elgg.userpicker.userList = <?php echo $json_values ?>;
-</script>
\ No newline at end of file
+</script>