From e60775fb5a44955669e18780de3bad7bc0f0ce30 Mon Sep 17 00:00:00 2001
From: cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Wed, 6 Oct 2010 10:57:16 +0000
Subject: removed old views used in previous installer

git-svn-id: http://code.elgg.org/elgg/trunk@7020 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 .../messages/sanitisation/dbsettings_error.php     | 15 ------
 views/failsafe/messages/sanitisation/htaccess.php  | 14 -----
 views/failsafe/messages/sanitisation/settings.php  | 50 ------------------
 views/failsafe/settings/install.php                | 14 -----
 views/failsafe/settings/system.php                 | 61 ----------------------
 5 files changed, 154 deletions(-)
 delete mode 100644 views/failsafe/messages/sanitisation/dbsettings_error.php
 delete mode 100644 views/failsafe/messages/sanitisation/htaccess.php
 delete mode 100644 views/failsafe/messages/sanitisation/settings.php
 delete mode 100644 views/failsafe/settings/install.php
 delete mode 100644 views/failsafe/settings/system.php

diff --git a/views/failsafe/messages/sanitisation/dbsettings_error.php b/views/failsafe/messages/sanitisation/dbsettings_error.php
deleted file mode 100644
index 630c9d015..000000000
--- a/views/failsafe/messages/sanitisation/dbsettings_error.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-/**
- * Elgg bad database settings
- *
- * @package Elgg
- * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
- */
-?>
-
-<h2><?php echo elgg_echo('installation:error:db:title'); ?></h2>
-<p>
-<b><?php echo elgg_echo('installation:error:db:text'); ?></b>
-</p>
\ No newline at end of file
diff --git a/views/failsafe/messages/sanitisation/htaccess.php b/views/failsafe/messages/sanitisation/htaccess.php
deleted file mode 100644
index 7d065ec81..000000000
--- a/views/failsafe/messages/sanitisation/htaccess.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-/**
- * Elgg .htaccess not found message
- * Is saved to the errors register when the main .htaccess cannot be found
- *
- * @package Elgg
- * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
- */
-
-echo autop(elgg_echo('installation:error:htaccess'));
-?>
-<textarea><?php echo $vars['.htaccess']; ?></textarea>
diff --git a/views/failsafe/messages/sanitisation/settings.php b/views/failsafe/messages/sanitisation/settings.php
deleted file mode 100644
index b4e43a053..000000000
--- a/views/failsafe/messages/sanitisation/settings.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-/**
- * Elgg settings not found message
- * Is saved to the errors register when settings.php cannot be found
- *
- * @package Elgg
- * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
- */
-
-$dbuser = '';
-$dbpassword = '';
-$dbname = '';
-$dbhost = 'localhost';
-$dbprefix = 'elgg_';
-if (isset($vars['sticky'])) {
-	$dbuser = $vars['sticky']['CONFIG_DBUSER'];
-	$dbname = $vars['sticky']['CONFIG_DBNAME'];
-	$dbhost = $vars['sticky']['CONFIG_DBHOST'];
-	$dbprefix = $vars['sticky']['CONFIG_DBPREFIX'];
-}
-
-
-if ($vars['settings.php']) {
-	echo elgg_echo('installation:settings:dbwizard:savefail');
-?>
-<div>
-	<textarea><?php echo $vars['settings.php']; ?></textarea>
-</div>
-<?php
-} else {
-	echo autop(elgg_echo('installation:error:settings'));
-?>
-<div>
-	<h2><?php echo elgg_echo('installation:settings:dbwizard:prompt'); ?></h2>
-	<form method="post">
-		<table cellpadding="0" cellspacing="10" style="background:#f1f1f1;">
-			<tr><td valign="top"><?php echo elgg_echo('installation:settings:dbwizard:label:user'); ?></td><td valign="top"> <input type="text" name="db_install_vars[CONFIG_DBUSER]" value="<?php echo $dbuser; ?>" /></td></tr>
-			<tr><td valign="top"><?php echo elgg_echo('installation:settings:dbwizard:label:pass'); ?></td><td valign="top"> <input type="password" name="db_install_vars[CONFIG_DBPASS]" value="<?php echo $dbpassword; ?>" /></td></tr>
-			<tr><td valign="top"><?php echo elgg_echo('installation:settings:dbwizard:label:dbname'); ?></td><td valign="top"> <input type="text" name="db_install_vars[CONFIG_DBNAME]" value="<?php echo $dbname; ?>" /></td></tr>
-			<tr><td valign="top"><?php echo elgg_echo('installation:settings:dbwizard:label:host'); ?></td><td valign="top"> <input type="text" name="db_install_vars[CONFIG_DBHOST]" value="<?php echo $dbhost; ?>" /></td></tr>
-			<tr><td valign="top"><?php echo elgg_echo('installation:settings:dbwizard:label:prefix'); ?></td><td valign="top"> <input type="text" name="db_install_vars[CONFIG_DBPREFIX]" value="<?php echo $dbprefix; ?>" /></td></tr>
-		</table>
-
-		<input type="submit" name="<?php echo elgg_echo('save'); ?>" value="<?php echo elgg_echo('save'); ?>" />
-	</form>
-</div>
-<?php
-}
diff --git a/views/failsafe/settings/install.php b/views/failsafe/settings/install.php
deleted file mode 100644
index 6fccfb06f..000000000
--- a/views/failsafe/settings/install.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-/**
- * Elgg system settings on initial installation
- *
- * @package Elgg
- * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
- *
- */
-
-echo "<p>" . autop(elgg_echo("installation:settings:description")) . "</p>";
-
-echo elgg_view("settings/system",array("action" => "action/systemsettings/install"));
\ No newline at end of file
diff --git a/views/failsafe/settings/system.php b/views/failsafe/settings/system.php
deleted file mode 100644
index 9c4a40aa5..000000000
--- a/views/failsafe/settings/system.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-/**
- * Elgg system settings form
- * The form to change system settings
- *
- * @package Elgg
- * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
- *
- * @uses $vars['action'] If set, the place to forward the form to (usually action/systemsettings/save)
- */
-
-// Set action appropriately
-if (!isset($vars['action'])) {
-	$action = $vars['url'] . "action/systemsettings/save";
-} else {
-	$action = $vars['action'];
-}
-
-$form_body = "";
-foreach(array('sitename','sitedescription', 'siteemail', 'wwwroot','path','dataroot', 'view') as $field) {
-	$form_body .= "<p>";
-	$form_body .= elgg_echo('installation:' . $field) . "<br />";
-	$warning = elgg_echo('installation:warning:' . $field);
-	if ($warning != 'installation:warning:' . $field) {
-		echo "<b>" . $warning . "</b><br />";
-	}
-	$value = $vars['config']->$field;
-	if ($field == 'view') {
-		$value = 'default';
-	}
-	$form_body .= elgg_view("input/text",array('internalname' => $field, 'value' => $value));
-	$form_body .= "</p>";
-}
-
-$languages = get_installed_translations();
-$form_body .= "<p>" . elgg_echo('installation:language') . elgg_view("input/pulldown", array('internalname' => 'language', 'value' => $vars['config']->language, 'options_values' => $languages)) . "</p>";
-
-$form_body .= "<p>" . elgg_echo('installation:sitepermissions') . elgg_view('input/access', array('internalname' => 'default_access','value' => ACCESS_LOGGED_IN)) . "</p>";
-
-$debug_options = array('0' => elgg_echo('installation:debug:none'), 'ERROR' => elgg_echo('installation:debug:error'), 'WARNING' => elgg_echo('installation:debug:warning'), 'NOTICE' => elgg_echo('installation:debug:notice'));
-$form_body .= "<p class=\"admin_debug\">" . elgg_echo('installation:debug');
-$form_body .= elgg_view('input/pulldown', array('options_values' => $debug_options, 'internalname' => 'debug', 'value' => $vars['config']->debug));
-$form_body .= '</p>';
-
-$form_body .= "<p class=\"admin_debug\">" . elgg_echo('installation:httpslogin') . "<br />" .elgg_view("input/checkboxes", array('options' => array(elgg_echo('installation:httpslogin:label')), 'internalname' => 'https_login', 'value' => ($vars['config']->https_login ? elgg_echo('installation:httpslogin:label') : "") )) . "</p>";
-
-$form_body .= "<p class=\"admin_debug\">" . elgg_echo('installation:disableapi') . "<br />";
-$on = elgg_echo('installation:disableapi:label');
-if ((isset($CONFIG->disable_api)) && ($CONFIG->disable_api == true)) {
-	$on = ($vars['config']->disable_api ?  "" : elgg_echo('installation:disableapi:label'));
-}
-$form_body .= elgg_view("input/checkboxes", array('options' => array(elgg_echo('installation:disableapi:label')), 'internalname' => 'api', 'value' => $on ));
-$form_body .= "</p>";
-
-$form_body .= elgg_view('input/hidden', array('internalname' => 'settings', 'value' => 'go'));
-
-$form_body .= elgg_view('input/submit', array('value' => elgg_echo("save")));
-
-echo elgg_view('input/form', array('action' => $action, 'body' => $form_body));
\ No newline at end of file
-- 
cgit v1.2.3