diff options
| author | brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-04-05 15:11:05 +0000 |
|---|---|---|
| committer | brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-04-05 15:11:05 +0000 |
| commit | 5571ca5b350fd1735f13af7ddfbb88afa6befb0c (patch) | |
| tree | f8f2c4e1705a3edd6ec5d759f188926f7495021c /views | |
| parent | 394f52f0ef0d743cb50352fce14020837662d891 (diff) | |
| download | elgg-5571ca5b350fd1735f13af7ddfbb88afa6befb0c.tar.gz elgg-5571ca5b350fd1735f13af7ddfbb88afa6befb0c.tar.bz2 | |
Merged 5487:5525 from 1.7 to trunk.
git-svn-id: http://code.elgg.org/elgg/trunk@5621 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'views')
| -rw-r--r-- | views/default/output/url.php | 4 | ||||
| -rw-r--r-- | views/failsafe/messages/sanitisation/settings.php | 23 |
2 files changed, 22 insertions, 5 deletions
diff --git a/views/default/output/url.php b/views/default/output/url.php index 734df2c19..7e0281a43 100644 --- a/views/default/output/url.php +++ b/views/default/output/url.php @@ -20,6 +20,10 @@ $url = trim($vars['href']); if (!empty($url)) { + if ((substr_count($url, "http://") == 0) && (substr_count($url, "https://") == 0)) { + $url = "http://" . $url; + } + if (array_key_exists('is_action', $vars) && $vars['is_action']) { $url = elgg_add_action_tokens_to_url($url); } diff --git a/views/failsafe/messages/sanitisation/settings.php b/views/failsafe/messages/sanitisation/settings.php index 9fabe13a1..b4e43a053 100644 --- a/views/failsafe/messages/sanitisation/settings.php +++ b/views/failsafe/messages/sanitisation/settings.php @@ -9,6 +9,19 @@ * @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'); ?> @@ -23,11 +36,11 @@ if ($vars['settings.php']) { <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> + <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'); ?>" /> |