Refs #2598: Converted most $vars['url'] to elgg_get_site_url()

git-svn-id: http://code.elgg.org/elgg/trunk@7149 36083f99-b078-4883-b0ff-0f9b5a30f544

6 files changed, 16 insertions, 16 deletions

diff --git a/views/default/account/forms/forgotten_password.php b/views/default/account/forms/forgotten_password.php
index 6c000bfc6..0d88cf8f7 100644
--- a/views/default/account/forms/forgotten_password.php
+++ b/views/default/account/forms/forgotten_password.php
@@ -13,7 +13,7 @@ $form_body .= elgg_view('input/captcha');
 $form_body .= "<p>" . elgg_view('input/submit', array('value' => elgg_echo('request'))) . "</p>";
 
 echo elgg_view('input/form', array(
-	'action' => "{$vars['url']}action/user/requestnewpassword",
+	'action' => elgg_get_site_url()."action/user/requestnewpassword",
 	'body' => $form_body,
 	'class' => "margin_top"
 ));
diff --git a/views/default/account/forms/login.php b/views/default/account/forms/login.php
index 8f3986c4e..ceaaf66d0 100644
--- a/views/default/account/forms/login.php
+++ b/views/default/account/forms/login.php
@@ -17,12 +17,12 @@ $form_body .= "<div class='persistent_login'><label><input type='checkbox' name=
 $form_body .= elgg_view('login/extend');
 
 $form_body .= "<p class='loginbox'>";
-$form_body .= $CONFIG->allow_registration ? "<a href=\"{$vars['url']}pg/register/\">" . elgg_echo('register') . '</a> | ' : '';
-$form_body .= "<a href=\"{$vars['url']}pages/account/forgotten_password.php\">" . elgg_echo('user:password:lost') . "</a></p>";
+$form_body .= $CONFIG->allow_registration ? "<a href=\"".elgg_get_site_url()."pg/register/\">" . elgg_echo('register') . '</a> | ' : '';
+$form_body .= "<a href=\"".elgg_get_site_url()."pages/account/forgotten_password.php\">" . elgg_echo('user:password:lost') . "</a></p>";
 
-$login_url = $vars['url'];
+$login_url = elgg_get_site_url();
 if ((isset($CONFIG->https_login)) && ($CONFIG->https_login)) {
-	$login_url = str_replace("http", "https", $vars['url']);
+	$login_url = str_replace("http", "https", elgg_get_site_url());
 }
 ?>
 
diff --git a/views/default/account/forms/login_dropdown.php b/views/default/account/forms/login_dropdown.php
index 402e500d5..978507914 100644
--- a/views/default/account/forms/login_dropdown.php
+++ b/views/default/account/forms/login_dropdown.php
@@ -12,13 +12,13 @@ if (!isloggedin()) {
 	$form_body .= elgg_view('login/extend');
 
 	$form_body .= "<p class='loginbox'>";
-	$form_body .= $CONFIG->allow_registration ? "<a href=\"{$vars['url']}pg/register/\">" . elgg_echo('register') . '</a> | ' : '';
-	$form_body .= "<a href=\"{$vars['url']}pages/account/forgotten_password.php\">" . elgg_echo('user:password:lost') . "</a></p>";
+	$form_body .= $CONFIG->allow_registration ? "<a href=\"".elgg_get_site_url()."pg/register/\">" . elgg_echo('register') . '</a> | ' : '';
+	$form_body .= "<a href=\"".elgg_get_site_url()."pages/account/forgotten_password.php\">" . elgg_echo('user:password:lost') . "</a></p>";
 	$form_body .= "<input type='hidden' name='returntoreferer' value='true' />";
 
-	$login_url = $vars['url'];
+	$login_url = elgg_get_site_url();
 	if ((isset($CONFIG->https_login)) && ($CONFIG->https_login)) {
-		$login_url = str_replace("http", "https", $vars['url']);
+		$login_url = str_replace("http", "https", elgg_get_site_url());
 	}
 ?>
 
@@ -89,7 +89,7 @@ $(document).ready(function() {
 }
 #login_dropdown #signin_button a.signin span {
 	padding:4px 0 6px 12px;
-	background-image:url(<?php echo $vars['url']; ?>_graphics/elgg_sprites.png);
+	background-image:url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png);
 	background-position:-150px -51px;
 	background-repeat:no-repeat;
 }
