10 files changed, 36 insertions, 237 deletions
diff --git a/views/failsafe/messages/errors/error.php b/views/failsafe/messages/errors/error.php
deleted file mode 100644
index 2ec365890..000000000
--- a/views/failsafe/messages/errors/error.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/**
- * Elgg error message
- * Displays a single error message
- *
- * @package Elgg
- * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
- *
- * @uses $vars['object'] An error message (string)
- */
-?>
-
-<p>
-	<?php echo $vars['object']; ?>
-</p>
-\ No newline at end of file
diff --git a/views/failsafe/messages/errors/list.php b/views/failsafe/messages/errors/list.php
deleted file mode 100644
index c270d6c0a..000000000
--- a/views/failsafe/messages/errors/list.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-/**
- * Elgg list errors
- * Lists error messages
- *
- * @package Elgg
- * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
- *
- * @uses $vars['object'] An array of error messages
- */
-
-if (!empty($vars['object']) && is_array($vars['object'])) {
-
-?>
-<style type="text/css">
-.messages_error {
-	border:1px solid #D3322A;
-	background:#F7DAD8;
-	color:#000000;
-	padding:3px 10px 3px 10px;
-	margin:20px 0px 0px 0px;
-	z-index: 9999;
-	position:relative;
-	width:95%;
-}
-</style>
-	<div class="database_settings">
-		<div class="messages_errors">
-
-<?php
-			foreach($vars['object'] as $error) {
-				echo elgg_view('messages/errors/error',array('object' => $error));
-				//echo "<hr />";
-			}
-?>
-		</div>
-	</div>
-<?php
-}
-\ No newline at end of file
diff --git a/views/failsafe/messages/exceptions/admin_exception.php b/views/failsafe/messages/exceptions/admin_exception.php
new file mode 100644
index 000000000..57665d9c0
--- /dev/null
+++ b/views/failsafe/messages/exceptions/admin_exception.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Elgg exception (failsafe mode)
+ * Displays a single exception
+ *
+ * @package Elgg
+ * @subpackage Core
+ *
+ * @uses $vars['object'] An exception
+ */
+
+?>
+
+<p class="elgg-messages-exception">
+	<span title="<?php echo get_class($vars['object']); ?>">
+	<?php
+
+		echo nl2br($vars['object']->getMessage());
+
+	?>
+	</span>
+</p>
+
+<p class="elgg-messages-exception">
+	<?php
+
+		echo nl2br(htmlentities(print_r($vars['object'], true), ENT_QUOTES, 'UTF-8'));
+
+	?>
+</p>
+\ No newline at end of file
diff --git a/views/failsafe/messages/exceptions/exception.php b/views/failsafe/messages/exceptions/exception.php
index d3877f0c8..1873ca0d9 100644
--- a/views/failsafe/messages/exceptions/exception.php
+++ b/views/failsafe/messages/exceptions/exception.php
@@ -1,36 +1,20 @@
 <?php
 /**
- * Elgg exception (fallback mode)
+ * Elgg exception (failsafe mode)
  * Displays a single exception
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  *
  * @uses $vars['object'] An exception
  */
 
-global $CONFIG;
 ?>
 
-<p class="messages-exception" style="background:#FDFFC3;display:block;padding:10px;">
-	<span title="<?php echo get_class($vars['object']); ?>">
-	<?php
-
-		echo nl2br($vars['object']->getMessage());
-
-	?>
+<p class="elgg-messages-exception">
+	<span title="Unrecoverable Error">
+		<?php echo elgg_echo('exception:contact_admin'); ?>
+		<br /><br />
+		Exception #<?php echo $vars['ts']; ?>.
 	</span>
 </p>
-
-<?php if (isset($CONFIG->debug)) { ?>
-
-<p class="messages-exception-detail" style="background:#FDFFC3;display:block;padding:10px;">
-	<?php
-
-		echo nl2br(htmlentities(print_r($vars['object'], true), ENT_QUOTES, 'UTF-8'));
-
-	?>
-</p>
-<?php } ?>
-\ No newline at end of file
diff --git a/views/failsafe/messages/list.php b/views/failsafe/messages/list.php
deleted file mode 100644
index 2410103da..000000000
--- a/views/failsafe/messages/list.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-/**
- * Elgg global system message list
- * Lists all system messages
- *
- * @package Elgg
- * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
- *
- * @uses $vars['object'] The array of message registers
- */
-
-if (!empty($vars['object']) && is_array($vars['object']) && sizeof($vars['object']) > 0) {
-	foreach($vars['object'] as $register => $list ) {
-		echo elgg_view("messages/{$register}/list", array('object' => $list));
-	}
-}
-\ No newline at end of file
diff --git a/views/failsafe/messages/messages/list.php b/views/failsafe/messages/messages/list.php
deleted file mode 100644
index ed169c692..000000000
--- a/views/failsafe/messages/messages/list.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-/**
- * Elgg list system messages
- * Lists system messages
- *
- * @package Elgg
- * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
- *
- * @uses $vars['object'] An array of system messages
- */
-
-if (!empty($vars['object']) && is_array($vars['object'])) {
-
-?>
-
-<style type="text/css">
-.messages {
-	border:1px solid #00cc00;
-	background:#ccffcc;
-	color:#000000;
-	padding:3px 10px 3px 10px;
-	margin:20px 0px 0px 0px;
-	z-index: 9999;
-	position:relative;
-	width:95%;
-}
-</style>
-
-	<div class="messages">
-
-<?php
-	foreach($vars['object'] as $message) {
-		echo elgg_view('messages/messages/message',array('object' => $message));
-	}
-?>
-
-	</div>
-
-<?php
-
-}
-\ No newline at end of file
diff --git a/views/failsafe/messages/messages/message.php b/views/failsafe/messages/messages/message.php
deleted file mode 100644
index 6bc24d730..000000000
--- a/views/failsafe/messages/messages/message.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/**
- * Elgg standard message
- * Displays a single Elgg system message
- *
- * @package Elgg
- * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
- *
- * @uses $vars['object'] A system message (string)
- */
-?>
-
-<p>
-	<?php echo nl2br($vars['object']); ?>
-</p>
-\ No newline at end of file
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
-}