Commit 022f91cb authored by Richard Mansfield's avatar Richard Mansfield
Browse files

Use clean profile urls on the users tab of the site stats page



Bug #1006634, part 3

This is for the anecdotal snippets like 'Most is Bob with 55', etc.

Change-Id: If353facdab7a18da46ccd5d499ccde325815ae85
Signed-off-by: default avatarRichard Mansfield <richard.mansfield@catalyst.net.nz>
parent f2b8d359
...@@ -270,7 +270,7 @@ function user_statistics($limit, $offset, &$sitedata) { ...@@ -270,7 +270,7 @@ function user_statistics($limit, $offset, &$sitedata) {
$data['tabletitle'] = get_string('userstatstabletitle', 'admin'); $data['tabletitle'] = get_string('userstatstabletitle', 'admin');
$maxfriends = get_records_sql_array(" $maxfriends = get_records_sql_array("
SELECT u.id, u.firstname, u.lastname, u.preferredname, SUM(f.friends) AS friends SELECT u.id, u.firstname, u.lastname, u.preferredname, u.urlid, SUM(f.friends) AS friends
FROM {usr} u INNER JOIN ( FROM {usr} u INNER JOIN (
SELECT DISTINCT(usr1) AS id, COUNT(usr1) AS friends SELECT DISTINCT(usr1) AS id, COUNT(usr1) AS friends
FROM {usr_friend} FROM {usr_friend}
...@@ -279,7 +279,7 @@ function user_statistics($limit, $offset, &$sitedata) { ...@@ -279,7 +279,7 @@ function user_statistics($limit, $offset, &$sitedata) {
FROM {usr_friend} FROM {usr_friend}
GROUP BY usr2 GROUP BY usr2
) f ON u.id = f.id ) f ON u.id = f.id
GROUP BY u.id, u.firstname, u.lastname, u.preferredname GROUP BY u.id, u.firstname, u.lastname, u.preferredname, u.urlid
ORDER BY friends DESC ORDER BY friends DESC
LIMIT 1", array()); LIMIT 1", array());
$maxfriends = $maxfriends[0]; $maxfriends = $maxfriends[0];
...@@ -289,7 +289,7 @@ function user_statistics($limit, $offset, &$sitedata) { ...@@ -289,7 +289,7 @@ function user_statistics($limit, $offset, &$sitedata) {
'statsmaxfriends', 'statsmaxfriends',
'admin', 'admin',
round($meanfriends, 1), round($meanfriends, 1),
get_config('wwwroot') . 'user/view.php?id=' . $maxfriends->id, profile_url($maxfriends),
hsc(display_name($maxfriends, null, true)), hsc(display_name($maxfriends, null, true)),
$maxfriends->friends $maxfriends->friends
); );
...@@ -298,10 +298,10 @@ function user_statistics($limit, $offset, &$sitedata) { ...@@ -298,10 +298,10 @@ function user_statistics($limit, $offset, &$sitedata) {
$data['strmaxfriends'] = get_string('statsnofriends', 'admin'); $data['strmaxfriends'] = get_string('statsnofriends', 'admin');
} }
$maxviews = get_records_sql_array(" $maxviews = get_records_sql_array("
SELECT u.id, u.firstname, u.lastname, u.preferredname, COUNT(v.id) AS views SELECT u.id, u.firstname, u.lastname, u.preferredname, u.urlid, COUNT(v.id) AS views
FROM {usr} u JOIN {view} v ON u.id = v.owner FROM {usr} u JOIN {view} v ON u.id = v.owner
WHERE \"owner\" <> 0 WHERE \"owner\" <> 0
GROUP BY u.id, u.firstname, u.lastname, u.preferredname GROUP BY u.id, u.firstname, u.lastname, u.preferredname, u.urlid
ORDER BY views DESC ORDER BY views DESC
LIMIT 1", array()); LIMIT 1", array());
$maxviews = $maxviews[0]; $maxviews = $maxviews[0];
...@@ -310,7 +310,7 @@ function user_statistics($limit, $offset, &$sitedata) { ...@@ -310,7 +310,7 @@ function user_statistics($limit, $offset, &$sitedata) {
'statsmaxviews', 'statsmaxviews',
'admin', 'admin',
$sitedata['viewsperuser'], $sitedata['viewsperuser'],
get_config('wwwroot') . 'user/view.php?id=' . $maxviews->id, profile_url($maxviews),
hsc(display_name($maxviews, null, true)), hsc(display_name($maxviews, null, true)),
$maxviews->views $maxviews->views
); );
...@@ -319,10 +319,10 @@ function user_statistics($limit, $offset, &$sitedata) { ...@@ -319,10 +319,10 @@ function user_statistics($limit, $offset, &$sitedata) {
$data['strmaxviews'] = get_string('statsnoviews', 'admin'); $data['strmaxviews'] = get_string('statsnoviews', 'admin');
} }
$maxgroups = get_records_sql_array(" $maxgroups = get_records_sql_array("
SELECT u.id, u.firstname, u.lastname, u.preferredname, COUNT(m.group) AS groups SELECT u.id, u.firstname, u.lastname, u.preferredname, u.urlid, COUNT(m.group) AS groups
FROM {usr} u JOIN {group_member} m ON u.id = m.member JOIN {group} g ON m.group = g.id FROM {usr} u JOIN {group_member} m ON u.id = m.member JOIN {group} g ON m.group = g.id
WHERE g.deleted = 0 WHERE g.deleted = 0
GROUP BY u.id, u.firstname, u.lastname, u.preferredname GROUP BY u.id, u.firstname, u.lastname, u.preferredname, u.urlid
ORDER BY groups DESC ORDER BY groups DESC
LIMIT 1", array()); LIMIT 1", array());
$maxgroups = $maxgroups[0]; $maxgroups = $maxgroups[0];
...@@ -331,7 +331,7 @@ function user_statistics($limit, $offset, &$sitedata) { ...@@ -331,7 +331,7 @@ function user_statistics($limit, $offset, &$sitedata) {
'statsmaxgroups', 'statsmaxgroups',
'admin', 'admin',
$sitedata['groupmemberaverage'], $sitedata['groupmemberaverage'],
get_config('wwwroot') . 'user/view.php?id=' . $maxgroups->id, profile_url($maxgroups),
hsc(display_name($maxgroups, null, true)), hsc(display_name($maxgroups, null, true)),
$maxgroups->groups $maxgroups->groups
); );
...@@ -340,7 +340,7 @@ function user_statistics($limit, $offset, &$sitedata) { ...@@ -340,7 +340,7 @@ function user_statistics($limit, $offset, &$sitedata) {
$data['strmaxgroups'] = get_string('statsnogroups', 'admin'); $data['strmaxgroups'] = get_string('statsnogroups', 'admin');
} }
$maxquotaused = get_records_sql_array(" $maxquotaused = get_records_sql_array("
SELECT id, firstname, lastname, preferredname, quotaused SELECT id, firstname, lastname, preferredname, urlid, quotaused
FROM {usr} FROM {usr}
WHERE deleted = 0 AND id > 0 WHERE deleted = 0 AND id > 0
ORDER BY quotaused DESC ORDER BY quotaused DESC
...@@ -350,7 +350,7 @@ function user_statistics($limit, $offset, &$sitedata) { ...@@ -350,7 +350,7 @@ function user_statistics($limit, $offset, &$sitedata) {
'statsmaxquotaused', 'statsmaxquotaused',
'admin', 'admin',
display_size(get_field('usr', 'AVG(quotaused)', 'deleted', 0)), display_size(get_field('usr', 'AVG(quotaused)', 'deleted', 0)),
get_config('wwwroot') . 'user/view.php?id=' . $maxquotaused->id, profile_url($maxquotaused),
hsc(display_name($maxquotaused, null, true)), hsc(display_name($maxquotaused, null, true)),
display_size($maxquotaused->quotaused) display_size($maxquotaused->quotaused)
); );
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment