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 --- .../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 +- 18 files changed, 47 insertions(+), 47 deletions(-) (limited to 'mod/profile/views') diff --git a/mod/profile/views/default/icon/user/default/large.php b/mod/profile/views/default/icon/user/default/large.php index 3ce382532..ac28f8e9a 100644 --- a/mod/profile/views/default/icon/user/default/large.php +++ b/mod/profile/views/default/icon/user/default/large.php @@ -1,3 +1,3 @@ \ No newline at end of file diff --git a/mod/profile/views/default/icon/user/default/master.php b/mod/profile/views/default/icon/user/default/master.php index 7c5ea847c..129b0d375 100644 --- a/mod/profile/views/default/icon/user/default/master.php +++ b/mod/profile/views/default/icon/user/default/master.php @@ -1,3 +1,3 @@ \ No newline at end of file diff --git a/mod/profile/views/default/icon/user/default/medium.php b/mod/profile/views/default/icon/user/default/medium.php index d5f6db343..8815a65bc 100644 --- a/mod/profile/views/default/icon/user/default/medium.php +++ b/mod/profile/views/default/icon/user/default/medium.php @@ -1,3 +1,3 @@ \ No newline at end of file diff --git a/mod/profile/views/default/icon/user/default/small.php b/mod/profile/views/default/icon/user/default/small.php index 55f113c41..895aa15cc 100644 --- a/mod/profile/views/default/icon/user/default/small.php +++ b/mod/profile/views/default/icon/user/default/small.php @@ -1,3 +1,3 @@ \ No newline at end of file diff --git a/mod/profile/views/default/icon/user/default/tiny.php b/mod/profile/views/default/icon/user/default/tiny.php index e47cdd3da..866c61533 100644 --- a/mod/profile/views/default/icon/user/default/tiny.php +++ b/mod/profile/views/default/icon/user/default/tiny.php @@ -1,3 +1,3 @@ \ No newline at end of file diff --git a/mod/profile/views/default/icon/user/default/topbar.php b/mod/profile/views/default/icon/user/default/topbar.php index ad11588fa..0ff3dbaaa 100644 --- a/mod/profile/views/default/icon/user/default/topbar.php +++ b/mod/profile/views/default/icon/user/default/topbar.php @@ -1,3 +1,3 @@ \ No newline at end of file diff --git a/mod/profile/views/default/profile/commentwall/commentwall_content.php b/mod/profile/views/default/profile/commentwall/commentwall_content.php index 360627c0c..666c95a87 100644 --- a/mod/profile/views/default/profile/commentwall/commentwall_content.php +++ b/mod/profile/views/default/profile/commentwall/commentwall_content.php @@ -16,7 +16,7 @@ // if the user looking at the comment can edit, show the delete link if ($vars['annotation']->canEdit()) { echo "
" . elgg_view("output/confirmlink",array( - 'href' => $vars['url'] . "action/profile/deletecomment?annotation_id=" . $vars['annotation']->id, + 'href' => elgg_get_site_url() . "action/profile/deletecomment?annotation_id=" . $vars['annotation']->id, 'text' => elgg_echo('delete'), 'confirm' => elgg_echo('deleteconfirm'), )) . "
"; diff --git a/mod/profile/views/default/profile/commentwall/commentwalladd.php b/mod/profile/views/default/profile/commentwall/commentwalladd.php index a5765082c..dcb520ea1 100644 --- a/mod/profile/views/default/profile/commentwall/commentwalladd.php +++ b/mod/profile/views/default/profile/commentwall/commentwalladd.php @@ -4,7 +4,7 @@ */ ?>
-
+
diff --git a/mod/profile/views/default/profile/css.php b/mod/profile/views/default/profile/css.php index b65201b66..22ebaa8f1 100644 --- a/mod/profile/views/default/profile/css.php +++ b/mod/profile/views/default/profile/css.php @@ -272,7 +272,7 @@ ul#twitter_update_list { padding-left:0; } ul#twitter_update_list li { - background-image: url(mod/profile/graphics/speech_bubble_tail.gif); + background-image: url(mod/profile/graphics/speech_bubble_tail.gif); background-position:right bottom; background-repeat: no-repeat; list-style-image:none; @@ -298,7 +298,7 @@ ul#twitter_update_list li span a { display:inline !important; } p.visit_twitter a { - background:url(mod/profile/graphics/twitter16px.png) left no-repeat; + background:url(mod/profile/graphics/twitter16px.png) left no-repeat; padding:0 0 0 20px; margin:0; } @@ -406,17 +406,17 @@ p.visit_twitter a { bottom:0; } .avatar_menu_arrow { - background: url(_graphics/elgg_sprites.png) no-repeat -150px top; + background: url(_graphics/elgg_sprites.png) no-repeat -150px top; width:15px; height:15px; } .avatar_menu_arrow_on { - background: url(_graphics/elgg_sprites.png) no-repeat -150px -16px; + background: url(_graphics/elgg_sprites.png) no-repeat -150px -16px; width:15px; height:15px; } .avatar_menu_arrow_hover { - background: url(_graphics/elgg_sprites.png) no-repeat -150px -32px; + background: url(_graphics/elgg_sprites.png) no-repeat -150px -32px; width:15px; height:15px; } diff --git a/mod/profile/views/default/profile/edit.php b/mod/profile/views/default/profile/edit.php index 310536527..5e9cef774 100644 --- a/mod/profile/views/default/profile/edit.php +++ b/mod/profile/views/default/profile/edit.php @@ -8,7 +8,7 @@ * @uses $vars['profile'] Profile items from $CONFIG->profile, defined in profile/start.php for now */ ?> - +

