12 files changed, 0 insertions, 410 deletions
diff --git a/views/failsafe/input/access.php b/views/failsafe/input/access.php
deleted file mode 100644
index a57014840..000000000
--- a/views/failsafe/input/access.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?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 ((!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
diff --git a/views/failsafe/input/button.php b/views/failsafe/input/button.php
deleted file mode 100644
index 2c36841df..000000000
--- a/views/failsafe/input/button.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-/**
- * Create a input button
- * Use this view for forms rather than creating a submit/reset button tag in the wild as it provides
- * extra security which help prevent CSRF attacks.
- *
- * @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['type'] Submit or reset, defaults to submit.
- * @uses $vars['src'] Src of an image
- *
- */
-
-global $CONFIG;
-
-$class = $vars['class'];
-if (!$class) {
-	$class = "submit_button";
-}
-
-if (isset($vars['type'])) {
-	$type = strtolower($vars['type']);
-} else {
-	$type = 'submit';
-}
-
-switch ($type) {
-	case 'button' :
-		$type='button';
-		break;
-	case 'reset' :
-		$type='reset';
-		break;
-	case 'submit':
-	default:
-		$type = 'submit';
-}
-
-$value = htmlentities($vars['value'], ENT_QUOTES, 'UTF-8');
-$name = $vars['internalname'];
-$src = $vars['src'];
-// blank src if trying to access an offsite image.
-if (strpos($src,$CONFIG->wwwroot)===false) {
-	$src = "";
-}
-?>
-<input type="<?php echo $type; ?>" class="<?php echo $type; ?>_button" <?php echo $vars['js']; ?> value="<?php echo $value; ?>" src="<?php echo $src; ?>" class="<?php echo $class; ?>" />
-\ No newline at end of file
diff --git a/views/failsafe/input/checkboxes.php b/views/failsafe/input/checkboxes.php
deleted file mode 100644
index 0792f09ce..000000000
--- a/views/failsafe/input/checkboxes.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-/**
- * Elgg checkbox input
- * Displays a checkbox 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 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'])) {
-		if (!in_array($option,$vars['value'])) {
-			$selected = "";
-		} else {
-			$selected = "checked = \"checked\"";
-		}
-	} else {
-		if ($option != $vars['value']) {
-			$selected = "";
-		} else {
-			$selected = "checked = \"checked\"";
-		}
-	}
-	
-	// handle indexed array where label is not specified
-	// @todo deprecate in Elgg 1.8
-	if (is_integer($label)) {
-		$label = $option;
-	}
-
-	$disabled = "";
-	if ($vars['disabled']) {
-		$disabled = ' disabled="yes" ';
-	}
-	echo "<label><input type=\"checkbox\" $disabled {$vars['js']} name=\"{$vars['internalname']}[]\" {$selected} value=\"".htmlentities($option, ENT_QUOTES, 'UTF-8')."\" {$selected} class=\"$class\" />{$label}</label><br />";
-}
-\ No newline at end of file
diff --git a/views/failsafe/input/form.php b/views/failsafe/input/form.php
deleted file mode 100644
index 35e718adb..000000000
--- a/views/failsafe/input/form.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-/**
- * Create a form for data submission.
- * Use this view for forms rather than creating a form tag in the wild as it provides
- * extra security which help prevent CSRF attacks.
- *
- * @package Elgg
- * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
- *
- * @uses $vars['body'] The body of the form (made up of other input/xxx views and html
- * @uses $vars['method'] Method (default POST)
- * @uses $vars['enctype'] How the form is encoded, default blank
- * @uses $vars['action'] URL of the action being called
- *
- */
-
-if (isset($vars['internalid'])) {
-	$id = $vars['internalid'];
-} else {
-	$id = '';
-}
-if (isset($vars['internalname'])) {
-	$name = $vars['internalname'];
-} else {
-	$name = '';
-}
-$body = $vars['body'];
-$action = $vars['action'];
-if (isset($vars['enctype'])) {
-	$enctype = $vars['enctype'];
-} else {
-	$enctype = '';
-}
-if (isset($vars['method'])) {
-	$method = $vars['method'];
-} else {
-	$method = 'POST';
-}
-
-$method = strtolower($method);
-
-// Generate a security header
-$security_header = "";
-if (!isset($vars['disable_security']) || $vars['disable_security'] != true) {
-	$security_header = elgg_view('input/securitytoken');
-}
-?>
-<form <?php if ($id) { ?>id="<?php echo $id; ?>" <?php } ?> <?php if ($name) { ?>name="<?php echo $name; ?>" <?php } ?> action="<?php echo $action; ?>" method="<?php echo $method; ?>" <?php if ($enctype!="") echo "enctype=\"$enctype\""; ?>>
-<?php echo $security_header; ?>
-<?php echo $body; ?>
-</form>
-\ No newline at end of file
diff --git a/views/failsafe/input/hidden.php b/views/failsafe/input/hidden.php
deleted file mode 100644
index dd5c8bb98..000000000
--- a/views/failsafe/input/hidden.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-/**
- * Create a hidden data field
- * Use this view for forms rather than creating a hidden tag in the wild as it provides
- * extra security which help prevent CSRF attacks.
- *
- * @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
- *
- */
-?>
-<input type="hidden" <?php echo $vars['js']; ?> name="<?php echo $vars['internalname']; ?>" value="<?php echo htmlentities($vars['value'], ENT_QUOTES, 'UTF-8'); ?>" />
-\ No newline at end of file
diff --git a/views/failsafe/input/longtext.php b/views/failsafe/input/longtext.php
deleted file mode 100644
index 9da3d8276..000000000
--- a/views/failsafe/input/longtext.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/**
- * Elgg long text input
- * Displays a long text 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
- *
- */
-
-$class = $vars['class'];
-if (!$class) {
-	$class = "input_textarea";
-}
-
-?>
-
-<textarea class="<?php echo $class; ?>" name="<?php echo $vars['internalname']; ?>" <?php if ($vars['disabled']) echo ' disabled="yes" '; ?> <?php echo $vars['js']; ?>><?php echo $vars['value']; ?></textarea>
-\ No newline at end of file
diff --git a/views/failsafe/input/password.php b/views/failsafe/input/password.php
deleted file mode 100644
index 461f77955..000000000
--- a/views/failsafe/input/password.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * Elgg password input
- * Displays a password 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
- *
- */
-
-$class = $vars['class'];
-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; ?>" />
diff --git a/views/failsafe/input/pulldown.php b/views/failsafe/input/pulldown.php
deleted file mode 100644
index 6ad12eec4..000000000
--- a/views/failsafe/input/pulldown.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?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.
- */
-
-
-$class = $vars['class'];
-if (!$class) {
-	$class = "input-pulldown";
-}
-?>
-<select name="<?php echo $vars['internalname']; ?>" <?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) {
-		if ($value != $vars['value']) {
-			echo "<option value=\"$value\">{$option}</option>";
-		} else {
-			echo "<option value=\"$value\" selected=\"selected\">{$option}</option>";
-		}
-	}
-} else {
-	foreach($vars['options'] as $option) {
-		if ($option != $vars['value']) {
-			echo "<option>{$option}</option>";
-		} else {
-			echo "<option selected=\"selected\">{$option}</option>";
-		}
-	}
-}
-?>
-</select>
-\ No newline at end of file
diff --git a/views/failsafe/input/reset.php b/views/failsafe/input/reset.php
deleted file mode 100644
index bb8d278c3..000000000
--- a/views/failsafe/input/reset.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/**
- * Create a reset input button
- * Use this view for forms rather than creating a submit/reset button tag in the wild as it provides
- * extra security which help prevent CSRF attacks.
- *
- * @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['type'] Submit or reset, defaults to submit.
- *
- */
-
-$vars['type'] = 'reset';
-$class = $vars['class'];
-if (!$class) {
-	$class = "submit_button";
-}
-$vars['class'] = $class;
-
-echo elgg_view('input/button', $vars);
-\ No newline at end of file
diff --git a/views/failsafe/input/securitytoken.php b/views/failsafe/input/securitytoken.php
deleted file mode 100644
index a2a4a0e01..000000000
--- a/views/failsafe/input/securitytoken.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/**
- * CSRF security token view for use with secure forms.
- *
- * It is still recommended that you use input/form.
- *
- * @package Elgg
- * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
- */
-
-$ts = time();
-$token = generate_action_token($ts);
-
-echo elgg_view('input/hidden', array('internalname' => '__elgg_token', 'value' => $token));
-echo elgg_view('input/hidden', array('internalname' => '__elgg_ts', 'value' => $ts));
diff --git a/views/failsafe/input/submit.php b/views/failsafe/input/submit.php
deleted file mode 100644
index cfa7989d0..000000000
--- a/views/failsafe/input/submit.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/**
- * Create a submit input button
- * Use this view for forms rather than creating a submit/reset button tag in the wild as it provides
- * extra security which help prevent CSRF attacks.
- *
- * @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['type'] Submit or reset, defaults to submit.
- *
- */
-
-$vars['type'] = 'submit';
-$class = $vars['class'];
-if (!$class) {
-	$class = "submit_button";
-}
-$vars['class'] = $class;
-
-echo elgg_view('input/button', $vars);
-\ No newline at end of file
diff --git a/views/failsafe/input/text.php b/views/failsafe/input/text.php
deleted file mode 100644
index 7f69a2f93..000000000
--- a/views/failsafe/input/text.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/**
- * Elgg text input
- * Displays a text 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['disabled'] If true then control is read-only
- * @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']; ?>" value="<?php echo htmlentities($vars['value'], ENT_QUOTES, 'UTF-8'); ?>" class="<?php echo $class ?>"/>
-\ No newline at end of file