From bb1f45eb02bac603d67ac08cb674c4050a245c28 Mon Sep 17 00:00:00 2001 From: ewinslow 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 +- .../default/file/specialcontent/audio/mid.php | 2 +- .../default/file/specialcontent/audio/mp3.php | 2 +- .../default/file/specialcontent/audio/mpeg.php | 2 +- .../default/file/specialcontent/audio/x-wav.php | 2 +- .../default/file/specialcontent/image/default.php | 2 +- mod/file/views/default/file/typecloud.php | 2 +- mod/file/views/default/file/upload.php | 2 +- mod/file/views/default/object/file.php | 26 +++++++++++----------- mod/file/views/default/widgets/filerepo/view.php | 2 +- 13 files changed, 26 insertions(+), 26 deletions(-) (limited to 'mod/file/views/default') 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(mod/file/graphics/icon_gallery.gif) no-repeat right top; + background: transparent 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 .= '

' . 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('?active_section=file'); + $('.popup .content').load('?active_section=file'); } else { $('.popup .content').find('form').prepend('

' + info.message + '

'); } 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 "

" . elgg_echo('file:more') . "

"; 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 ""; + echo ""; } 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 @@ - + \ 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 @@ - + \ 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 @@ - + \ 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 @@ - + \ 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 "

getGUID()}\">getGUID()}&size=large\" border=\"0\" />

"; + echo "

getGUID()}\">getGUID()}&size=large\" border=\"0\" />

"; } 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 @@ ?> -
+

" . $file->title . "

"; - echo "

getURL()}\">getGUID()}\" border=\"0\" />

"; - echo "

username}\">{$owner->username} {$friendlytime}

"; + echo "

getURL()}\">getGUID()}\" border=\"0\" />

"; + echo "

username}\">{$owner->username} {$friendlytime}

"; //get the number of comments $numcomments = elgg_count_comments($vars['entity']); @@ -40,10 +40,10 @@ //if the user can edit, display edit and delete links if ($file->canEdit()) { echo "

"; - echo "getGUID()}\">" . elgg_echo('edit') . " "; + echo "getGUID()}\">" . elgg_echo('edit') . " "; echo elgg_view('output/confirmlink',array( - 'href' => $vars['url'] . "action/file/delete?file=" . $file->getGUID(), + 'href' => elgg_get_site_url() . "action/file/delete?file=" . $file->getGUID(), 'text' => elgg_echo("delete"), 'confirm' => elgg_echo("file:delete:confirm"), 'is_action' => true, @@ -56,7 +56,7 @@ } else { echo "

{$title}

"; echo "getURL()}\">" . elgg_view("file/icon", array("mimetype" => $mime, 'thumbnail' => $file->thumbnail, 'file_guid' => $file_guid, 'size' => 'large')) . ""; - echo "

username}\">{$owner->name} {$friendlytime}

"; + echo "

username}\">{$owner->name} {$friendlytime}

"; //get the number of comments $numcomments = elgg_count_comments($file); if ($numcomments) @@ -68,7 +68,7 @@ } else { $info = "

getURL()}\">{$title}

"; - $info .= "

username}\">{$owner->name} {$friendlytime}"; + $info .= "

username}\">{$owner->name} {$friendlytime}"; $numcomments = elgg_count_comments($file); if ($numcomments) $info .= ", getURL()}\">" . sprintf(elgg_echo("comments")) . " (" . $numcomments . ")"; @@ -84,7 +84,7 @@ ?>

- mod/file/download.php?file_guid="> $mime, 'thumbnail' => $file->thumbnail, 'file_guid' => $file_guid)); @@ -94,17 +94,17 @@
guid . "&search_viewtype=gallery"; + $user_gallery = elgg_get_site_url() . "mod/file/search.php?md_type=simpletype&subtype=file&tag=image&owner_guid=" . $owner->guid . "&search_viewtype=gallery"; ?>
-

+

$owner, 'size' => 'tiny')); ?> -

name; ?>
+

name; ?>

@@ -138,7 +138,7 @@ ?> -

+

-   +   $vars['url'] . "action/file/delete?file=" . $file->getGUID(), + 'href' => elgg_get_site_url() . "action/file/delete?file=" . $file->getGUID(), 'text' => elgg_echo("delete"), 'confirm' => elgg_echo("file:delete:confirm"), 'is_action' => true, diff --git a/mod/file/views/default/widgets/filerepo/view.php b/mod/file/views/default/widgets/filerepo/view.php index 74c7810d9..aac2c4012 100644 --- a/mod/file/views/default/widgets/filerepo/view.php +++ b/mod/file/views/default/widgets/filerepo/view.php @@ -58,7 +58,7 @@ //get a link to the users files - $users_file_url = $vars['url'] . "pg/file/" . get_user($f->owner_guid)->username; + $users_file_url = elgg_get_site_url() . "pg/file/" . get_user($f->owner_guid)->username; echo "

" . elgg_echo('file:more') . "
"; echo "
"; -- cgit v1.2.3