aboutsummaryrefslogtreecommitdiff
path: root/views/failsafe
diff options
context:
space:
mode:
Diffstat (limited to 'views/failsafe')
-rw-r--r--views/failsafe/messages/errors/error.php20
-rw-r--r--views/failsafe/messages/errors/list.php37
-rw-r--r--views/failsafe/messages/exceptions/admin_exception.php30
-rw-r--r--views/failsafe/messages/exceptions/exception.php51
-rw-r--r--views/failsafe/messages/list.php25
-rw-r--r--views/failsafe/messages/sanitisation/htaccess.php17
-rw-r--r--views/failsafe/messages/sanitisation/settings.php43
-rw-r--r--views/failsafe/page/default.php60
-rw-r--r--views/failsafe/pageshells/pageshell.php133
9 files changed, 106 insertions, 310 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 1f556fa4d..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 61c4a8937..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" style="background:#FDFFC3;display:block;padding:10px;">
- <span title="<?php echo get_class($vars['object']); ?>">
- <?php
-
- echo autop($vars['object']->getMessage());
-
- ?>
- </span>
- </p>
-
- <?php if ($CONFIG->debug) { ?>
- <!-- <hr /> -->
- <p class="messages-exception-detail" style="background:#FDFFC3;display:block;padding:10px;">
- <?php
-
- echo autop(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 bca1b3243..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 autop(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 f56d6b22c..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 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]" /></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]" /></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]" /></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="localhost" /></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="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
diff --git a/views/failsafe/page/default.php b/views/failsafe/page/default.php
new file mode 100644
index 000000000..6d628ebbb
--- /dev/null
+++ b/views/failsafe/page/default.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Elgg failsafe pageshell
+ * Special viewtype for rendering exceptions. Includes minimal code so as not to
+ * create a "Exception thrown without a stack frame in Unknown on line 0" error
+ *
+ * @package Elgg
+ * @subpackage Core
+ *
+ * @uses $vars['title'] The page title
+ * @uses $vars['body'] The main content of the page
+ */
+
+// we won't trust server configuration but specify utf-8
+header('Content-type: text/html; charset=utf-8');
+
+?>
+<html>
+ <head>
+ <title><?php echo $vars['title']; ?></title>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <style type="text/css">
+
+ body {
+ text-align:left;
+ margin:0;
+ padding:0;
+ background: #4690d6;
+ font: 80%/1.5 "Lucida Grande", Verdana, sans-serif;
+ color: #333333;
+ }
+ p {
+ margin: 0px 0px 15px 0;
+ }
+ #elgg-wrapper {
+ background:white;
+ width:570px;
+ margin:auto;
+ padding:10px 40px;
+ margin-bottom:40px;
+ margin-top:20px;
+ border-right: 1px solid #666666;
+ border-bottom: 1px solid #666666;
+ }
+ .elgg-messages-exception {
+ background:#FDFFC3;
+ display:block;
+ padding:10px;
+ }
+ </style>
+
+ </head>
+ <body>
+ <div id="elgg-wrapper">
+ <h1><?php echo $vars['title']; ?></h1>
+ <?php echo $vars['body']; ?>
+ </div>
+ </body>
+</html>
diff --git a/views/failsafe/pageshells/pageshell.php b/views/failsafe/pageshells/pageshell.php
deleted file mode 100644
index 1562173e1..000000000
--- a/views/failsafe/pageshells/pageshell.php
+++ /dev/null
@@ -1,133 +0,0 @@
-<?php
- /**
- * Elgg fallback pageshell
- * Render a few things (like the installation process) in a fallback mode, text only with minimal use
- * of functions.
- *
- * @package Elgg
- * @subpackage Core
- * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
- * @author Marcus Povey
- * @copyright Curverider Ltd 2008
- * @link http://elgg.org/
- *
- * @uses $vars['config'] The site configuration settings, imported
- * @uses $vars['title'] The page title
- * @uses $vars['body'] The main content of the page
- * @uses $vars['messages'] A 2d array of various message registers, passed from system_messages()
- */
-
-
-?>
-<html>
- <head>
- <title><?php echo $vars['title']; ?></title>
-
- <style type="text/css">
-
- body {
- text-align:left;
- margin:0;
- padding:0;
- background: #4690d6;
- font: 80%/1.5 "Lucida Grande", Verdana, sans-serif;
- color: #333333;
- }
- a {
- color: #4690d6;
- text-decoration: none;
- -moz-outline-style: none;
- outline: none;
- }
- a:visited {
- color: #0054a7;
- }
- a:hover {
- color: #0054a7;
- text-decoration: underline;
- }
- p {
- margin: 0px 0px 15px 0;
- }
- img {
- border: none;
- }
- #startpage_wrapper {
- background:white;
- width:570px;
- margin:auto;
- padding:10px 40px;
- margin-bottom:40px;
- margin-top:20px;
- border-right: 1px solid #666666;
- border-bottom: 1px solid #666666;
- }
-
- label {
- font-weight: bold;
- color:#333333;
- font-size: 140%;
- }
- input {
- font: 120% Arial, Helvetica, sans-serif;
- padding: 5px;
- border: 1px solid #cccccc;
- color:#666666;
- }
- textarea {
- font: 120% Arial, Helvetica, sans-serif;
- border: solid 1px #cccccc;
- padding: 5px;
- color:#666666;
- }
- textarea:focus, input[type="password"]:focus, input[type="text"]:focus {
- border: solid 1px #4690d6;
- background: #e4ecf5;
- color:#333333;
- }
-
- input[type="submit"]:hover {
- background: #0054a7;
- border: 4px solid #0054a7;
- }
-
- input[type="submit"] {
- font: 16px/100% Arial, Helvetica, sans-serif;
- font-weight: bold;
- color: #ffffff;
- background:#4690d6;
- border: 4px solid #4690d6;
- -webkit-border-radius: 4px;
- -moz-border-radius: 4px;
- width: auto;
- height: 35px;
- padding: 2px 6px 2px 6px;
- margin:10px 0 10px 0;
- cursor: pointer;
- }
- #startpage_wrapper hr {
- border:0;
- border-bottom:1px solid #333333;
- }
- #startpage_wrapper td {
- text-align: left;
- vertical-align: middle;
- }
- </style>
-
-
-
- </head>
- <body>
- <div id="startpage_wrapper">
- <h1><?php echo $vars['title']; ?></h1>
-
- <!-- display any system messages -->
- <?php echo elgg_view('messages/list', array('object' => $vars['sysmessages'])); ?>
-
- <p>
- <?php echo $vars['body']; ?>
- </p>
- </div>
- </body>
-</html> \ No newline at end of file
generated by cgit v1.2.3 (git 2.39.1) at 2025-11-13 23:09:52 +0000