1 files changed, 36 insertions, 49 deletions
diff --git a/views/default/input/access.php b/views/default/input/access.php
index 9cd1e3d99..137eea288 100644
--- a/views/default/input/access.php
+++ b/views/default/input/access.php
@@ -1,51 +1,38 @@
-<?php
-
-	/**
-	 * Elgg access level input
-	 * Displays a pulldown input field
-	 * 
-	 * @package Elgg
-	 * @subpackage Core
-	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Curverider Ltd
-	 * @copyright Curverider Ltd 2008-2009
-	 * @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
-	 * 
-	 */
+<?php
+/**
+ * Elgg access level input
+ * Displays a dropdown input field
+ *
+ * @uses $vars['value']          The current value, if any
+ * @uses $vars['options_values'] Array of value => label pairs (overrides default)
+ * @uses $vars['name']           The name of the input field
+ * @uses $vars['entity']         Optional. The entity for this access control (uses access_id)
+ * @uses $vars['class']          Additional CSS class
+ */
 
-	if (isset($vars['class'])) $class = $vars['class'];
-	if (!$class) $class = "input-access";
+if (isset($vars['class'])) {
+	$vars['class'] = "elgg-input-access {$vars['class']}";
+} else {
+	$vars['class'] = "elgg-input-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 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}\">{$option}</option>";
-        } else {
-            echo "<option value=\"{$key}\" selected=\"selected\">{$option}</option>";
-        }
-    }
-
-?> 
-</select>
-
-<?php
-
-		}		
-
-?>
-\ No newline at end of file
+$defaults = array(
+	'disabled' => false,
+	'value' => get_default_access(),
+	'options_values' => get_write_access_array(),
+);
+
+if (isset($vars['entity'])) {
+	$defaults['value'] = $vars['entity']->access_id;
+	unset($vars['entity']);
+}
+
+$vars = array_merge($defaults, $vars);
+
+if ($vars['value'] == ACCESS_DEFAULT) {
+	$vars['value'] = get_default_access();
+}
+
+if (is_array($vars['options_values']) && sizeof($vars['options_values']) > 0) {
+	echo elgg_view('input/dropdown', $vars);
+}