*
* @param string $title The title
* @return string The optimised title
+ * @deprecated 1.8
*/
function friendly_title($title) {
- return elgg_view('output/friendlytitle', array('title' => $title));
+ elgg_deprecated_notice('friendly_title was deprecated by elgg_get_friendly_title', 1.8);
+ return elgg_get_friendly_title($title);
+}
+
+/**
+ * When given a title, returns a version suitable for inclusion in a URL
+ *
+ * @todo add plugin hook so that developers can provide their own friendly title
+ * @param string $title The title
+ * @return string The optimised title
+ * @since 1.7.2
+ */
+function elgg_get_friendly_title($title) {
+ //$title = iconv('UTF-8', 'ASCII//TRANSLIT', $title);
+ $title = preg_replace("/[^\w ]/","",$title);
+ $title = str_replace(" ","-",$title);
+ $title = str_replace("--","-",$title);
+ $title = trim($title);
+ $title = strtolower($title);
+ return $title;
}
/**
*
* @param int $time A UNIX epoch timestamp
* @return string The friendly time
+ * @deprecated 1.8
*/
function friendly_time($time) {
+ elgg_deprecated_notice('friendly_time was deprecated by elgg_view_friendly_time', 1.8);
+ return elgg_view_friendly_time($time);
+}
+
+/**
+ * Displays a UNIX timestamp in a friendly way (eg "less than a minute ago")
+ *
+ * @todo add plugin hook so that developers can provide their own friendly time
+ * @param int $time A UNIX epoch timestamp
+ * @return string The friendly time
+ * @since 1.7.2
+ */
+function elgg_get_friendly_time($time) {
+ $diff = time() - (int)$time;
+
+ $minute = 60;
+ $hour = $minute * 60;
+ $day = $hour * 24;
+
+ if ($diff < $minute) {
+ return elgg_echo("friendlytime:justnow");
+ } else if ($diff < $hour) {
+ $diff = round($diff / $minute);
+ if ($diff == 0) {
+ $diff = 1;
+ }
+
+ if ($diff > 1) {
+ return sprintf(elgg_echo("friendlytime:minutes"), $diff);
+ } else {
+ return sprintf(elgg_echo("friendlytime:minutes:singular"), $diff);
+ }
+ } else if ($diff < $day) {
+ $diff = round($diff / $hour);
+ if ($diff == 0) {
+ $diff = 1;
+ }
+
+ if ($diff > 1) {
+ return sprintf(elgg_echo("friendlytime:hours"), $diff);
+ } else {
+ return sprintf(elgg_echo("friendlytime:hours:singular"), $diff);
+ }
+ } else {
+ $diff = round($diff / $day);
+ if ($diff == 0) {
+ $diff = 1;
+ }
+
+ if ($diff > 1) {
+ return sprintf(elgg_echo("friendlytime:days"), $diff);
+ } else {
+ return sprintf(elgg_echo("friendlytime:days:singular"), $diff);
+ }
+ }
+}
+
+/**
+ * Displays a UNIX timestamp in a friendly way
+ *
+ * @param int $time A UNIX epoch timestamp
+ * @return string The friendly time HTML
+ * @since 1.7.2
+ */
+function elgg_view_friendly_time($time) {
return elgg_view('output/friendlytime', array('time' => $time));
}
return FALSE;
}
- $friendly_title = friendly_title($entity->title);
+ $friendly_title = elgg_get_friendly_title($entity->title);
$url = "{$CONFIG->site->url}pg/blog/{$user->username}/read/{$entity->getGUID()}/$friendly_title";
return $url;
$load_base_url = "{$vars['url']}pg/blog/{$owner->username}/edit/{$blog->getGUID()}/";
foreach ($revisions as $revision) {
- $time = friendly_time($revision->time_created);
+ $time = elgg_view_friendly_time($revision->time_created);
$load = elgg_view('output/url', array(
'href' => $load_base_url . $revision->id,
'text' => elgg_echo('load')
'text' => elgg_echo('blog:status:published')
));
- $time = "<span class='entity_subtext'>".friendly_time($blog->publish_date)."</span>";
+ $time = "<span class='entity_subtext'>".elgg_view_friendly_time($blog->publish_date)."</span>";
echo '<li>
' . $load . ": $time
}
foreach ($revisions as $revision) {
- $time = "<span class='entity_subtext'>".friendly_time($revision->time_created)."</span>";
+ $time = "<span class='entity_subtext'>".elgg_view_friendly_time($revision->time_created)."</span>";
if ($revision->name == 'blog_auto_save') {
$revision_lang = elgg_echo('blog:auto_saved_revision');
} else {
}else{
$tags = "";
}
-$date = friendly_time($blog->publish_date);
+$date = elgg_view_friendly_time($blog->publish_date);
// The "on" status changes for comments, so best to check for !Off
if ($blog->comments_on != 'Off') {
$url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
$title = sprintf(elgg_echo('blog:river:create'), $url);
-$string .= $title . " <a href=\"{$object->getURL()}\">{$object->title}</a> <span class='entity_subtext'>" . friendly_time($object->time_created);
+$string .= $title . " <a href=\"{$object->getURL()}\">{$object->title}</a> <span class='entity_subtext'>" . elgg_view_friendly_time($object->time_created);
if (isloggedin()) {
$string .= '<a class="river_comment_form_button link">' . elgg_echo('generic_comments:text') . '</a>';
global $CONFIG;
$title = $entity->title;
- $title = friendly_title($title);
+ $title = elgg_get_friendly_title($title);
return $CONFIG->url . "pg/bookmarks/" . $entity->getOwnerEntity()->username . "/read/" . $entity->getGUID() . "/" . $title;
-
}
/**
$owner = $b->getOwnerEntity();
//get the time
- $friendlytime = friendly_time($b->time_created);
+ $friendlytime = elgg_view_friendly_time($b->time_created);
$info = "<div class='entity_listing_icon'>" . elgg_view('profile/icon',array('entity' => $b->getOwnerEntity(), 'size' => 'tiny')) . "</div>";
<?php
/**
* Elgg bookmark view
- *
+ *
* @package ElggBookmarks
* @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
* @author Curverider <info@elgg.com>
*/
$owner = $vars['entity']->getOwnerEntity();
-$friendlytime = friendly_time($vars['entity']->time_created);
+$friendlytime = elgg_view_friendly_time($vars['entity']->time_created);
$parsed_url = parse_url($vars['entity']->address);
$faviconurl = $parsed_url['scheme'] . "://" . $parsed_url['host'] . "/favicon.ico";
//delete
if($vars['entity']->canEdit()){
-$delete .= "<span class='delete_button'>" . elgg_view('output/confirmlink',array(
+$delete .= "<span class='delete_button'>" . elgg_view('output/confirmlink',array(
'href' => $vars['url'] . "action/bookmarks/delete?bookmark_guid=" . $vars['entity']->guid,
'text' => elgg_echo("delete"),
'confirm' => elgg_echo("bookmarks:delete:confirm"),
// include a view for plugins to extend
$info .= elgg_view("bookmarks/options",array('entity' => $vars['entity']));
$info .= elgg_view_likes($vars['entity']); // include likes
-
+
//include edit and delete options
if($vars['entity']->canEdit()){
$info .= "<span class='entity_edit'><a href=\"{$vars['url']}pg/bookmarks/{$owner->username}/edit/{$vars['entity']->getGUID()}\">" . elgg_echo('edit') . "</a></span>";
- $info .= $delete;
+ $info .= $delete;
}
$info .= "</div>";
if($view_notes != ''){
$info .= "<div class='note hidden'>". $vars['entity']->description . "</div>";
}
-
+
//display
echo elgg_view_listing($icon, $info);
\ No newline at end of file
if(($is_group instanceof ElggGroup) && (get_context() != 'groups')){
$string .= " " . elgg_echo('bookmarks:ingroup') . " <a href=\"{$is_group->getURL()}\">" . $is_group->name . "</a>";
}
-$string .= " <span class='entity_subtext'>" . friendly_time($object->time_created);
+$string .= " <span class='entity_subtext'>" . elgg_view_friendly_time($object->time_created);
if (isloggedin()){
$string .= "<a class='river_comment_form_button link'>Comment</a>";
$string .= elgg_view('likes/forms/link', array('entity' => $object));
$owner = $b->getOwnerEntity();
//get the time
- $friendlytime = friendly_time($b->time_created);
+ $friendlytime = elgg_view_friendly_time($s->time_created);
//get the bookmark title
$info = "<div class='river_object_bookmarks_create'><p class=\"shares_title\"><a href=\"{$b->address}\">{$b->title}</a></p></div>";
$icon = "<img src=\"{$item->getIcon($icon_size)}\" />";
$info = "<p class='entity_title'>" . htmlentities($title, ENT_QUOTES, 'UTF-8') . "</p>";
-$info .= "<p class='entity_subtext'>" . friendly_time($vars['item']->time_created) . "</p>";
+$info .= "<p class='entity_subtext'>" . elgg_view_friendly_time($vars['item']->time_created) . "</p>";
// @todo is this approach better than inline js?
echo "<div class=\"embed_data\" id=\"embed_{$item->getGUID()}\">" . elgg_view_listing($icon, $info) . '</div>';
<?php
$file = $vars['entity'];
- $friendlytime = friendly_time($vars['entity']->time_created);
+ $friendlytime = elgg_view_friendly_time($vars['entity']->time_created);
$info = "<p class='entity_title'> <a href=\"{$file->getURL()}\">{$file->title}</a></p>";
$info .= "<p class='entity_subtext'>{$friendlytime}";
global $CONFIG;
$title = $entity->title;
- $title = friendly_title($title);
- return $CONFIG->url . "pg/file/" . $entity->getOwnerEntity()->username . "/read/" . $entity->getGUID() . "/" . $title;
-
+ $title = elgg_get_friendly_title($title);
+ return $CONFIG->url . "pg/file/" . $entity->getOwnerEntity()->username . "/read/" . $entity->getGUID() . "/" . $title;
}
// Make sure test_init is called on initialisation
<?php
-
+
// Files on group profile page
//check to make sure group files is activated
if($vars['entity']->files_enable != 'no'){
?>
-<div class="group_tool_widget files">
+<div class="group_tool_widget files">
<h3><?php echo elgg_echo("file:group"); ?></h3>
<?php
$number = (int) $vars['entity']->num_display;
if (!$number)
$number = 6;
-
+
//get the group's files
$files = elgg_get_entities(array('type' => 'object',
'subtype' => 'file',
'container_guid' => $vars['entity']->guid,
'limit' => $number
));
-
+
//if there are some files, go get them
if ($files) {
-
+
//display in list mode
foreach($files as $f){
-
+
$mime = $f->mimetype;
echo "<div class='entity_listing clearfloat'>";
echo "<div class='entity_listing_icon'><a href=\"{$f->getURL()}\">" . elgg_view("file/icon", array("mimetype" => $mime, 'thumbnail' => $f->thumbnail, 'file_guid' => $f->guid)) . "</a></div>";
echo "<div class='entity_listing_info'>";
echo "<p class='entity_title'>" . $f->title . "</p>";
- echo "<p class='entity_subtext'>" . friendly_time($f->time_created) . "</p>";
+ echo "<p class='entity_subtext'>" . elgg_view_friendly_time($f->time_created) . "</p>";
echo "</div></div>";
-
+
}
-
-
+
+
//get a link to the users files
$users_file_url = $vars['url'] . "pg/file/" . page_owner_entity()->username;
-
+
echo "<p><a href=\"{$users_file_url}\">" . elgg_echo('file:more') . "</a></p>";
-
+
} else {
-
+
echo "<p class='margin_top'>" . elgg_echo("file:none") . "</p>";
}
$title = $file->title;
$desc = $file->description;
$owner = $vars['entity']->getOwnerEntity();
- $friendlytime = friendly_time($vars['entity']->time_created);
+ $friendlytime = elgg_view_friendly_time($vars['entity']->time_created);
$mime = $file->mimetype;
if (!$title) {
//the page owner
$owner = $vars['entity']->owner_guid;
-
+
//the number of files to display
$number = (int) $vars['entity']->num_display;
if (!$number) {
$number = 4;
}
-
+
//get the layout view which is set by the user in the edit panel
$get_view = (int) $vars['entity']->gallery_list;
if (!$get_view || $get_view == 1) {
//get the user's files
$files = get_user_objects($vars['entity']->owner_guid, "file", $number, 0);
-
+
//if there are some files, go get them
if ($files) {
-
+
echo "<div id='filerepo_widget_layout'>";
-
+
if($view == "gallery"){
-
+
echo "<div class='filerepo_widget_galleryview'>";
-
+
//display in gallery mode
foreach($files as $f){
-
+
$mime = $f->mimetype;
echo "<a href=\"{$f->getURL()}\">" . elgg_view("file/icon", array("mimetype" => $mime, 'thumbnail' => $f->thumbnail, 'file_guid' => $f->guid)) . "</a>";
-
+
}
-
+
echo "</div>";
-
+
}else{
-
+
//display in list mode
foreach($files as $f){
-
+
$mime = $f->mimetype;
echo "<div class='filerepo_widget_singleitem clearfloat'>";
echo "<div class='filerepo_listview_icon'><a href=\"{$f->getURL()}\">" . elgg_view("file/icon", array("mimetype" => $mime, 'thumbnail' => $f->thumbnail, 'file_guid' => $f->guid)) . "</a></div>";
echo "<div class='filerepo_widget_content'>";
echo "<div class='filerepo_listview_title'><p class='filerepo_title'>" . $f->title . "</p></div>";
- echo "<div class='filerepo_listview_date'><p class='filerepo_timestamp'><small>" . friendly_time($f->time_created) . "</small></p></div>";
+ echo "<div class='filerepo_listview_date'><p class='filerepo_timestamp'><small>" . elgg_view_friendly_time($f->time_created) . "</small></p></div>";
echo "</div></div>";
-
+
}
-
+
}
-
-
+
+
//get a link to the users files
$users_file_url = $vars['url'] . "pg/file/" . get_user($f->owner_guid)->username;
-
+
echo "<div class='filerepo_widget_singleitem_more'><a href=\"{$users_file_url}\">" . elgg_echo('file:more') . "</a></div>";
echo "</div>";
-
-
+
+
} else {
-
+
echo "<p class='margin_top'>" . elgg_echo("file:none") . "</p>";
-
+
}
?>
\ No newline at end of file
global $CONFIG;
- $title = friendly_title($entity->name);
+ $title = elgg_get_friendly_title($entity->name);
return $CONFIG->url . "pg/groups/{$entity->guid}/$title/";
-
}
function groups_groupforumtopic_url($entity) {
}\r
\r
//display the date of the comment\r
- echo "<p class='entity_subtext'>" . friendly_time($vars['entity']->time_created) . "</p>";\r
+ echo "<p class='entity_subtext'>" . elgg_view_friendly_time($vars['entity']->time_created) . "</p>";\r
echo "</div>"; // close entity_listing_info\r
echo "</div>"; // close entity_listing.topic\r
\r
<?php
/**
* Elgg Groups latest discussion listing
- *
+ *
* @package ElggGroups
* @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
*/
-
+
//get the required variables
$title = htmlentities($vars['entity']->title, ENT_QUOTES, 'UTF-8');
//$description = get_entity($vars['entity']->description);
$topic_owner = get_user($vars['entity']->owner_guid);
$group = get_entity($vars['entity']->container_guid);
-$forum_created = friendly_time($vars['entity']->time_created);
+$forum_created = elgg_view_friendly_time($vars['entity']->time_created);
$counter = $vars['entity']->countAnnotations("generic_comment");
$last_post = $vars['entity']->getAnnotations("generic_comment", 1, 0, "desc");
//get the time and user
}else{
$info = "<p class='entity_subtext groups'>" . sprintf(elgg_echo('groups:forum:created'), $forum_created, $counter) . "<br />";
}
- if (($last_time) && ($u)) $info.= sprintf(elgg_echo('groups:lastupdated'), friendly_time($last_time), " <a href=\"" . $u->getURL() . "\">" . $u->name . "</a>");
+ if (($last_time) && ($u)) $info.= sprintf(elgg_echo('groups:lastupdated'),
elgg_view_friendly_time($last_time), " <a href=\"" . $u->getURL() . "\">" . $u->name . "</a>");
$info .= '</p>';
//get the group avatar
$icon = elgg_view("profile/icon",array('entity' => $u, 'size' => 'tiny'));
if ($group instanceof ElggGroup) {
$info .= "<p class='entity_title'><b>" . elgg_echo('group') . ":</b> <a href=\"{$group->getURL()}\">".htmlentities($group->name, ENT_QUOTES, 'UTF-8') ."</a></p>";
}
-
+
}else{
if($counter == 1){
$info = "<p class='entity_subtext groups'>" . sprintf(elgg_echo('groups:forum:created:single'), $forum_created, $counter) . "</p>";
'text' => " ",
'confirm' => elgg_echo('deleteconfirm'),
)) . "</div>";
-
- }
+
+ }
if (($last_time) && ($u)) {
- $info.= "<p class='entity_subtext'>" . elgg_echo('groups:updated') . " " . friendly_time($last_time) . " by <a href=\"" . $u->getURL() . "\">" . $u->name . "</a></p>";
+ $info.= "<p class='entity_subtext'>" . elgg_echo('groups:updated') . " " . elgg_view_friendly_time($last_time) . " by <a href=\"" . $u->getURL() . "\">" . $u->name . "</a></p>";
}
//get the user avatar
- $icon = elgg_view("profile/icon",array('entity' => $topic_owner, 'size' => 'tiny'));
+ $icon = elgg_view("profile/icon",array('entity' => $topic_owner, 'size' => 'tiny'));
}
-
+
//display
echo elgg_view_listing($icon, $info);
\ No newline at end of file
$url = $vars['url'] . "mod/groups/topicposts.php?topic=" . $forumtopic . "&group_guid=" . $group_guid;
$url_user = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
$string = sprintf(elgg_echo("groupforum:river:posted"),$url_user) . " ";
- $string .= elgg_echo("groupforum:river:annotate:create") . " | <a href=\"" . $url . "\">" . $object->title . "</a> <span class='entity_subtext'>". friendly_time($object->time_created) ."<a class='river_comment_form_button link' href=\"{$object_url}\">Visit discussion</a>";
+ $string .= elgg_echo("groupforum:river:annotate:create") . " | <a href=\"" . $url . "\">" . $object->title . "</a> <span class='entity_subtext'>".
elgg_view_friendly_time($object->time_created) ."<a class='river_comment_form_button link' href=\"{$object_url}\">Visit discussion</a>";
$string .= elgg_view('likes/forms/link', array('entity' => $object));
$string .= "</span>";
$string .= "<div class=\"river_content_display\">";
$string = sprintf(elgg_echo("groupforum:river:postedtopic"),$url_user) . ": ";
$string .= "<a href=\"" . $url . "\">" . $object->title . "</a>";
$string .= " " . elgg_echo('groups:ingroup') . " <a href=\"{$group->getURL()}\">" . $group->name . "</a>";
- $string .= " <span class='entity_subtext'>". friendly_time($object->time_created);
+ $string .= " <span class='entity_subtext'>". elgg_view_friendly_time($object->time_created);
if (isloggedin() && $object->status != "closed") {
$string .= '<a class="river_comment_form_button link">' . elgg_echo('generic_comments:text') . '</a>';
$string .= elgg_view('likes/forms/link', array('entity' => $object));
$url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
$string = sprintf(elgg_echo("groups:river:created"),$url) . " ";
$string .= " <a href=\"" . $object->getURL() . "\">" . $object->name . "</a>";
- $string .= " <span class='entity_subtext'>". friendly_time($object->time_created);
+ $string .= " <span class='entity_subtext'>". elgg_view_friendly_time($object->time_created);
if (isloggedin()) {
$string .= elgg_view('likes/forms/link', array('entity' => $object));
}
<!-- display the user's name who posted and the date/time -->
<p class="message_item_timestamp">
- <?php echo get_entity($vars['annotation']->owner_guid)->name . " " . friendly_time($vars['annotation']->time_created); ?>
+ <?php echo get_entity($vars['annotation']->owner_guid)->name . " " . elgg_view_friendly_time($vars['annotation']->time_created); ?>
</p>
<!-- output the actual comment -->
?>
<div class="entity_listing_icon"><?php echo $message_icon ?></div>
<div class="entity_listing_info"><p><?php echo $message_owner ?></p>
- <p class="entity_subtext"><?php echo friendly_time($vars['entity']->time_created); ?></p>
+ <p class="entity_subtext"><?php echo elgg_view_friendly_time($vars['entity']->time_created); ?></p>
</div>
</div>
foreach($vars['entity'] as $message) {
if ($message->owner_guid == $vars['user']->guid || $message->toId == $vars['user']->guid) {
-
+
//make sure to only display the messages that have not been 'deleted' (1 = deleted)
if($message->hiddenFrom != 1){
// check to see if the message has been read, if so, set the correct container class
$from = get_entity($message->fromId);
echo "<div class='entity_listing_icon'>".elgg_view("profile/icon",array('entity' => $from, 'size' => 'tiny'))."</div>";
// message block (message sender, message subject, delete checkbox)
- echo "<div class='entity_listing_info'><div class='message_sender'>".$from->name."<p class='entity_subtext'>".friendly_time($message->time_created)."</p></div>";
+ echo "<div class='entity_listing_info'><div class='message_sender'>".$from->name."<p class='entity_subtext'>".elgg_view_friendly_time($message->time_created)."</p></div>";
// display message subject
echo "<div class='message_subject'>";
// display delete button
'confirm' => elgg_echo('deleteconfirm'),
)) . "</span>";
echo "<p class='entity_title'><input type='checkbox' name=\"message_id[]\" value=\"{$message->guid}\" />";
- echo "<a href=\"{$message->getURL()}\">" . $message->title . "</a></p>";
+ echo "<a href=\"{$message->getURL()}\">" . $message->title . "</a></p>";
echo "</div></div></div>"; // close the message container
}//end of hiddenFrom if statement
- } // end of user check
+ } // end of user check
$counter++;
if ($counter == $limit) break;
//get the correct user entity
$user = get_entity($message->toId);
- echo "<div class='message sent clearfloat'>";
+ echo "<div class='message sent clearfloat'>";
//get the icon for the user the message was sent to
echo "<div class='entity_listing_icon'>".elgg_view("profile/icon",array('entity' => $user, 'size' => 'tiny'))."</div>";
- echo "<div class='entity_listing_info'><div class='message_sender'>".$_SESSION['user']->name."<p class='entity_subtext'>".friendly_time($message->time_created)."</p></div>";
+ echo "<div class='entity_listing_info'><div class='message_sender'>".$_SESSION['user']->name."<p class='entity_subtext'>".elgg_view_friendly_time($message->time_created)."</p></div>";
// display message subject
echo "<div class='message_subject'>";
//display the link to 'delete'
$owner = get_entity($owner_guid);
$rev = sprintf(elgg_echo('pages:revision'),
- friendly_time($annotation->time_created),
+ elgg_view_friendly_time($annotation->time_created),
"<a href=\"" . $owner->getURL() . "\">" . $owner->name ."</a>"
);
$info .= "<p class=\"owner_timestamp\">".sprintf(elgg_echo("pages:strapline"),
- friendly_time($time_updated),
+ elgg_view_friendly_time($time_updated),
"<a href=\"" . $owner->getURL() . "\">" . $owner->name ."</a>"
) . "</p>";
}
$owner = get_entity($owner_guid);
echo sprintf(elgg_echo("pages:strapline"),
- friendly_time($time_updated),
+ elgg_view_friendly_time($time_updated),
"<a href=\"" . $owner->getURL() . "\">" . $owner->name ."</a>"
);
$url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
$contents = strip_tags($object->description); //strip tags from the contents to stop large images etc blowing out the river view
$string = sprintf(elgg_echo("pages:river:created"),$url) . " ";
-$string .= elgg_echo("pages:river:create") . " <a href=\"" . $object->getURL() . "\">" . $object->title . "</a> <span class='entity_subtext'>". friendly_time($object->time_created) ."</span> <a class='river_comment_form_button link'>Comment</a>";
+$string .= elgg_echo("pages:river:create") . " <a href=\"" . $object->getURL() . "\">" . $object->title . "</a> <span class='entity_subtext'>".
elgg_view_friendly_time($object->time_created) ."</span> <a class='river_comment_form_button link'>Comment</a>";
$string .= elgg_view('likes/forms/link', array('entity' => $object));
$string .= "<div class=\"river_content_display\">";
$string .= elgg_make_excerpt($contents, 200);
?>
<!-- display the user's name who posted and the date/time -->
<p class="entity_subtext">
- <?php echo get_entity($vars['annotation']->owner_guid)->name . " " . friendly_time($vars['annotation']->time_created); ?>
+ <?php echo get_entity($vars['annotation']->owner_guid)->name . " " . elgg_view_friendly_time($vars['annotation']->time_created); ?>
</p>
<!-- output the actual comment -->
<?php echo elgg_view("output/longtext",array("value" => parse_urls($vars['annotation']->value))); ?>
$performed_by = get_entity($vars['item']->subject_guid); // $statement->getSubject();
$url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
- $string = sprintf(elgg_echo("profile:river:update"),$url) ." <span class='entity_subtext'>" . friendly_time($vars['item']->posted) . "</span>";
+ $string = sprintf(elgg_echo("profile:river:update"),$url) ." <span class='entity_subtext'>" . elgg_view_friendly_time($vars['item']->posted) . "</span>";
echo $string;
\ No newline at end of file
$performed_by = get_entity($vars['item']->subject_guid); // $statement->getSubject();
$url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
- $string = sprintf(elgg_echo("profile:river:update"),$url) ." <span class='entity_subtext'>" . friendly_time($vars['item']->posted) . "</span>";
+ $string = sprintf(elgg_echo("profile:river:update"),$url) ." <span class='entity_subtext'>" . elgg_view_friendly_time($vars['item']->posted) . "</span>";
?>
<?php
/**
* Elgg report content listing
- *
+ *
* @package ElggReportContent
* @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
* @author Curverider <info@elgg.com>
if($vars['entity']){
$id = 0;
foreach($vars['entity'] as $report){
-
+
// increment our id counter
$id++;
-
+
//get the user making the report
$user = get_user($report->owner_guid)->name;
$user_url = get_user($report->owner_guid)->getURL();
-
+
//find out if the report is current or archive
if($report->state == 'archived'){
$reportedcontent_background = "archived_report";
}else{
$reportedcontent_background = "active_report";
}
-
+
echo "<div class='admin_settings reported_content {$reportedcontent_background}'>";
echo "<div class='clearfloat controls'>";
if($report->state != 'archived')
echo "<a class='action_button' href=\"" . elgg_add_action_tokens_to_url($vars['url'] . "action/reportedcontent/archive?item={$report->guid}") . "\">" . elgg_echo('reportedcontent:archive') . "</a>";
echo "<a class='action_button disabled' href=\"" . elgg_add_action_tokens_to_url($vars['url'] . "action/reportedcontent/delete?item={$report->guid}") . "\" onclick=\"return confirm('" . elgg_echo('reportedcontent:areyousure') . "')\">" . elgg_echo('reportedcontent:delete') . "</a></div>";
- echo "<p><b>" . elgg_echo('reportedcontent:by') . ": </b><a href=\"{$user_url}\">" . $user . "</a>, " . friendly_time($report->time_created) . "</p>";
+ echo "<p><b>" . elgg_echo('reportedcontent:by') . ": </b><a href=\"{$user_url}\">" . $user . "</a>, " . elgg_view_friendly_time($report->time_created) . "</p>";
echo "<p><b>" . elgg_echo('reportedcontent:objecttitle') . ": </b>" . $report->title;
echo "<br /><a onclick=\"elgg_slide_toggle(this,'.reported_content','.container{$id}');\" class='details_link'>" . elgg_echo('reportedcontent:moreinfo') . "</a></p>";
echo "<div class='details container{$id} hidden'>";
echo "<p><b>" . elgg_echo('reportedcontent:reason') . ": </b>" .$report->description . "</p>";
echo "</div></div>";
}
-
+
} else {
echo "<p class='margin_top'>".elgg_echo('reportedcontent:none')."</p>";
}
\ No newline at end of file
echo "<div class='river_comment_contents'>";
echo "<a href=\"{$comment_owner_url}\">" . $comment_owner->name . '</a> <span class="twitter_anywhere">' . parse_urls($contents) . '</span>';
- echo "<span class='entity_subtext'>" . friendly_time($comment->time_created) . "</span>";
+ echo "<span class='entity_subtext'>" . elgg_view_friendly_time($comment->time_created) . "</span>";
echo "</div></div>";
}
\ No newline at end of file
echo "<div class='river_comment_contents'>";
echo "<a href=\"{$comment_owner_url}\">" . $comment_owner->name . '</a> <span class="elgg_excerpt">' . parse_urls($contents) . '</span>';
- echo "<span class='entity_subtext'>" . friendly_time($comment->time_created) . "</span>";
+ echo "<span class='entity_subtext'>" . elgg_view_friendly_time($comment->time_created) . "</span>";
echo "</div></div>";
$counter++;
}
if ($site_message) {
$mes = $site_message[0];
$message = $mes->description;
- $dateStamp = friendly_time($mes->time_created);
+ $dateStamp = elgg_view_friendly_time($mes->time_created);
$delete = elgg_view("output/confirmlink",array(
'href' => $vars['url'] . "action/riverdashboard/delete?message=" . $mes->guid,
'text' => elgg_echo('delete'),
$description = $entity->getVolatileData('search_matched_comment');
$tc = $entity->getVolatileData('search_matched_comment_time_created');;
-$time = friendly_time($tc);
+$time = elgg_view_friendly_time($tc);
echo <<<___END
<div class="search_listing clearfloat">
if (!$time) {
$tc = $entity->time_created;
$tu = $entity->time_updated;
- $time = friendly_time(($tu > $tc) ? $tu : $tc);
+ $time = elgg_view_friendly_time(($tu > $tc) ? $tu : $tc);
}
?>
<div class="search_listing clearfloat">
<p class="entity_subtext">
<?php
echo elgg_echo("thewire:wired") . " " . sprintf(elgg_echo("thewire:strapline"),
- friendly_time($vars['entity']->time_created)
+ elgg_view_friendly_time($vars['entity']->time_created)
);
echo " via " . elgg_echo($vars['entity']->method) . ".";
?>
$desc = $object->description;
//$desc = preg_replace('/\@([A-Za-z0-9\_\.\-]*)/i','@<a href="' . $vars['url'] . 'pg/thewire/$1">$1</a>',$desc);
$string .= parse_urls($desc);
-$string .= " <span class='entity_subtext'>" . friendly_time($object->time_created);
+$string .= " <span class='entity_subtext'>" . elgg_view_friendly_time($object->time_created);
if (isloggedin()){
$string .= "<a class='river_comment_form_button link'>Comment</a>";
$string .= elgg_view('likes/forms/link', array('entity' => $object));
if($latest_wire){
foreach($latest_wire as $lw){
$content = $lw->description;
- $time = "<p class='entity_subtext'> (" . friendly_time($lw->time_created) . ")</p>";
+ $time = "<p class='entity_subtext'> (" . elgg_view_friendly_time($lw->time_created) . ")</p>";
}
}
$comment = get_annotation($vars['item']->annotation_id)->value;
$url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
$string = sprintf(elgg_echo("river:posted:generic"),$url) . " ";
- $string .= elgg_echo("{$subtype}:river:annotate") . " <a href=\"{$object->getURL()}\">" . $title . "</a> <span class='entity_subtext'>". friendly_time($object->time_created) ."<a class='river_comment_form_button link'>Comment</a>";
+ $string .= elgg_echo("{$subtype}:river:annotate") . " <a href=\"{$object->getURL()}\">" . $title . "</a> <span class='entity_subtext'>".
elgg_view_friendly_time($object->time_created) ."<a class='river_comment_form_button link'>Comment</a>";
$string .= elgg_view('likes/forms/link', array('entity' => $object));
$string .= "</span>";
if(get_context() != 'riverdashboard'){
$title = $object->title;
$string = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a> ";
-$string .= elgg_echo("likes:river:annotate") . " <a href=\"{$object->getURL()}\">" . $title . "</a> <span class='entity_subtext'>" . friendly_time($object->time_created)."</span>";
+$string .= elgg_echo("likes:river:annotate") . " <a href=\"{$object->getURL()}\">" . $title . "</a> <span class='entity_subtext'>" . elgg_view_friendly_time($object->time_created)."</span>";
echo $string;
\ No newline at end of file
<p class="generic_comment_owner">
<a href="<?php echo $owner->getURL(); ?>"><?php echo $owner->name; ?></a>
<span class="entity_subtext">
- <?php echo friendly_time($vars['annotation']->time_created); ?>
+ <?php echo elgg_view_friendly_time($vars['annotation']->time_created); ?>
</span>
</p>
<!-- output the actual comment -->
$entity = get_entity($comment->entity_guid);
//comment owner
$comment_owner = get_user($comment->owner_guid);
- $friendlytime = friendly_time($comment->time_created); // get timestamp for comment
+ $friendlytime = elgg_view_friendly_time($comment->time_created); // get timestamp for comment
//set the title
if($entity->title){
?>
<p class="elgg_likes_owner">
<a href="<?php echo $owner->getURL(); ?>"><?php echo $owner->name; ?></a> <?php echo elgg_echo('likes:this') .
- " <span class=\"entity_subtext\">" . friendly_time($vars['annotation']->time_created) . "</span>"; ?>
+ " <span class=\"entity_subtext\">" . elgg_view_friendly_time($vars['annotation']->time_created) . "</span>"; ?>
</p>
</div>
</div>
\ No newline at end of file
}
$info .= "<div>".sprintf(elgg_echo("entity:default:strapline"),
- friendly_time($vars['entity']->time_created),
+ elgg_view_friendly_time($vars['entity']->time_created),
$ownertxt
);
* @uses string $vars['time'] Unix-style epoch timestamp
*/
-$diff = time() - ((int) $vars['time']);
-
-$minute = 60;
-$hour = $minute * 60;
-$day = $hour * 24;
-
-if ($diff < $minute) {
- $friendly_time = elgg_echo("friendlytime:justnow");
-} else if ($diff < $hour) {
- $diff = round($diff / $minute);
- if ($diff == 0) {
- $diff = 1;
- }
-
- if ($diff > 1) {
- $friendly_time = sprintf(elgg_echo("friendlytime:minutes"), $diff);
- } else {
- $friendly_time = sprintf(elgg_echo("friendlytime:minutes:singular"), $diff);
- }
-} else if ($diff < $day) {
- $diff = round($diff / $hour);
- if ($diff == 0) {
- $diff = 1;
- }
-
- if ($diff > 1) {
- $friendly_time = sprintf(elgg_echo("friendlytime:hours"), $diff);
- } else {
- $friendly_time = sprintf(elgg_echo("friendlytime:hours:singular"), $diff);
- }
-} else {
- $diff = round($diff / $day);
- if ($diff == 0) {
- $diff = 1;
- }
-
- if ($diff > 1) {
- $friendly_time = sprintf(elgg_echo("friendlytime:days"), $diff);
- } else {
- $friendly_time = sprintf(elgg_echo("friendlytime:days:singular"), $diff);
- }
-}
-
+$friendly_time = elgg_get_friendly_time($vars['time']);
$timestamp = htmlentities(date(elgg_echo('friendlytime:date_format'), $vars['time']));
echo "<acronym title=\"$timestamp\">$friendly_time</acronym>";
?>
<span class="entity_subtext">
(<?php
- echo friendly_time($vars['item']->posted);
+ echo elgg_view_friendly_time($vars['item']->posted);
?>)
</span>
</p>
?>
<span class="entity_subtext">
(<?php
- echo friendly_time($vars['item']->posted);
+ echo elgg_view_friendly_time($vars['item']->posted);
?>)
</span>
</p>
projects / lorea / elgg.git / commitdiff