aboutsummaryrefslogtreecommitdiff
path: root/mod/reportedcontent
diff options
context:
space:
mode:
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-08-21 23:58:35 +0000
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-08-21 23:58:35 +0000
commit8a73785aee3e51c26c65053a4de7c5d7f0ebb673 (patch)
tree41e7e607886b0498a0d8d4dc79df6aaa5094d385 /mod/reportedcontent
parentb81f168b0bfc298c6eb1c0a2a857311f076c40bd (diff)
downloadelgg-8a73785aee3e51c26c65053a4de7c5d7f0ebb673.tar.gz
elgg-8a73785aee3e51c26c65053a4de7c5d7f0ebb673.tar.bz2
Merged r6586:6587 from 1.7 branch into trunk
git-svn-id: http://code.elgg.org/elgg/trunk@6842 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'mod/reportedcontent')
-rw-r--r--mod/reportedcontent/views/default/reportedcontent/listing.php14
1 files changed, 7 insertions, 7 deletions
diff --git a/mod/reportedcontent/views/default/reportedcontent/listing.php b/mod/reportedcontent/views/default/reportedcontent/listing.php
index 99069cb8c..33c546397 100644
--- a/mod/reportedcontent/views/default/reportedcontent/listing.php
+++ b/mod/reportedcontent/views/default/reportedcontent/listing.php
@@ -1,7 +1,7 @@
<?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>
@@ -12,27 +12,27 @@
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'>";
@@ -40,7 +40,7 @@ if($vars['entity']){
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