diff --git a/views/default/account/forms/login_walled_garden.php b/views/default/account/forms/login_walled_garden.php
index 72af49359..8b5d593bb 100644
--- a/views/default/account/forms/login_walled_garden.php
+++ b/views/default/account/forms/login_walled_garden.php
@@ -15,13 +15,13 @@ $form_body .= "<div class='remember_me'><label><input type='checkbox' name='pers
 $register = elgg_echo('register');
 $lost_password = elgg_echo('user:password:lost');
 $form_body .= '<p class="lost_password">';
-$form_body .= $CONFIG->allow_registration ? "<a class=\"registration_link\" href=\"{$vars['url']}pg/register/\">$register</a> | " : '';
+$form_body .= $CONFIG->allow_registration ? "<a class=\"registration_link\" href=\"".elgg_get_site_url()."pg/register/\">$register</a> | " : '';
 $form_body .= "<a class='forgotten_password_link' href=\"{$login_url}pages/account/forgotten_password.php\">$lost_password</a>";
 $form_body .= '</p>';
 
-$login_url = $vars['url'];
+$login_url = elgg_get_site_url();
 if ((isset($CONFIG->https_login)) && ($CONFIG->https_login)) {
-	$login_url = str_replace("http", "https", $vars['url']);
+	$login_url = str_replace("http", "https", elgg_get_site_url());
 }
 ?>
 <h2><?php echo elgg_echo('login'); ?></h2>
@@ -60,7 +60,7 @@ __HTML;
 		<h2><?php echo elgg_echo('user:password:lost'); ?></h2>
 		<?php
 			echo elgg_view('input/form', array(
-				'action' => "{$vars['url']}action/user/requestnewpassword",
+				'action' => elgg_get_site_url()."action/user/requestnewpassword",
 				'body' => $lostpassword_form_body
 			));
 		?>
diff --git a/views/default/account/forms/register.php b/views/default/account/forms/register.php
index c6b47c82e..9b777ba64 100644
--- a/views/default/account/forms/register.php
+++ b/views/default/account/forms/register.php
@@ -38,7 +38,7 @@ $form_body .= elgg_view('input/hidden', array('internalname' => 'invitecode', 'v
 $form_body .= elgg_view('input/hidden', array('internalname' => 'action', 'value' => 'register'));
 $form_body .= elgg_view('input/submit', array('internalname' => 'submit', 'value' => elgg_echo('register'))) . "</p>";
 
-echo elgg_view('input/form', array('action' => "{$vars['url']}action/register", 'body' => $form_body, 'class' => "margin_top"));
+echo elgg_view('input/form', array('action' => elgg_get_site_url()."action/register", 'body' => $form_body, 'class' => "margin_top"));
 ?>
 
 <script type="text/javascript">
diff --git a/views/default/account/forms/useradd.php b/views/default/account/forms/useradd.php
index 7cab08804..bad1b11df 100644
--- a/views/default/account/forms/useradd.php
+++ b/views/default/account/forms/useradd.php
@@ -27,5 +27,5 @@ $form_body .= elgg_view('input/submit', array('internalname' => 'submit', 'value
 
 <div class="admin_settings add_user">
 	<h3><?php echo elgg_echo('adduser'); ?></h3>
-	<?php echo elgg_view('input/form', array('action' => "{$vars['url']}action/useradd", 'body' => $form_body)) ?>
+	<?php echo elgg_view('input/form', array('action' => elgg_get_site_url()."action/useradd", 'body' => $form_body)) ?>
 </div>
\ No newline at end of file