" . elgg_echo('profile:explainchangefields') . "

"; -echo elgg_view('input/form', array('body' => $formbody, 'action' => $vars['url'] . 'action/profile/editdefault')); +echo elgg_view('input/form', array('body' => $formbody, 'action' => elgg_get_site_url() . 'action/profile/editdefault')); diff --git a/mod/profile/views/default/profile/editdefaultprofileitems.php b/mod/profile/views/default/profile/editdefaultprofileitems.php index dc15f0c50..368529118 100644 --- a/mod/profile/views/default/profile/editdefaultprofileitems.php +++ b/mod/profile/views/default/profile/editdefaultprofileitems.php @@ -1,6 +1,6 @@ - + +

@@ -30,7 +30,7 @@ $currentuser = get_loggedin_user();
- +


@@ -127,7 +127,7 @@ $currentuser = get_loggedin_user();

- + diff --git a/mod/profile/views/default/profile/icon.php b/mod/profile/views/default/profile/icon.php index 82404676e..71b25fe6c 100644 --- a/mod/profile/views/default/profile/icon.php +++ b/mod/profile/views/default/profile/icon.php @@ -46,7 +46,7 @@ if ($vars['entity'] instanceof ElggUser) { if (!$override) { ?>
-
+

name; ?> username; ?>

@@ -67,10 +67,10 @@ if ($vars['entity'] instanceof ElggUser) { // if looking at your own avatar menu - provide a couple of handy links ?>
  • - +
  • - +
    • - alt="name, ENT_QUOTES, 'UTF-8'); ?>" title="name, ENT_QUOTES, 'UTF-8'); ?>" style="background: url(getIcon($vars['size']); ?>) no-repeat;" class="" /> + alt="name, ENT_QUOTES, 'UTF-8'); ?>" title="name, ENT_QUOTES, 'UTF-8'); ?>" style="background: url(getIcon($vars['size']); ?>) no-repeat;" class="" /> pg/settings/user/username; ?>/"> isBanned()) { - echo elgg_view('output/confirmlink', array('text' => elgg_echo("ban"), 'href' => "{$vars['url']}action/admin/user/ban?guid={$vars['entity']->guid}")); + echo elgg_view('output/confirmlink', array('text' => elgg_echo("ban"), 'href' => elgg_get_site_url()."action/admin/user/ban?guid={$vars['entity']->guid}")); } else { - echo elgg_view('output/confirmlink', array('text' => elgg_echo("unban"), 'href' => "{$vars['url']}action/admin/user/unban?guid={$vars['entity']->guid}")); + echo elgg_view('output/confirmlink', array('text' => elgg_echo("unban"), 'href' => elgg_get_site_url()."action/admin/user/unban?guid={$vars['entity']->guid}")); } - echo elgg_view('output/confirmlink', array('text' => elgg_echo("delete"), 'href' => "{$vars['url']}action/admin/user/delete?guid={$vars['entity']->guid}")); - echo elgg_view('output/confirmlink', array('text' => elgg_echo("resetpassword"), 'href' => "{$vars['url']}action/admin/user/resetpassword?guid={$vars['entity']->guid}")); + echo elgg_view('output/confirmlink', array('text' => elgg_echo("delete"), 'href' => elgg_get_site_url()."action/admin/user/delete?guid={$vars['entity']->guid}")); + echo elgg_view('output/confirmlink', array('text' => elgg_echo("resetpassword"), 'href' => elgg_get_site_url()."action/admin/user/resetpassword?guid={$vars['entity']->guid}")); if (!$vars['entity']->isAdmin()) { - echo elgg_view('output/confirmlink', array('text' => elgg_echo("makeadmin"), 'href' => "{$vars['url']}action/admin/user/makeadmin?guid={$vars['entity']->guid}")); + echo elgg_view('output/confirmlink', array('text' => elgg_echo("makeadmin"), 'href' => elgg_get_site_url()."action/admin/user/makeadmin?guid={$vars['entity']->guid}")); } else { - echo elgg_view('output/confirmlink', array('text' => elgg_echo("removeadmin"), 'href' => "{$vars['url']}action/admin/user/removeadmin?guid={$vars['entity']->guid}")); + echo elgg_view('output/confirmlink', array('text' => elgg_echo("removeadmin"), 'href' => elgg_get_site_url()."action/admin/user/removeadmin?guid={$vars['entity']->guid}")); } } } diff --git a/mod/profile/views/default/profile/menu/friendlinks.php b/mod/profile/views/default/profile/menu/friendlinks.php index ce3af5a3c..f9e72dd4f 100644 --- a/mod/profile/views/default/profile/menu/friendlinks.php +++ b/mod/profile/views/default/profile/menu/friendlinks.php @@ -10,13 +10,13 @@ $ts = time(); $token = generate_action_token($ts); if ($vars['entity']->isFriend()) { echo elgg_view('output/confirmlink', array( - 'href' => "{$vars['url']}action/friends/remove?friend={$vars['entity']->getGUID()}", + 'href' => elgg_get_site_url()."action/friends/remove?friend={$vars['entity']->getGUID()}", 'text' => elgg_echo('friend:remove'), 'class' => 'remove_friend' )); } else { echo elgg_view('output/confirmlink', array( - 'href' => "{$vars['url']}action/friends/add?friend={$vars['entity']->getGUID()}", + 'href' => elgg_get_site_url()."action/friends/add?friend={$vars['entity']->getGUID()}", 'text' => elgg_echo('friend:add'), 'class' => 'add_friend' )); diff --git a/mod/profile/views/default/profile/profile_ownerblock.php b/mod/profile/views/default/profile/profile_ownerblock.php index 57c1dfb8b..f80f54cc2 100755 --- a/mod/profile/views/default/profile/profile_ownerblock.php +++ b/mod/profile/views/default/profile/profile_ownerblock.php @@ -38,26 +38,26 @@ if ($section == 'details') { $profile_actions = ""; if (isloggedin() && (get_loggedin_userid() == elgg_get_page_owner_guid())) { $profile_actions = "
    "; - $profile_actions .= "username}/edit/details' class='action_button'>". elgg_echo('profile:edit') .""; - $profile_actions .= "username}/edit/icon' class='action_button'>". elgg_echo('profile:editicon') .""; + $profile_actions .= "". elgg_echo('profile:edit') .""; + $profile_actions .= "". elgg_echo('profile:editicon') .""; $profile_actions .= "
    "; } else { $profile_actions = "
    "; if (isloggedin()) { if (get_loggedin_userid() != $user->getGUID()) { if ($user->isFriend()) { - $url = "{$vars['url']}action/friends/remove?friend={$user->getGUID()}"; + $url = elgg_get_site_url()."action/friends/remove?friend={$user->getGUID()}"; $url = elgg_add_action_tokens_to_url($url); $profile_actions .= "" . elgg_echo('friend:remove') . ""; } else { - $url = "{$vars['url']}action/friends/add?friend={$user->getGUID()}"; + $url = elgg_get_site_url()."action/friends/add?friend={$user->getGUID()}"; $url = elgg_add_action_tokens_to_url($url); $profile_actions .= "" . elgg_echo('friend:add') . ""; } } } if (is_plugin_enabled('messages') && isloggedin()) { - $profile_actions .= "guid}\" class='action_button'>". elgg_echo('messages:send') .""; + $profile_actions .= "guid}\" class='action_button'>". elgg_echo('messages:send') .""; } $profile_actions .= "
    "; } @@ -78,32 +78,32 @@ if (isadminloggedin()) { //check tools are enabled - hard-coded for phase1 // @todo - provide a view to extend for profile pages ownerblock tool-links if(is_plugin_enabled('blog')){ - $blog_link = "
  • Blog
    • "; + $blog_link = "
  • Blog
    • "; }else{ $blog_link = ""; } if(is_plugin_enabled('bookmarks')){ - $bookmark_link = "
  • Bookmarks
    • "; + $bookmark_link = "
  • Bookmarks
    • "; }else{ $bookmark_link = ""; } if(is_plugin_enabled('document')){ - $docs_link = "
  • Documents
    • "; + $docs_link = "
  • Documents
    • "; }else{ $docs_link = ""; } if(is_plugin_enabled('feeds')){ - $feeds_link = "
  • Feeds
    • "; + $feeds_link = "
  • Feeds
    • "; }else{ $feeds_link = ""; } if(is_plugin_enabled('tidypics')){ - $tidypics_link = "
  • Photos
    • "; + $tidypics_link = "
  • Photos
    • "; }else{ $tidypics_link = ""; } if(is_plugin_enabled('videolist')){ - $video_link = "
  • Videos
    • "; + $video_link = "
  • Videos
    • "; }else{ $video_link = ""; } diff --git a/mod/profile/views/default/profile/topbar_extend.php b/mod/profile/views/default/profile/topbar_extend.php index c1c4e13bb..dd38b9557 100644 --- a/mod/profile/views/default/profile/topbar_extend.php +++ b/mod/profile/views/default/profile/topbar_extend.php @@ -7,5 +7,5 @@ $user = get_loggedin_user(); if (($user instanceof ElggUser) && ($user->guid > 0)) { $friends = elgg_echo('friends'); - echo "username}\" title=\"$friends\">$friends"; + echo "username}\" title=\"$friends\">$friends"; } -- cgit v1.2.3