7 files changed, 46 insertions, 177 deletions
diff --git a/views/failsafe/messages/errors/error.php b/views/failsafe/messages/errors/error.php
deleted file mode 100644
index 8e7dbb84a..000000000
--- a/views/failsafe/messages/errors/error.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-	/**
-	 * Elgg error message
-	 * Displays a single error message
-	 * 
-	 * @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
-	 * @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 ff43f1d00..000000000
--- a/views/failsafe/messages/errors/list.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-	/**
-	 * Elgg list errors
-	 * Lists error messages
-	 * 
-	 * @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
-	 * @link http://elgg.org/
-	 * 
-	 * @uses $vars['object'] An array of error messages
-	 */
-
-		if (!empty($vars['object']) && is_array($vars['object'])) {
-
-?>
-
-	<div class="messages">
-		<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 c8c630f3b..1873ca0d9 100644
--- a/views/failsafe/messages/exceptions/exception.php
+++ b/views/failsafe/messages/exceptions/exception.php
@@ -1,39 +1,20 @@
 <?php
+/**
+ * Elgg exception (failsafe mode)
+ * Displays a single exception
+ *
+ * @package Elgg
+ * @subpackage Core
+ *
+ * @uses $vars['object'] An exception
+ */
 
-	/**
-	 * Elgg exception (fallback mode)
-	 * Displays a single exception
-	 * 
-	 * @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
-	 * @link http://elgg.org/
-	 * 
-	 * @uses $vars['object'] An exception
-	 */
-
-	global $CONFIG;
 ?>
 
-	<p class="messages-exception">
-		<span title="<?php echo get_class($vars['object']); ?>">
-		<?php
-
-			echo nl2br($vars['object']->getMessage());
-		
-		?>
-		</span>
-	</p>
-	
-	<?php if ($CONFIG->debug) { ?>
-	<hr />
-	<p class="messages-exception-detail">
-		<?php
-
-			echo nl2br(htmlentities(print_r($vars['object'], true)));
-		
-		?>
-	</p>
-	<?php } ?>
-\ No newline at end of file
+<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>
diff --git a/views/failsafe/messages/list.php b/views/failsafe/messages/list.php
deleted file mode 100644
index 10fda8f90..000000000
--- a/views/failsafe/messages/list.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-	/**
-	 * Elgg global system message list
-	 * Lists all system messages
-	 * 
-	 * @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
-	 * @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/sanitisation/htaccess.php b/views/failsafe/messages/sanitisation/htaccess.php
deleted file mode 100644
index 99bfe4159..000000000
--- a/views/failsafe/messages/sanitisation/htaccess.php
+++ /dev/null
@@ -1,17 +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
-	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Curverider Ltd
-	 * @copyright Curverider Ltd 2008
-	 * @link http://elgg.org/
-	 */
-
-	echo nl2br(elgg_echo('installation:error:htaccess'));
-?>
-<textarea cols="120" rows="30"><?php echo $vars['.htaccess']; ?></textarea>
-\ No newline at end of file
diff --git a/views/failsafe/messages/sanitisation/settings.php b/views/failsafe/messages/sanitisation/settings.php
deleted file mode 100644
index 798bfbd91..000000000
--- a/views/failsafe/messages/sanitisation/settings.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-	/**
-	 * Elgg settings not found message
-	 * Is saved to the errors register when settings.php cannot be found
-	 * 
-	 * @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
-	 * @link http://elgg.org/
-	 */
-
-	if ($vars['settings.php'])
-	{
-		echo elgg_echo('installation:settings:dbwizard:savefail');
-?>
-<div>
-	<textarea rows="50" cols="120"><?php echo $vars['settings.php']; ?></textarea>
-</div>
-<?php
-	}
-	else
-	{
-		
-		echo nl2br(elgg_echo('installation:error:settings'));
-?>
-<div>
-	<h2><?php echo elgg_echo('installation:settings:dbwizard:prompt'); ?></h2>
-	<form method="POST">
-		<table>
-			<tr><td width="200" valign="top"><?php echo elgg_echo('installation:settings:dbwizard:label:user'); ?></td><td valign="top"> <input type="text" name="db_install_vars[CONFIG_DBUSER]" /></td></tr>
-			<tr><td width="200" valign="top"><?php echo elgg_echo('installation:settings:dbwizard:label:pass'); ?></td><td valign="top"> <input type="password" name="db_install_vars[CONFIG_DBPASS]" /></td></tr>
-			<tr><td width="200" valign="top"><?php echo elgg_echo('installation:settings:dbwizard:label:dbname'); ?></td><td valign="top"> <input type="text" name="db_install_vars[CONFIG_DBNAME]" /></td></tr>
-			<tr><td width="200" 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="localhost" /></td></tr>
-			<tr><td width="200" 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="elgg" /></td></tr>
-		</table>
-		
-		<input type="submit" name="<?php echo elgg_echo('save'); ?>" value="<?php echo elgg_echo('save'); ?>" />
-	</form>
-</div>
-<?php } ?>
-\ No newline at end of file