aboutsummaryrefslogtreecommitdiff
path: root/mod/groups
diff options
context:
space:
mode:
Diffstat (limited to 'mod/groups')
-rw-r--r--mod/groups/actions/addtogroup.php8
-rw-r--r--mod/groups/actions/invite.php4
-rw-r--r--mod/groups/actions/joinrequest.php4
-rw-r--r--mod/groups/activity.php2
-rw-r--r--mod/groups/all.php2
-rw-r--r--mod/groups/views/default/object/groupforumtopic.php56
-rw-r--r--mod/groups/views/default/river/forum/create.php4
-rw-r--r--mod/groups/views/default/river/forum/topic/create.php6
-rw-r--r--mod/groups/views/default/river/group/create.php4
-rw-r--r--mod/groups/views/default/river/object/groupforumtopic/annotate.php4
-rw-r--r--mod/groups/views/default/river/object/groupforumtopic/create.php4
-rw-r--r--mod/groups/views/default/river/object/groupforumtopic/update.php8
-rw-r--r--mod/groups/views/default/river/relationship/member/create.php2
13 files changed, 54 insertions, 54 deletions
diff --git a/mod/groups/actions/addtogroup.php b/mod/groups/actions/addtogroup.php
index dab44666d..346b6065e 100644
--- a/mod/groups/actions/addtogroup.php
+++ b/mod/groups/actions/addtogroup.php
@@ -51,8 +51,8 @@
// send welcome email
notify_user($user->getGUID(), $group->owner_guid,
- sprintf(elgg_echo('groups:welcome:subject'), $group->name),
- sprintf(elgg_echo('groups:welcome:body'), $user->name, $group->name, $group->getURL()),
+ elgg_echo('groups:welcome:subject', array($group->name)),
+ elgg_echo('groups:welcome:body', array($user->name, $group->name, $group->getURL())),
NULL);
system_message(elgg_echo('groups:addedtogroup'));
@@ -71,8 +71,8 @@
// Send email
$url = elgg_get_site_url()."pg/groups/invited?user_guid={$user->guid}&group_guid={$group->guid}";
if (notify_user($user->getGUID(), $group->owner_guid,
- sprintf(elgg_echo('groups:invite:subject'), $user->name, $group->name),
- sprintf(elgg_echo('groups:invite:body'), $user->name, $logged_in_user->name, $group->name, $url),
+ elgg_echo('groups:invite:subject', array($user->name, $group->name)),
+ elgg_echo('groups:invite:body', array($user->name, $logged_in_user->name, $group->name, $url)),
NULL))
system_message(elgg_echo("groups:userinvited"));
else
diff --git a/mod/groups/actions/invite.php b/mod/groups/actions/invite.php
index 9ab4f2440..6fe379fe1 100644
--- a/mod/groups/actions/invite.php
+++ b/mod/groups/actions/invite.php
@@ -40,8 +40,8 @@ if (sizeof($user_guid))
// Send email
$url = "{$CONFIG->url}pg/groups/invitations/{$user->username}";
if (notify_user($user->getGUID(), $group->owner_guid,
- sprintf(elgg_echo('groups:invite:subject'), $user->name, $group->name),
- sprintf(elgg_echo('groups:invite:body'), $user->name, $logged_in_user->name, $group->name, $url),
+ elgg_echo('groups:invite:subject', array($user->name, $group->name)),
+ elgg_echo('groups:invite:body', array($user->name, $logged_in_user->name, $group->name, $url)),
NULL))
system_message(elgg_echo("groups:userinvited"));
else
diff --git a/mod/groups/actions/joinrequest.php b/mod/groups/actions/joinrequest.php
index a3b372e65..f9bdf2f21 100644
--- a/mod/groups/actions/joinrequest.php
+++ b/mod/groups/actions/joinrequest.php
@@ -67,8 +67,8 @@ if (($group) && ($user) && (!$group->isMember($user)))
// Send email
$url = "{$CONFIG->url}mod/groups/membershipreq.php?group_guid={$group->guid}";
if (notify_user($group->owner_guid, $user->getGUID(),
- sprintf(elgg_echo('groups:request:subject'), $user->name, $group->name),
- sprintf(elgg_echo('groups:request:body'), $group->getOwnerEntity()->name, $user->name, $group->name, $user->getURL(), $url),
+ elgg_echo('groups:request:subject', array($user->name, $group->name)),
+ elgg_echo('groups:request:body', array($group->getOwnerEntity()->name, $user->name, $group->name, $user->getURL(), $url)),
NULL))
system_message(elgg_echo("groups:joinrequestmade"));
else
diff --git a/mod/groups/activity.php b/mod/groups/activity.php
index 4f436cca7..487af7e8d 100644
--- a/mod/groups/activity.php
+++ b/mod/groups/activity.php
@@ -50,7 +50,7 @@ if (count($entity_guids) > 0) {
$area1 .= elgg_view_title(elgg_echo('groups:activity'));
$area1 .= elgg_view("group_activity/extend");
$area1 .= "<div class='group_listings hide_comments'>".$river_items."</div>";
-$title = sprintf(elgg_echo("groups:activity"), elgg_get_page_owner()->name);
+$title = elgg_echo("groups:activity", array(elgg_get_page_owner()->name));
$body = elgg_view_layout('one_column_with_sidebar', $area1);
// Finally draw the page
diff --git a/mod/groups/all.php b/mod/groups/all.php
index da884bac7..1e7b93b65 100644
--- a/mod/groups/all.php
+++ b/mod/groups/all.php
@@ -54,7 +54,7 @@
$objects = "<div class='group_listings'>".$objects."</div>";
- $title = sprintf(elgg_echo("groups:all"), elgg_get_page_owner()->name);
+ $title = elgg_echo("groups:all", array(elgg_get_page_owner()->name));
if(isloggedin()){
$area1 .= elgg_view('page_elements/content_header', array('context' => "everyone", 'type' => 'groups', 'new_link' => "pg/groups/new"));
}
diff --git a/mod/groups/views/default/object/groupforumtopic.php b/mod/groups/views/default/object/groupforumtopic.php
index fb67797d3..4250e9aff 100644
--- a/mod/groups/views/default/object/groupforumtopic.php
+++ b/mod/groups/views/default/object/groupforumtopic.php
@@ -27,53 +27,53 @@ $u = get_user($last_user);
if (elgg_get_context() == "search") {
var_export($counter);
if($counter == 1){
- $info = "<p class='entity_subtext groups'>" . sprintf(elgg_echo('groups:forum:created:single'), $forum_created, $counter) . "<br />";
+ $info = "<p class='entity_subtext groups'>" . elgg_echo('groups:forum:created:single', array($forum_created, $counter)) . "<br />";
}else{
- $info = "<p class='entity_subtext groups'>" . sprintf(elgg_echo('groups:forum:created'), $forum_created, $counter) . "<br />";
+ $info = "<p class='entity_subtext groups'>" . elgg_echo('groups:forum:created', array($forum_created, $counter)) . "<br />";
}
- 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>';
+ if (($last_time) && ($u)) $info.= elgg_echo('groups:lastupdated', array(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'));
- //get the group and topic title
- $info .= "<p class='entity_subtext'><b>" . elgg_echo('groups:topic') . ":</b> <a href=\"".elgg_get_site_url()."mod/groups/topicposts.php?topic={$vars['entity']->guid}&group_guid={$group->guid}\">{$title}</a></p>";
- 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>";
- }
+ //get the group and topic title
+ $info .= "<p class='entity_subtext'><b>" . elgg_echo('groups:topic') . ":</b> <a href=\"".elgg_get_site_url()."mod/groups/topicposts.php?topic={$vars['entity']->guid}&group_guid={$group->guid}\">{$title}</a></p>";
+ 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>";
+ $info = "<p class='entity_subtext groups'>" . elgg_echo('groups:forum:created:single', array($forum_created, $counter)) . "</p>";
}else{
- $info = "<p class='entity_subtext groups'>" . sprintf(elgg_echo('groups:forum:created'), $forum_created, $counter) . "</p>";
+ $info = "<p class='entity_subtext groups'>" . elgg_echo('groups:forum:created', array($forum_created, $counter)) . "</p>";
}
- $info .= "<p class='entity_title'>" . elgg_echo('groups:started') . " " . $topic_owner->name . ": <a href=\"".elgg_get_site_url()."mod/groups/topicposts.php?topic={$vars['entity']->guid}&group_guid={$group->guid}\">{$title}</a></p>";
+ $info .= "<p class='entity_title'>" . elgg_echo('groups:started') . " " . $topic_owner->name . ": <a href=\"".elgg_get_site_url()."mod/groups/topicposts.php?topic={$vars['entity']->guid}&group_guid={$group->guid}\">{$title}</a></p>";
- if (groups_can_edit_discussion($vars['entity'], elgg_get_page_owner()->owner_guid)) {
- // display the delete link to those allowed to delete
- $info .= "<div class='entity_metadata'>";
+ if (groups_can_edit_discussion($vars['entity'], elgg_get_page_owner()->owner_guid)) {
+ // display the delete link to those allowed to delete
+ $info .= "<div class='entity_metadata'>";
$info .= '<span class="entity_edit">' . elgg_view("output/url", array(
- 'href' => "mod/groups/edittopic.php?group={$vars['entity']->container_guid}&topic={$vars['entity']->guid}",
- 'text' => elgg_echo('edit'),
- ));
+ 'href' => "mod/groups/edittopic.php?group={$vars['entity']->container_guid}&topic={$vars['entity']->guid}",
+ 'text' => elgg_echo('edit'),
+ ));
$info .= '</span>';
-
- // display the delete link to those allowed to delete
- $info .= '<span class="delete_button">' . elgg_view("output/confirmlink", array(
- 'href' => "action/groups/deletetopic?topic=" . $vars['entity']->guid . "&group=" . $vars['entity']->container_guid,
- 'text' => elgg_echo('delete'),
- 'confirm' => elgg_echo('deleteconfirm'),
- ));
+
+ // display the delete link to those allowed to delete
+ $info .= '<span class="delete_button">' . elgg_view("output/confirmlink", array(
+ 'href' => "action/groups/deletetopic?topic=" . $vars['entity']->guid . "&group=" . $vars['entity']->container_guid,
+ 'text' => elgg_echo('delete'),
+ 'confirm' => elgg_echo('deleteconfirm'),
+ ));
$info .= "</span></div>";
- }
+}
if (($last_time) && ($u)) {
$commenter_link = "<a href\"{$u->getURL()}\">$u->name</a>";
- $text = sprintf(elgg_echo('groups:lastcomment'), elgg_view_friendly_time($last_time), $commenter_link);
+ $text = elgg_echo('groups:lastcomment', array(elgg_view_friendly_time($last_time), $commenter_link));
$info .= "<p class='entity_subtext'>$text</p>";
}
- //get the user avatar
+ //get the user avatar
$icon = elgg_view("profile/icon",array('entity' => $topic_owner, 'size' => 'tiny'));
}
diff --git a/mod/groups/views/default/river/forum/create.php b/mod/groups/views/default/river/forum/create.php
index ce3638f15..69481e97e 100644
--- a/mod/groups/views/default/river/forum/create.php
+++ b/mod/groups/views/default/river/forum/create.php
@@ -11,12 +11,12 @@
$group_guid = $object->container_guid;
//grab the annotation, if one exists
if($vars['item']->annotation_id != 0) {
- $comment = get_annotation($vars['item']->annotation_id)->value;
+ $comment = get_annotation($vars['item']->annotation_id)->value;
}
$comment = strip_tags($comment);//this is so we don't get large images etc in the activity river
$url = elgg_get_site_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:posted", array($url_user)) . " ";
$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>";
diff --git a/mod/groups/views/default/river/forum/topic/create.php b/mod/groups/views/default/river/forum/topic/create.php
index bb38e1cf3..e595b1fdc 100644
--- a/mod/groups/views/default/river/forum/topic/create.php
+++ b/mod/groups/views/default/river/forum/topic/create.php
@@ -7,13 +7,13 @@
$group_guid = $object->container_guid;
$group = get_entity($group_guid);
$url = elgg_get_site_url() . "mod/groups/topicposts.php?topic=" . $forumtopic . "&group_guid=" . $group_guid;
- //$comment = $object->getAnnotations("group_topic_post", 1, 0, "asc");
+ //$comment = $object->getAnnotations("group_topic_post", 1, 0, "asc");
//foreach($comment as $c){
$contents = $object->description;
//}
$contents = strip_tags($contents);//this is so we don't get large images etc in the activity river
$url_user = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
- $string = sprintf(elgg_echo("groupforum:river:postedtopic"),$url_user) . ": ";
+ $string = elgg_echo("groupforum:river:postedtopic", array($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'>". elgg_view_friendly_time($object->time_created);
@@ -25,5 +25,5 @@
$string .= "<div class=\"river_content_display\">";
$string .= elgg_get_excerpt($contents, 200);
$string .= "</div>";
-
+
echo $string; \ No newline at end of file
diff --git a/mod/groups/views/default/river/group/create.php b/mod/groups/views/default/river/group/create.php
index aa9fef47a..ef0aaab1b 100644
--- a/mod/groups/views/default/river/group/create.php
+++ b/mod/groups/views/default/river/group/create.php
@@ -3,9 +3,9 @@
$performed_by = get_entity($vars['item']->subject_guid); // $statement->getSubject();
$object = get_entity($vars['item']->object_guid);
$objecturl = $object->getURL();
-
+
$url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
- $string = sprintf(elgg_echo("groups:river:create"), $url) . " ";
+ $string = elgg_echo("groups:river:create", array($url)) . " ";
$string .= " <a href=\"" . $object->getURL() . "\">" . $object->name . "</a>";
$string .= " <span class='entity_subtext'>". elgg_view_friendly_time($object->time_created);
if (isloggedin()) {
diff --git a/mod/groups/views/default/river/object/groupforumtopic/annotate.php b/mod/groups/views/default/river/object/groupforumtopic/annotate.php
index c6aa1e5ab..5456b8302 100644
--- a/mod/groups/views/default/river/object/groupforumtopic/annotate.php
+++ b/mod/groups/views/default/river/object/groupforumtopic/annotate.php
@@ -3,9 +3,9 @@
$statement = $vars['statement'];
$performed_by = $statement->getSubject();
$object = $statement->getObject();
-
+
$url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
- $string = sprintf(elgg_echo("groupforum:river:posted"),$url) . " ";
+ $string = elgg_echo("groupforum:river:posted", array($url)) . " ";
$string .= elgg_echo("groupforum:river:annotate:create") . " | <a href=\"" . $object->getURL() . "\">" . $object->title . "</a>";
//$string .= "<div class=\"river_content\">Title: " . $object->title . "</div>";
diff --git a/mod/groups/views/default/river/object/groupforumtopic/create.php b/mod/groups/views/default/river/object/groupforumtopic/create.php
index 7c7d89bad..d9bebc003 100644
--- a/mod/groups/views/default/river/object/groupforumtopic/create.php
+++ b/mod/groups/views/default/river/object/groupforumtopic/create.php
@@ -3,9 +3,9 @@
$statement = $vars['statement'];
$performed_by = $statement->getSubject();
$object = $statement->getObject();
-
+
$url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
- $string = sprintf(elgg_echo("groupforum:river:created"),$url) . " ";
+ $string = elgg_echo("groupforum:river:created", array($url)) . " ";
$string .= elgg_echo("groupforum:river:create") . " | <a href=\"" . $object->getURL() . "\">" . $object->title . "</a>";
//$string .= "<div class=\"river_content\">Discussion topic: " . $object->title . "</div>";
diff --git a/mod/groups/views/default/river/object/groupforumtopic/update.php b/mod/groups/views/default/river/object/groupforumtopic/update.php
index d13c2b61f..ba9b91d2c 100644
--- a/mod/groups/views/default/river/object/groupforumtopic/update.php
+++ b/mod/groups/views/default/river/object/groupforumtopic/update.php
@@ -3,11 +3,11 @@
$statement = $vars['statement'];
$performed_by = $statement->getSubject();
$object = $statement->getObject();
-
+
$url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
- $string = sprintf(elgg_echo("groupforum:river:updated"),$url) . " ";
- $string .= elgg_echo("groupforum:river:update") . " | <a href=\"" . $object->getURL() . "\">" . $object->title . "</a>";
-
+ $string = elgg_echo("groupforum:river:updated", array($url)) . " ";
+ $string .= elgg_echo("groupforum:river:update") . " | <a href=\"" . $object->getURL() . "\">" . $object->title . "</a>";
+
?>
<?php echo $string; ?> \ No newline at end of file
diff --git a/mod/groups/views/default/river/relationship/member/create.php b/mod/groups/views/default/river/relationship/member/create.php
index a568920cc..3ba191676 100644
--- a/mod/groups/views/default/river/relationship/member/create.php
+++ b/mod/groups/views/default/river/relationship/member/create.php
@@ -5,7 +5,7 @@
$objecturl = $object->getURL();
$url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
- $string = sprintf(elgg_echo("groups:river:member"),$url) . " ";
+ $string = elgg_echo("groups:river:member", array($url)) . " ";
$string .= " <a href=\"" . $object->getURL() . "\">" . $object->name . "</a>";
$string .= " <span class='entity_subtext'>". elgg_view_friendly_time($vars['item']->posted);
$string .= "</span>";
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-03 20:47:33 +0000