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/file/views/default/file/css.php                          | 2 +-
 mod/file/views/default/file/embed_upload.php                 | 4 ++--
 mod/file/views/default/file/groupprofile_files.php           | 2 +-
 mod/file/views/default/file/icon.php                         | 2 +-
 mod/file/views/default/file/specialcontent/audio/mid.php     | 2 +-
 mod/file/views/default/file/specialcontent/audio/mp3.php     | 2 +-
 mod/file/views/default/file/specialcontent/audio/mpeg.php    | 2 +-
 mod/file/views/default/file/specialcontent/audio/x-wav.php   | 2 +-
 mod/file/views/default/file/specialcontent/image/default.php | 2 +-
 mod/file/views/default/file/typecloud.php                    | 2 +-
 mod/file/views/default/file/upload.php                       | 2 +-
 11 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'mod/file/views/default/file')

diff --git a/mod/file/views/default/file/css.php b/mod/file/views/default/file/css.php
index 74f18427e..46913dea7 100644
--- a/mod/file/views/default/file/css.php
+++ b/mod/file/views/default/file/css.php
@@ -99,7 +99,7 @@
 }
 .filerepo_user_gallery_link a {
 	padding:2px 25px 5px 0;
-	background: transparent url(<?php echo $vars['url']; ?>mod/file/graphics/icon_gallery.gif) no-repeat right top;
+	background: transparent url(<?php echo elgg_get_site_url(); ?>mod/file/graphics/icon_gallery.gif) no-repeat right top;
 	display:block;
 }
 .filerepo_user_gallery_link a:hover {
diff --git a/mod/file/views/default/file/embed_upload.php b/mod/file/views/default/file/embed_upload.php
index 60c75bfb9..50f77cbb8 100644
--- a/mod/file/views/default/file/embed_upload.php
+++ b/mod/file/views/default/file/embed_upload.php
@@ -21,7 +21,7 @@ $form_body .= '<p>' . elgg_view('input/submit', array('value' => elgg_echo('uplo
 echo elgg_view('input/form', array(
 	'body' => $form_body,
 	'internalid' => 'file_embed_upload',
-	'action' => $vars['url'] . 'action/file/upload',
+	'action' => elgg_get_site_url() . 'action/file/upload',
 ));
 
 ?>
@@ -35,7 +35,7 @@ $(document).ready(function() {
 				var info = jQuery.parseJSON(data);
 
 				if (info.status == 'success') {
-					$('.popup .content').load('<?php echo $vars['url'] . 'pg/embed/embed'; ?>?active_section=file');
+					$('.popup .content').load('<?php echo elgg_get_site_url() . 'pg/embed/embed'; ?>?active_section=file');
 				} else {
 					$('.popup .content').find('form').prepend('<p>' + info.message + '</p>');
 				}
diff --git a/mod/file/views/default/file/groupprofile_files.php b/mod/file/views/default/file/groupprofile_files.php
index f520f0d2e..23b087c31 100644
--- a/mod/file/views/default/file/groupprofile_files.php
+++ b/mod/file/views/default/file/groupprofile_files.php
@@ -41,7 +41,7 @@
 
 
         //get a link to the users files
-        $users_file_url = $vars['url'] . "pg/file/" . elgg_get_page_owner()->username;
+        $users_file_url = elgg_get_site_url() . "pg/file/" . elgg_get_page_owner()->username;
 
         echo "<p><a href=\"{$users_file_url}\">" . elgg_echo('file:more') . "</a></p>";
 
diff --git a/mod/file/views/default/file/icon.php b/mod/file/views/default/file/icon.php
index 1af8f0273..f2cb38785 100644
--- a/mod/file/views/default/file/icon.php
+++ b/mod/file/views/default/file/icon.php
@@ -36,7 +36,7 @@
 		case 'image/gif' 	:
 		case 'image/bmp' 	: 
 			if ($thumbnail) {
-				echo "<img src=\"{$vars['url']}mod/file/thumbnail.php?file_guid={$vars['file_guid']}&size={$size}\" border=\"0\" />";				
+				echo "<img src=\"".elgg_get_site_url()."mod/file/thumbnail.php?file_guid={$vars['file_guid']}&size={$size}\" border=\"0\" />";				
 			} else {
 				if (!empty($mime) && elgg_view_exists("file/icon/{$mime}")) {
 					echo elgg_view("file/icon/{$mime}", $vars);
diff --git a/mod/file/views/default/file/specialcontent/audio/mid.php b/mod/file/views/default/file/specialcontent/audio/mid.php
index cf216a3b3..61b3218f1 100644
--- a/mod/file/views/default/file/specialcontent/audio/mid.php
+++ b/mod/file/views/default/file/specialcontent/audio/mid.php
@@ -1,4 +1,4 @@
-<object type="audio/midi" data="<?php echo $vars['url']; ?>mod/file/download.php?file_guid=<?php echo $vars['entity']->getGUID(); ?>" width="200" height="20">
+<object type="audio/midi" data="<?php echo elgg_get_site_url(); ?>mod/file/download.php?file_guid=<?php echo $vars['entity']->getGUID(); ?>" width="200" height="20">
   <param name="autoplay" value="false">
   <param name="autoStart" value="0">
 </object>
\ No newline at end of file
diff --git a/mod/file/views/default/file/specialcontent/audio/mp3.php b/mod/file/views/default/file/specialcontent/audio/mp3.php
index 83b77c391..cb4ab9376 100644
--- a/mod/file/views/default/file/specialcontent/audio/mp3.php
+++ b/mod/file/views/default/file/specialcontent/audio/mp3.php
@@ -1,4 +1,4 @@
-<object type="audio/mpeg" data="<?php echo $vars['url']; ?>mod/file/download.php?file_guid=<?php echo $vars['entity']->getGUID(); ?>" width="200" height="20">
+<object type="audio/mpeg" data="<?php echo elgg_get_site_url(); ?>mod/file/download.php?file_guid=<?php echo $vars['entity']->getGUID(); ?>" width="200" height="20">
   <param name="autoplay" value="false">
   <param name="autoStart" value="0">
 </object>
\ No newline at end of file
diff --git a/mod/file/views/default/file/specialcontent/audio/mpeg.php b/mod/file/views/default/file/specialcontent/audio/mpeg.php
index 83b77c391..cb4ab9376 100644
--- a/mod/file/views/default/file/specialcontent/audio/mpeg.php
+++ b/mod/file/views/default/file/specialcontent/audio/mpeg.php
@@ -1,4 +1,4 @@
-<object type="audio/mpeg" data="<?php echo $vars['url']; ?>mod/file/download.php?file_guid=<?php echo $vars['entity']->getGUID(); ?>" width="200" height="20">
+<object type="audio/mpeg" data="<?php echo elgg_get_site_url(); ?>mod/file/download.php?file_guid=<?php echo $vars['entity']->getGUID(); ?>" width="200" height="20">
   <param name="autoplay" value="false">
   <param name="autoStart" value="0">
 </object>
\ No newline at end of file
diff --git a/mod/file/views/default/file/specialcontent/audio/x-wav.php b/mod/file/views/default/file/specialcontent/audio/x-wav.php
index 21af956c2..b637eb1e1 100644
--- a/mod/file/views/default/file/specialcontent/audio/x-wav.php
+++ b/mod/file/views/default/file/specialcontent/audio/x-wav.php
@@ -1,4 +1,4 @@
-<object type="audio/x-wav" data="<?php echo $vars['url']; ?>mod/file/download.php?file_guid=<?php echo $vars['entity']->getGUID(); ?>" width="200" height="20">
+<object type="audio/x-wav" data="<?php echo elgg_get_site_url(); ?>mod/file/download.php?file_guid=<?php echo $vars['entity']->getGUID(); ?>" width="200" height="20">
   <param name="autoplay" value="false">
   <param name="autoStart" value="0">
 </object>
\ No newline at end of file
diff --git a/mod/file/views/default/file/specialcontent/image/default.php b/mod/file/views/default/file/specialcontent/image/default.php
index b034857c2..8034c87d4 100644
--- a/mod/file/views/default/file/specialcontent/image/default.php
+++ b/mod/file/views/default/file/specialcontent/image/default.php
@@ -2,7 +2,7 @@
 
 	if ($vars['full'] && $smallthumb = $vars['entity']->smallthumb) {
  
-		echo "<p><a href=\"{$vars['url']}mod/file/download.php?file_guid={$vars['entity']->getGUID()}\"><img src=\"{$vars['url']}mod/file/thumbnail.php?file_guid={$vars['entity']->getGUID()}&size=large\" border=\"0\" /></a></p>";
+		echo "<p><a href=\"".elgg_get_site_url()."mod/file/download.php?file_guid={$vars['entity']->getGUID()}\"><img src=\"".elgg_get_site_url()."mod/file/thumbnail.php?file_guid={$vars['entity']->getGUID()}&size=large\" border=\"0\" /></a></p>";
 		
 	}
 
diff --git a/mod/file/views/default/file/typecloud.php b/mod/file/views/default/file/typecloud.php
index e404327ae..0e2f3a53c 100644
--- a/mod/file/views/default/file/typecloud.php
+++ b/mod/file/views/default/file/typecloud.php
@@ -21,7 +21,7 @@
 			$label = elgg_echo('all');
 		}
 		
-		$url = $vars['url'] . "mod/file/search.php?subtype=file";
+		$url = elgg_get_site_url() . "mod/file/search.php?subtype=file";
 		if ($tag != "all")
 			$url .= "&md_type=simpletype&tag=" . urlencode($tag);
 		if (isset($vars['friend_guid']) && $vars['friend_guid'] != false) {
diff --git a/mod/file/views/default/file/upload.php b/mod/file/views/default/file/upload.php
index f89cf86d3..b7b99e3b3 100644
--- a/mod/file/views/default/file/upload.php
+++ b/mod/file/views/default/file/upload.php
@@ -38,7 +38,7 @@
 	
 	
 ?>
-<form action="<?php echo $vars['url']; ?>action/<?php echo $action; ?>" enctype="multipart/form-data" method="post" class="margin_top">
+<form action="<?php echo elgg_get_site_url(); ?>action/<?php echo $action; ?>" enctype="multipart/form-data" method="post" class="margin_top">
 <p>
 	<label>
 <?php
-- 
cgit v1.2.3