diff options
Diffstat (limited to 'mod/thewire')
-rw-r--r-- | mod/thewire/index.php | 30 | ||||
-rw-r--r-- | mod/thewire/views/default/object/thewire.php | 40 | ||||
-rw-r--r-- | mod/thewire/views/rss/object/thewire.php | 2 | ||||
-rw-r--r-- | mod/thewire/views/rss/search/object/thewire/entity.php | 2 |
4 files changed, 37 insertions, 37 deletions
diff --git a/mod/thewire/index.php b/mod/thewire/index.php index 41b8969aa..a1de242c5 100644 --- a/mod/thewire/index.php +++ b/mod/thewire/index.php @@ -2,37 +2,37 @@ /** * Elgg thewire index page - * + * * @package Elggthewire */ // Load Elgg engine require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php"); - + // Get the current page's owner $page_owner = elgg_get_page_owner(); if ($page_owner === false || is_null($page_owner)) { $page_owner = get_loggedin_user(); set_page_owner($page_owner->getGUID()); } - + // title if (elgg_get_page_owner_guid() == get_loggedin_userid()) { - $area2 = elgg_view_title(elgg_echo("thewire:read")); - } else { - $area2 = elgg_view_title(sprintf(elgg_echo("thewire:user"),$page_owner->name)); - } - + $area2 = elgg_view_title(elgg_echo("thewire:read")); + } else { + $area2 = elgg_view_title(elgg_echo("thewire:user",array($page_owner->name))); + } + //add form $area2 .= elgg_view("thewire/forms/add"); - + // Display the user's wire $area2 .= list_user_objects($page_owner->getGUID(),'thewire'); - - //select the correct canvas area - $body = elgg_view_layout("one_column_with_sidebar", $area2); - + + //select the correct canvas area + $body = elgg_view_layout("one_column_with_sidebar", $area2); + // Display page - echo elgg_view_page(sprintf(elgg_echo('thewire:user'),$page_owner->name),$body); - + echo elgg_view_page(elgg_echo('thewire:user', array($page_owner->name)), $body); + ?>
\ No newline at end of file diff --git a/mod/thewire/views/default/object/thewire.php b/mod/thewire/views/default/object/thewire.php index 4ef51cae6..a94d3a4aa 100644 --- a/mod/thewire/views/default/object/thewire.php +++ b/mod/thewire/views/default/object/thewire.php @@ -2,65 +2,65 @@ /** * Elgg Wire Posts Listings - * + * * @package thewire * * @question - do we want users to be able to edit thewire? - * + * * @uses $vars['entity'] Optionally, the note to view */ if (isset($vars['entity'])) { $user_name = $vars['entity']->getOwnerEntity()->name; - + //if the note is a reply, we need some more info $note_url = ''; - $note_owner = elgg_echo("thewire:notedeleted"); + $note_owner = elgg_echo("thewire:notedeleted"); ?> <div class="wire_post"> <div class="wire_post_contents clearfix radius8"> - <div class="wire_post_icon"> - <?php - echo elgg_view("profile/icon",array('entity' => $vars['entity']->getOwnerEntity(), 'size' => 'tiny')); - ?> - </div> + <div class="wire_post_icon"> + <?php + echo elgg_view("profile/icon",array('entity' => $vars['entity']->getOwnerEntity(), 'size' => 'tiny')); + ?> + </div> <div class="wire_post_options"> <?php if(isloggedin()){ ?> <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 + <?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( + echo "<span class='delete_button'>" . elgg_view("output/confirmlink",array( 'href' => "action/thewire/delete?thewirepost=" . $vars['entity']->getGUID(), 'text' => elgg_echo('delete'), 'confirm' => elgg_echo('deleteconfirm'), )) . "</span>"; } ?> - </div> - + </div> + <div class="wire_post_info"> <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="' . elgg_get_site_url() . 'pg/thewire/$1">$1</a>',$desc); + $desc = $vars['entity']->description; + //$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"> + <p class="entity_subtext"> <?php - echo elgg_echo("thewire:wired") . " " . sprintf(elgg_echo("thewire:strapline"), - elgg_view_friendly_time($vars['entity']->time_created) + echo elgg_echo("thewire:wired") . " " . elgg_echo("thewire:strapline", + array(elgg_view_friendly_time($vars['entity']->time_created)) ); echo ' '; - echo sprintf(elgg_echo('thewire:via_method'), elgg_echo($vars['entity']->method)); + echo elgg_echo('thewire:via_method', array(elgg_echo($vars['entity']->method))); echo '.'; ?> - </p> + </p> </div> </div> </div> diff --git a/mod/thewire/views/rss/object/thewire.php b/mod/thewire/views/rss/object/thewire.php index 23a11a9d3..fbbb670b7 100644 --- a/mod/thewire/views/rss/object/thewire.php +++ b/mod/thewire/views/rss/object/thewire.php @@ -8,7 +8,7 @@ $owner = $vars['entity']->getOwnerEntity(); if ($owner) { - $title = sprintf(elgg_echo('thewire:by'), $owner->name); + $title = elgg_echo('thewire:by', array($owner->name)); } else { $subtitle = strip_tags($vars['entity']->description); $title = substr($subtitle,0,32); diff --git a/mod/thewire/views/rss/search/object/thewire/entity.php b/mod/thewire/views/rss/search/object/thewire/entity.php index 3d4a17b78..d9ea81ad1 100644 --- a/mod/thewire/views/rss/search/object/thewire/entity.php +++ b/mod/thewire/views/rss/search/object/thewire/entity.php @@ -12,7 +12,7 @@ if (!array_key_exists('entity', $vars)) { $owner = $vars['entity']->getOwnerEntity(); if ($owner) { - $title = sprintf(elgg_echo('thewire:by'), $owner->name); + $title = elgg_echo('thewire:by', array($owner->name)); } $description = $vars['entity']->getVolatileData('search_matched_description'); |