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/blog/views/default/blog/forms/edit.php | 8 ++-- mod/blog/views/default/blog/sidebar_edit.php | 2 +- mod/blog/views/default/blog/sidebar_revisions.php | 2 +- mod/blog/views/default/object/blog.php | 6 +-- .../views/default/bookmarks/bookmarklet.php | 2 +- mod/bookmarks/views/default/bookmarks/form.php | 2 +- .../views/default/bookmarks/group_bookmarks.php | 4 +- .../views/default/widgets/bookmarks/view.php | 2 +- mod/captcha/views/default/input/captcha.php | 2 +- mod/categories/views/default/categories/view.php | 2 +- .../views/default/defaultwidgets/editor.php | 18 ++++---- .../views/default/diagnostics/runalltests.php | 2 +- mod/ecml/views/default/ecml/admin/css.php | 22 ++++----- mod/ecml/views/default/ecml/help/blip.tv.php | 2 +- mod/ecml/views/default/ecml/help/dailymotion.php | 2 +- mod/ecml/views/default/ecml/help/googlemaps.php | 2 +- mod/ecml/views/default/ecml/help/livevideo.php | 2 +- mod/ecml/views/default/ecml/help/redlasso.php | 4 +- mod/ecml/views/default/ecml/help/slideshare.php | 2 +- mod/ecml/views/default/ecml/help/vimeo.php | 2 +- mod/ecml/views/default/ecml/help/youtube.php | 2 +- .../views/default/embed/web_services/content.php | 4 +- mod/embed/views/default/embed/css.php | 4 +- mod/embed/views/default/embed/embed.php | 2 +- mod/embed/views/default/embed/js.php | 6 +-- mod/embed/views/default/embed/link.php | 2 +- mod/embed/views/default/embed/upload/content.php | 2 +- 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 +- mod/file/views/rss/object/file.php | 2 +- mod/groups/actions/delete.php | 2 +- mod/groups/views/default/forms/forums/addtopic.php | 2 +- .../views/default/forms/forums/edittopic.php | 2 +- mod/groups/views/default/forms/groups/edit.php | 4 +- mod/groups/views/default/forms/groups/invite.php | 2 +- mod/groups/views/default/forum/maintopic.php | 4 +- mod/groups/views/default/forum/topics.php | 2 +- mod/groups/views/default/forum/viewposts.php | 2 +- mod/groups/views/default/groups/find.php | 2 +- mod/groups/views/default/groups/forum_latest.php | 6 +-- .../views/default/groups/group_sort_menu.php | 2 +- mod/groups/views/default/groups/grouplisting.php | 4 +- mod/groups/views/default/groups/groupprofile.php | 8 ++-- .../views/default/groups/invitationrequests.php | 4 +- .../views/default/groups/membershiprequests.php | 4 +- mod/groups/views/default/groups/side_menu.php | 4 +- .../views/default/icon/group/default/large.php | 2 +- .../views/default/icon/group/default/medium.php | 2 +- .../views/default/icon/group/default/small.php | 2 +- .../views/default/icon/group/default/tiny.php | 2 +- .../views/default/object/groupforumtopic.php | 8 ++-- .../views/default/river/forum/topic/create.php | 2 +- .../views/default/invitefriends/form.php | 2 +- .../views/default/logbrowser/adminlinks.php | 2 +- mod/logbrowser/views/default/logbrowser/form.php | 2 +- .../views/default/members/members_navigation.php | 2 +- mod/members/views/default/members/search.php | 4 +- .../views/default/messageboard/css.php | 2 +- .../views/default/messageboard/forms/add.php | 2 +- .../default/messageboard/messageboard_content.php | 6 +-- .../views/default/widgets/messageboard/view.php | 6 +-- mod/messages/views/default/messages/css.php | 8 ++-- .../views/default/messages/forms/reply.php | 2 +- mod/messages/views/default/messages/forms/send.php | 4 +- mod/messages/views/default/messages/forms/view.php | 2 +- mod/messages/views/default/messages/menu.php | 2 +- mod/messages/views/default/messages/messages.php | 12 ++--- mod/messages/views/default/messages/topbar.php | 4 +- mod/messages/views/default/messages/view.php | 4 +- .../views/default/notifications/css.php | 8 ++-- .../default/notifications/subscriptions/form.php | 2 +- mod/pages/views/default/forms/pages/edit.php | 2 +- .../views/default/forms/pages/editwelcome.php | 2 +- .../views/default/icon/object/page/medium.php | 2 +- mod/pages/views/default/icon/object/page/small.php | 2 +- .../views/default/icon/object/page_top/medium.php | 2 +- .../views/default/icon/object/page_top/small.php | 2 +- mod/pages/views/default/pages/css.php | 30 ++++++------- mod/pages/views/default/pages/metatags.php | 6 +-- mod/pages/views/default/widgets/pages/view.php | 2 +- mod/profile/actions/cropicon.php | 2 +- .../views/default/icon/user/default/large.php | 2 +- .../views/default/icon/user/default/master.php | 2 +- .../views/default/icon/user/default/medium.php | 2 +- .../views/default/icon/user/default/small.php | 2 +- .../views/default/icon/user/default/tiny.php | 2 +- .../views/default/icon/user/default/topbar.php | 2 +- .../profile/commentwall/commentwall_content.php | 2 +- .../default/profile/commentwall/commentwalladd.php | 2 +- mod/profile/views/default/profile/css.php | 10 ++--- mod/profile/views/default/profile/edit.php | 2 +- .../views/default/profile/editdefaultprofile.php | 2 +- .../default/profile/editdefaultprofileitems.php | 10 ++--- mod/profile/views/default/profile/editicon.php | 6 +-- mod/profile/views/default/profile/icon.php | 8 ++-- .../views/default/profile/menu/adminlinks.php | 12 ++--- .../views/default/profile/menu/friendlinks.php | 4 +- .../views/default/profile/profile_ownerblock.php | 22 ++++----- .../views/default/profile/topbar_extend.php | 2 +- .../views/default/reportedcontent/css.php | 2 +- .../views/default/reportedcontent/footer_link.php | 2 +- .../views/default/reportedcontent/form.php | 2 +- .../views/default/reportedcontent/listing.php | 4 +- .../views/default/riverdashboard/container.php | 2 +- .../views/default/riverdashboard/css.php | 6 +-- .../views/default/riverdashboard/js.php | 4 +- .../views/default/riverdashboard/menu.php | 6 +-- .../views/default/riverdashboard/rivercomment.php | 2 +- .../views/default/riverdashboard/sitemessage.php | 6 +-- mod/search/views/default/search/listing.php | 2 +- mod/search/views/default/search/search_box.php | 2 +- .../views/default/sitepages/footer_menu.php | 6 +-- mod/sitepages/views/default/sitepages/menu.php | 2 +- mod/thewire/views/default/object/thewire.php | 8 ++-- .../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 +- .../views/default/thewire/profile_status.php | 2 +- mod/thewire/views/default/widgets/thewire/view.php | 2 +- mod/tinymce/views/default/input/longtext.php | 6 +-- mod/twitter/views/default/twitter/css.php | 4 +- .../views/default/admin/users/unvalidated.php | 2 +- .../uservalidationbyemail/unvalidated_user.php | 6 +-- .../default/file/specialcontent/audio/mp3.php | 6 +-- .../default/file/specialcontent/audio/mpeg.php | 6 +-- .../default/file/specialcontent/audio/mpg.php | 6 +-- views/default/account/forms/forgotten_password.php | 2 +- views/default/account/forms/login.php | 8 ++-- views/default/account/forms/login_dropdown.php | 10 ++--- .../default/account/forms/login_walled_garden.php | 8 ++-- views/default/account/forms/register.php | 2 +- views/default/account/forms/useradd.php | 2 +- views/default/admin/appearance/menu_items.php | 2 +- views/default/admin/components/plugin.php | 18 ++++---- views/default/admin/components/plugin_settings.php | 2 +- views/default/admin/plugins/simple.php | 4 +- views/default/annotation/generic_comment.php | 2 +- views/default/annotation/latest_comments.php | 2 +- views/default/annotation/likes.php | 2 +- views/default/canvas/layouts/administration.php | 18 ++++---- views/default/canvas/layouts/widgets.php | 18 ++++---- views/default/comments/forms/edit.php | 2 +- views/default/css.php | 52 +++++++++++----------- views/default/dashboard/blurb.php | 2 +- views/default/friends/collection.php | 4 +- views/default/friends/collectiontabs.php | 4 +- views/default/friends/forms/edit.php | 2 +- views/default/group/search/finishblurb.php | 2 +- views/default/input/autocomplete.php | 4 +- views/default/input/userpicker.php | 4 +- views/default/likes/forms/edit.php | 2 +- views/default/likes/forms/link.php | 2 +- views/default/object/default.php | 2 +- views/default/object/plugin.php | 2 +- views/default/output/tagcloud.php | 4 +- views/default/output/tags.php | 2 +- views/default/page_elements/content_header.php | 6 +-- views/default/page_elements/elgg_footer.php | 2 +- views/default/page_elements/elgg_header_logo.php | 2 +- views/default/page_elements/elgg_topbar.php | 6 +-- views/default/page_elements/elgg_topbar_logout.php | 2 +- views/default/page_elements/html_begin.php | 20 ++++----- views/default/page_elements/html_begin_admin.php | 12 ++--- views/default/page_shells/walled_garden.php | 18 ++++---- views/default/settings/system.php | 2 +- views/default/settings/upgrading.php | 4 +- views/default/user/search/finishblurb.php | 2 +- views/default/usersettings/form.php | 2 +- views/default/widgets/editwrapper.php | 4 +- views/default/widgets/wrapper.php | 2 +- views/foaf/page_shells/default.php | 2 +- views/foaf/user/default.php | 2 +- views/installation/install/header.php | 2 +- views/installation/install/nav.php | 2 +- views/installation/install/pages/complete.php | 2 +- views/installation/page_shells/default.php | 4 +- 187 files changed, 426 insertions(+), 426 deletions(-) diff --git a/mod/blog/views/default/blog/forms/edit.php b/mod/blog/views/default/blog/forms/edit.php index 3e7e29dee..88d41d269 100644 --- a/mod/blog/views/default/blog/forms/edit.php +++ b/mod/blog/views/default/blog/forms/edit.php @@ -64,7 +64,7 @@ if (isset ($vars['entity'])) { } // add a delete button if editing - $delete_url = "{$vars['url']}action/blog/delete?guid={$blog->getGUID()}"; + $delete_url = elgg_get_site_url()."action/blog/delete?guid={$blog->getGUID()}"; $delete_link = elgg_view('output/confirmlink', array( 'href' => $delete_url, 'text' => elgg_echo('delete'), @@ -219,7 +219,7 @@ ___END; echo elgg_view('input/form', array( 'internalid' => 'blog_post_edit', 'internalname' => 'blog_post', - 'action' => "{$vars['url']}action/blog/save", + 'action' => elgg_get_site_url()."action/blog/save", 'body' => $form_body )); @@ -265,7 +265,7 @@ elgg_clear_sticky_form('blog'); return false; } - var draftURL = "action/blog/auto_save_revision"; + var draftURL = "action/blog/auto_save_revision"; var postData = form.serializeArray(); // force draft status @@ -282,7 +282,7 @@ elgg_clear_sticky_form('blog'); // get a copy of the body to compare for auto save oldDescription = $('form[name=blog_post]').find('textarea[name=description]').val(); -/* we don't seems to be using the text counter anymoreÉ +/* we don't seems to be using the text counter anymore� $('#excerpt.excerpt').each(function(){ var allowed = 200; diff --git a/mod/blog/views/default/blog/sidebar_edit.php b/mod/blog/views/default/blog/sidebar_edit.php index 1efa17c23..3b884437f 100644 --- a/mod/blog/views/default/blog/sidebar_edit.php +++ b/mod/blog/views/default/blog/sidebar_edit.php @@ -27,7 +27,7 @@ if (elgg_instanceof($blog, 'object', 'blog') && $blog->canEdit()) { if ($revisions) { echo '