diff options
author | marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2008-06-17 16:49:21 +0000 |
---|---|---|
committer | marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2008-06-17 16:49:21 +0000 |
commit | 0f2e67985d80ad91cd000e33d6e8a7751121d370 (patch) | |
tree | 8833d61e09436b2d409f5238a8e65741dd720636 /views/failsafe | |
parent | d203a2e6f4bb69b9b33e157c130eab6408ebce89 (diff) | |
download | elgg-0f2e67985d80ad91cd000e33d6e8a7751121d370.tar.gz elgg-0f2e67985d80ad91cd000e33d6e8a7751121d370.tar.bz2 |
CLOSED - #34: Install process must be completely graphical
http://trac.elgg.org/elgg/ticket/34
git-svn-id: https://code.elgg.org/elgg/trunk@951 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'views/failsafe')
-rw-r--r-- | views/failsafe/messages/errors/error.php | 20 | ||||
-rw-r--r-- | views/failsafe/messages/errors/list.php | 37 | ||||
-rw-r--r-- | views/failsafe/messages/exceptions/exception.php | 39 | ||||
-rw-r--r-- | views/failsafe/messages/list.php | 25 | ||||
-rw-r--r-- | views/failsafe/messages/sanitisation/htaccess.php | 17 | ||||
-rw-r--r-- | views/failsafe/messages/sanitisation/settings.php | 43 | ||||
-rw-r--r-- | views/failsafe/pageshells/pageshell.php | 36 |
7 files changed, 217 insertions, 0 deletions
diff --git a/views/failsafe/messages/errors/error.php b/views/failsafe/messages/errors/error.php new file mode 100644 index 000000000..8e7dbb84a --- /dev/null +++ b/views/failsafe/messages/errors/error.php @@ -0,0 +1,20 @@ +<?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 new file mode 100644 index 000000000..ff43f1d00 --- /dev/null +++ b/views/failsafe/messages/errors/list.php @@ -0,0 +1,37 @@ +<?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/exception.php b/views/failsafe/messages/exceptions/exception.php new file mode 100644 index 000000000..c8c630f3b --- /dev/null +++ b/views/failsafe/messages/exceptions/exception.php @@ -0,0 +1,39 @@ +<?php + + /** + * 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 diff --git a/views/failsafe/messages/list.php b/views/failsafe/messages/list.php new file mode 100644 index 000000000..10fda8f90 --- /dev/null +++ b/views/failsafe/messages/list.php @@ -0,0 +1,25 @@ +<?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 new file mode 100644 index 000000000..99bfe4159 --- /dev/null +++ b/views/failsafe/messages/sanitisation/htaccess.php @@ -0,0 +1,17 @@ +<?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 new file mode 100644 index 000000000..798bfbd91 --- /dev/null +++ b/views/failsafe/messages/sanitisation/settings.php @@ -0,0 +1,43 @@ +<?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 diff --git a/views/failsafe/pageshells/pageshell.php b/views/failsafe/pageshells/pageshell.php new file mode 100644 index 000000000..7e1de7c10 --- /dev/null +++ b/views/failsafe/pageshells/pageshell.php @@ -0,0 +1,36 @@ +<?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> + </head> + <body> + <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> + </body> +</html>
\ No newline at end of file |