diff options
Diffstat (limited to 'views/failsafe/messages')
-rw-r--r-- | views/failsafe/messages/errors/error.php | 31 | ||||
-rw-r--r-- | views/failsafe/messages/errors/list.php | 51 | ||||
-rw-r--r-- | views/failsafe/messages/exceptions/exception.php | 65 | ||||
-rw-r--r-- | views/failsafe/messages/list.php | 39 | ||||
-rw-r--r-- | views/failsafe/messages/messages/list.php | 60 | ||||
-rw-r--r-- | views/failsafe/messages/messages/message.php | 31 | ||||
-rw-r--r-- | views/failsafe/messages/sanitisation/htaccess.php | 25 | ||||
-rw-r--r-- | views/failsafe/messages/sanitisation/settings.php | 36 |
8 files changed, 151 insertions, 187 deletions
diff --git a/views/failsafe/messages/errors/error.php b/views/failsafe/messages/errors/error.php index e3eb065e7..2ec365890 100644 --- a/views/failsafe/messages/errors/error.php +++ b/views/failsafe/messages/errors/error.php @@ -1,20 +1,17 @@ <?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) - */ +/** + * 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 +<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 index 8a4b26056..c270d6c0a 100644 --- a/views/failsafe/messages/errors/list.php +++ b/views/failsafe/messages/errors/list.php @@ -1,32 +1,29 @@ <?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'])) { +/** + * 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%; + 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"> @@ -41,8 +38,4 @@ </div> </div> <?php - } - - - -?>
\ No newline at end of file +}
\ No newline at end of file diff --git a/views/failsafe/messages/exceptions/exception.php b/views/failsafe/messages/exceptions/exception.php index 12e49c50f..f6fb4d144 100644 --- a/views/failsafe/messages/exceptions/exception.php +++ b/views/failsafe/messages/exceptions/exception.php @@ -1,37 +1,36 @@ <?php +/** + * Elgg exception (fallback mode) + * Displays a single exception + * + * @package Elgg + * @subpackage Core + * @author Curverider Ltd + * @link http://elgg.org/ + * + * @uses $vars['object'] An exception + */ - /** - * Elgg exception (fallback mode) - * Displays a single exception - * - * @package Elgg - * @subpackage Core - * @author Curverider Ltd - * @link http://elgg.org/ - * - * @uses $vars['object'] An exception - */ - - global $CONFIG; +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()); - - ?> - </span> - </p> - - <?php if ($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 +<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()); + + ?> + </span> +</p> + +<?php if ($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 index dd02fdac5..2410103da 100644 --- a/views/failsafe/messages/list.php +++ b/views/failsafe/messages/list.php @@ -1,25 +1,18 @@ <?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 + */ - /** - * 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 +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 index 2cb94b4e1..ed169c692 100644 --- a/views/failsafe/messages/messages/list.php +++ b/views/failsafe/messages/messages/list.php @@ -1,51 +1,43 @@ <?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'])) { +/** + * 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%; + 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)); - } - + foreach($vars['object'] as $message) { + echo elgg_view('messages/messages/message',array('object' => $message)); + } ?> </div> - -<?php - } +<?php -?>
\ No newline at end of file +}
\ No newline at end of file diff --git a/views/failsafe/messages/messages/message.php b/views/failsafe/messages/messages/message.php index c63c27498..6bc24d730 100644 --- a/views/failsafe/messages/messages/message.php +++ b/views/failsafe/messages/messages/message.php @@ -1,20 +1,17 @@ <?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) - */ +/** + * 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 +<p> + <?php echo nl2br($vars['object']); ?> +</p>
\ No newline at end of file diff --git a/views/failsafe/messages/sanitisation/htaccess.php b/views/failsafe/messages/sanitisation/htaccess.php index b8800c9be..e0eddacef 100644 --- a/views/failsafe/messages/sanitisation/htaccess.php +++ b/views/failsafe/messages/sanitisation/htaccess.php @@ -1,17 +1,14 @@ <?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')); +/** + * 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 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 index ac17d16cd..cf3ee719d 100644 --- a/views/failsafe/messages/sanitisation/settings.php +++ b/views/failsafe/messages/sanitisation/settings.php @@ -1,28 +1,23 @@ <?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/ + */ - /** - * 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/ - */ - - if ($vars['settings.php']) - { - echo elgg_echo('installation:settings:dbwizard:savefail'); +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')); +} else { + echo autop(elgg_echo('installation:error:settings')); ?> <div> <h2><?php echo elgg_echo('installation:settings:dbwizard:prompt'); ?></h2> @@ -34,8 +29,9 @@ <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 +<?php +}
\ No newline at end of file |