From bb1f45eb02bac603d67ac08cb674c4050a245c28 Mon Sep 17 00:00:00 2001
From: ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Sat, 30 Oct 2010 22:23:45 +0000
Subject: 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
---
 mod/thewire/views/default/object/thewire.php              | 8 ++++----
 mod/thewire/views/default/river/object/thewire/create.php | 2 +-
 mod/thewire/views/default/thewire/css.php                 | 2 +-
 mod/thewire/views/default/thewire/forms/add.php           | 4 ++--
 mod/thewire/views/default/thewire/profile_status.php      | 2 +-
 mod/thewire/views/default/widgets/thewire/view.php        | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'mod/thewire/views')

diff --git a/mod/thewire/views/default/object/thewire.php b/mod/thewire/views/default/object/thewire.php
index 5168190c3..df30f4f1e 100644
--- a/mod/thewire/views/default/object/thewire.php
+++ b/mod/thewire/views/default/object/thewire.php
@@ -30,13 +30,13 @@ if (isset($vars['entity'])) {
 		<?php
 			if(isloggedin()){
 		?>
-			<a href="<?php echo $vars['url']; ?>mod/thewire/add.php?wire_username=<?php echo $vars['entity']->getOwnerEntity()->username; ?>" class="action_button reply small"><?php echo elgg_echo('thewire:reply'); ?></a>
+			<a href="<?php echo elgg_get_site_url(); ?>mod/thewire/add.php?wire_username=<?php echo $vars['entity']->getOwnerEntity()->username; ?>" class="action_button reply small"><?php echo elgg_echo('thewire:reply'); ?></a>
     		<?php
 			}//close reply if statement
 			// if the user looking at thewire post can edit, show the delete link
 			if ($vars['entity']->canEdit()) {
 			   echo "<span class='delete_button'>" . elgg_view("output/confirmlink",array(
-					'href' => $vars['url'] . "action/thewire/delete?thewirepost=" . $vars['entity']->getGUID(),
+					'href' => elgg_get_site_url() . "action/thewire/delete?thewirepost=" . $vars['entity']->getGUID(),
 					'text' => elgg_echo('delete'),
 					'confirm' => elgg_echo('deleteconfirm'),
 				)) . "</span>";
@@ -45,10 +45,10 @@ if (isset($vars['entity'])) {
 	    </div>
 		
 		<div class="wire_post_info">
-			<a href="<?php echo $vars['url']; ?>pg/thewire/<?php echo $vars['entity']->getOwnerEntity()->username; ?>"><?php echo $user_name; ?></a>
+			<a href="<?php echo elgg_get_site_url(); ?>pg/thewire/<?php echo $vars['entity']->getOwnerEntity()->username; ?>"><?php echo $user_name; ?></a>
 			<?php
 			    $desc = $vars['entity']->description;
-			    //$desc = preg_replace('/\@([A-Za-z0-9\_\.\-]*)/i','@<a href="' . $vars['url'] . 'pg/thewire/$1">$1</a>',$desc);
+			    //$desc = preg_replace('/\@([A-Za-z0-9\_\.\-]*)/i','@<a href="' . elgg_get_site_url() . 'pg/thewire/$1">$1</a>',$desc);
 				echo parse_urls($desc);
 			?>
 			<p class="entity_subtext">		
diff --git a/mod/thewire/views/default/river/object/thewire/create.php b/mod/thewire/views/default/river/object/thewire/create.php
index 9dee87274..0e0674a7e 100644
--- a/mod/thewire/views/default/river/object/thewire/create.php
+++ b/mod/thewire/views/default/river/object/thewire/create.php
@@ -6,7 +6,7 @@ $url = $object->getURL();
 
 $string = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}:</a> ";
 $desc = $object->description;
-//$desc = preg_replace('/\@([A-Za-z0-9\_\.\-]*)/i','@<a href="' . $vars['url'] . 'pg/thewire/$1">$1</a>',$desc);
+//$desc = preg_replace('/\@([A-Za-z0-9\_\.\-]*)/i','@<a href="' . elgg_get_site_url() . 'pg/thewire/$1">$1</a>',$desc);
 $string .= parse_urls($desc);
 $string .= " <span class='entity_subtext'>" . elgg_view_friendly_time($object->time_created);
 	if (isloggedin()){
diff --git a/mod/thewire/views/default/thewire/css.php b/mod/thewire/views/default/thewire/css.php
index 3b50be652..36c9bc844 100644
--- a/mod/thewire/views/default/thewire/css.php
+++ b/mod/thewire/views/default/thewire/css.php
@@ -48,7 +48,7 @@
 .wire_post {
 	padding-bottom:10px;
 	margin-bottom:5px;
-	background-image: url(<?php echo $vars['url']; ?>mod/thewire/graphics/thewire_speech_bubble.gif);
+	background-image: url(<?php echo elgg_get_site_url(); ?>mod/thewire/graphics/thewire_speech_bubble.gif);
 	background-repeat: no-repeat;
 	background-position: right bottom; 
 }
diff --git a/mod/thewire/views/default/thewire/forms/add.php b/mod/thewire/views/default/thewire/forms/add.php
index 90fdabceb..5e29549e2 100644
--- a/mod/thewire/views/default/thewire/forms/add.php
+++ b/mod/thewire/views/default/thewire/forms/add.php
@@ -13,8 +13,8 @@
 ?>
 <div class="new_wire_post clearfloat">
 <h3><?php echo elgg_echo("thewire:doing"); ?></h3>
-<script type="text/javascript" src="<?php echo $vars['url']; ?>mod/thewire/views/default/thewire/scripts/counter.js"></script>
-<form action="<?php echo $vars['url']; ?>action/thewire/add" method="post" name="new_post">
+<script type="text/javascript" src="<?php echo elgg_get_site_url(); ?>mod/thewire/views/default/thewire/scripts/counter.js"></script>
+<form action="<?php echo elgg_get_site_url(); ?>action/thewire/add" method="post" name="new_post">
 	<?php
 		$action_txt = elgg_echo('post');
 	    $display .= "<textarea name='new_post_textarea' value='' onKeyDown=\"textCounter(document.new_post.new_post_textarea,document.new_post.remLen1,140)\" onKeyUp=\"textCounter(document.new_post.new_post_textarea,document.new_post.remLen1,140)\">{$msg}</textarea>";
diff --git a/mod/thewire/views/default/thewire/profile_status.php b/mod/thewire/views/default/thewire/profile_status.php
index a313b65ef..dbcb7385c 100644
--- a/mod/thewire/views/default/thewire/profile_status.php
+++ b/mod/thewire/views/default/thewire/profile_status.php
@@ -5,7 +5,7 @@
  */
  
 $owner = $vars['entity']->guid;
-$url_to_wire = $vars['url'] . "pg/thewire/" . $vars['entity']->username;
+$url_to_wire = elgg_get_site_url() . "pg/thewire/" . $vars['entity']->username;
 	
 //grab the user's latest from the wire
 $params = array(
diff --git a/mod/thewire/views/default/widgets/thewire/view.php b/mod/thewire/views/default/widgets/thewire/view.php
index c3f9e7858..bed5c140b 100644
--- a/mod/thewire/views/default/widgets/thewire/view.php
+++ b/mod/thewire/views/default/widgets/thewire/view.php
@@ -10,6 +10,6 @@ $content = elgg_list_entities(array('types' => 'object', 'subtypes' => 'thewire'
 echo $content;
 
 if ($content) {
-	$blogurl = $vars['url'] . "pg/thewire/" . elgg_get_page_owner()->username;
+	$blogurl = elgg_get_site_url() . "pg/thewire/" . elgg_get_page_owner()->username;
 	echo "<div class=\"shares_widget_wrapper\"><a href=\"{$blogurl}\">".elgg_echo('thewire:moreposts')."</a></div>";
 }
-- 
cgit v1.2.3