feature 2486: Add an admin view for rates by user
git-svn-id: http://piwigo.org/svn/trunk@12624 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rvelices
parent
f59e5bf46a
commit
2f87684e09
6 changed files with 346 additions and 4 deletions
|
|
@ -33,6 +33,14 @@ include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
|
||||||
// +-----------------------------------------------------------------------+
|
// +-----------------------------------------------------------------------+
|
||||||
check_status(ACCESS_ADMINISTRATOR);
|
check_status(ACCESS_ADMINISTRATOR);
|
||||||
|
|
||||||
|
|
||||||
|
include_once(PHPWG_ROOT_PATH.'admin/include/tabsheet.class.php');
|
||||||
|
$tabsheet = new tabsheet();
|
||||||
|
$tabsheet->add('rating', l10n('Photos'), get_root_url().'admin.php?page=rating');
|
||||||
|
$tabsheet->add('rating_user', l10n('Users'), get_root_url().'admin.php?page=rating_user');
|
||||||
|
$tabsheet->select('rating');
|
||||||
|
$tabsheet->assign();
|
||||||
|
|
||||||
// +-----------------------------------------------------------------------+
|
// +-----------------------------------------------------------------------+
|
||||||
// | initialization |
|
// | initialization |
|
||||||
// +-----------------------------------------------------------------------+
|
// +-----------------------------------------------------------------------+
|
||||||
|
|
|
||||||
212
admin/rating_user.php
Normal file
212
admin/rating_user.php
Normal file
|
|
@ -0,0 +1,212 @@
|
||||||
|
<?php
|
||||||
|
// +-----------------------------------------------------------------------+
|
||||||
|
// | Piwigo - a PHP based photo gallery |
|
||||||
|
// +-----------------------------------------------------------------------+
|
||||||
|
// | Copyright(C) 2008-2011 Piwigo Team http://piwigo.org |
|
||||||
|
// | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net |
|
||||||
|
// | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick |
|
||||||
|
// +-----------------------------------------------------------------------+
|
||||||
|
// | This program is free software; you can redistribute it and/or modify |
|
||||||
|
// | it under the terms of the GNU General Public License as published by |
|
||||||
|
// | the Free Software Foundation |
|
||||||
|
// | |
|
||||||
|
// | This program is distributed in the hope that it will be useful, but |
|
||||||
|
// | WITHOUT ANY WARRANTY; without even the implied warranty of |
|
||||||
|
// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
|
||||||
|
// | General Public License for more details. |
|
||||||
|
// | |
|
||||||
|
// | You should have received a copy of the GNU General Public License |
|
||||||
|
// | along with this program; if not, write to the Free Software |
|
||||||
|
// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
|
||||||
|
// | USA. |
|
||||||
|
// +-----------------------------------------------------------------------+
|
||||||
|
|
||||||
|
defined('PHPWG_ROOT_PATH') or die ("Hacking attempt!");
|
||||||
|
|
||||||
|
include_once(PHPWG_ROOT_PATH.'admin/include/tabsheet.class.php');
|
||||||
|
$tabsheet = new tabsheet();
|
||||||
|
$tabsheet->add('rating', l10n('Photos'), get_root_url().'admin.php?page=rating');
|
||||||
|
$tabsheet->add('rating_user', l10n('Users'), get_root_url().'admin.php?page=rating_user');
|
||||||
|
$tabsheet->select('rating_user');
|
||||||
|
$tabsheet->assign();
|
||||||
|
|
||||||
|
$filter_min_rates = 2;
|
||||||
|
if (isset($_GET['f_min_rates']))
|
||||||
|
{
|
||||||
|
$filter_min_rates = (int)$_GET['f_min_rates'];
|
||||||
|
}
|
||||||
|
|
||||||
|
global $conf;
|
||||||
|
$query = 'SELECT DISTINCT
|
||||||
|
u.'.$conf['user_fields']['id'].' AS id,
|
||||||
|
u.'.$conf['user_fields']['username'].' AS name,
|
||||||
|
ui.status
|
||||||
|
FROM '.USERS_TABLE.' AS u INNER JOIN '.USER_INFOS_TABLE.' AS ui
|
||||||
|
ON u.'.$conf['user_fields']['id'].' = ui.user_id';
|
||||||
|
|
||||||
|
$users_by_id = array();
|
||||||
|
$result = pwg_query($query);
|
||||||
|
while ($row = pwg_db_fetch_assoc($result))
|
||||||
|
{
|
||||||
|
$user = array(
|
||||||
|
'name' => $row['name'],
|
||||||
|
'anon' => is_autorize_status(ACCESS_CLASSIC, $row['status']) ? false : true
|
||||||
|
);
|
||||||
|
$users_by_id[(int)$row['id']] = $user;
|
||||||
|
}
|
||||||
|
|
||||||
|
$by_rate_model = array();
|
||||||
|
foreach($conf['rate_items'] as $rate)
|
||||||
|
{
|
||||||
|
$by_rate_model[$rate] = array();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
$by_user_rating_model = array( 'rates' => $by_rate_model);
|
||||||
|
|
||||||
|
$image_ids = array();
|
||||||
|
$by_user_ratings = array();
|
||||||
|
$query = '
|
||||||
|
SELECT * FROM '.RATE_TABLE.' ORDER by date DESC';
|
||||||
|
$result = pwg_query($query);
|
||||||
|
while ($row = pwg_db_fetch_assoc($result))
|
||||||
|
{
|
||||||
|
|
||||||
|
if (!isset($users_by_id[$row['user_id']]))
|
||||||
|
{
|
||||||
|
$users_by_id[$row['user_id']] = array('name' => '???'.$row['user_id'], 'anon' => false);
|
||||||
|
}
|
||||||
|
$user = $users_by_id[$row['user_id']];
|
||||||
|
if ($user['anon'])
|
||||||
|
{
|
||||||
|
$user_key = $user['name'].'('.$row['anonymous_id'].')';
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
$user_key = $user['name'];
|
||||||
|
}
|
||||||
|
$rating = & $by_user_ratings[$user_key];
|
||||||
|
if ( is_null($rating) )
|
||||||
|
{
|
||||||
|
$rating = $by_user_rating_model;
|
||||||
|
$rating['uid'] = (int)$row['user_id'];
|
||||||
|
$rating['aid'] = $user['anon'] ? $row['anonymous_id'] : '';
|
||||||
|
}
|
||||||
|
$rating['rates'][$row['rate']][] = array(
|
||||||
|
'id' => $row['element_id'],
|
||||||
|
'date' => $row['date'],
|
||||||
|
);
|
||||||
|
$image_ids[$row['element_id']] = 1;
|
||||||
|
unset($rating);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
$image_urls = array();
|
||||||
|
if (count($image_ids) > 0 )
|
||||||
|
{
|
||||||
|
$query = 'SELECT id, name, file, path, tn_ext
|
||||||
|
FROM '.IMAGES_TABLE.'
|
||||||
|
WHERE id IN ('.implode(',', array_keys($image_ids)).')';
|
||||||
|
$result = pwg_query($query);
|
||||||
|
while ($row = pwg_db_fetch_assoc($result))
|
||||||
|
{
|
||||||
|
$image_urls[ $row['id'] ] = array(
|
||||||
|
'tn' => get_thumbnail_url($row),
|
||||||
|
'page' => make_picture_url( array('image_id'=>$row['id'], 'image_file'=>$row['file']) ),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach($by_user_ratings as $id => &$rating)
|
||||||
|
{
|
||||||
|
$c=0; $s=0; $ss=0;
|
||||||
|
foreach($rating['rates'] as $rate => $rates)
|
||||||
|
{
|
||||||
|
$ct = count($rates);
|
||||||
|
$c += $ct;
|
||||||
|
$s += $ct * $rate;
|
||||||
|
$ss += $ct * $rate * $rate;
|
||||||
|
}
|
||||||
|
|
||||||
|
$var = ($ss - $s*$s/$c)/$c;
|
||||||
|
$rating += array(
|
||||||
|
'id' => $id,
|
||||||
|
'count' => $c,
|
||||||
|
'avg' => $s/$c,
|
||||||
|
'std' => sqrt($var),
|
||||||
|
'cv' => $s==0 ? -1 : sqrt($var)/($s/$c), // http://en.wikipedia.org/wiki/Coefficient_of_variation
|
||||||
|
);
|
||||||
|
}
|
||||||
|
unset($rating);
|
||||||
|
|
||||||
|
// filter
|
||||||
|
foreach($by_user_ratings as $id => $rating)
|
||||||
|
{
|
||||||
|
if ($rating['count'] <= $filter_min_rates)
|
||||||
|
{
|
||||||
|
unset($by_user_ratings[$id]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
function avg_compare($a, $b)
|
||||||
|
{
|
||||||
|
$d = $a['avg'] - $b['avg'];
|
||||||
|
return ($d==0) ? 0 : ($d<0 ? -1 : 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
function count_compare($a, $b)
|
||||||
|
{
|
||||||
|
$d = $a['count'] - $b['count'];
|
||||||
|
return ($d==0) ? 0 : ($d<0 ? -1 : 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
function std_compare($a, $b)
|
||||||
|
{
|
||||||
|
$d = $a['std'] - $b['std'];
|
||||||
|
return ($d==0) ? 0 : ($d<0 ? -1 : 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
function cv_compare($a, $b)
|
||||||
|
{
|
||||||
|
$d = $a['cv'] - $b['cv'];
|
||||||
|
return ($d==0) ? 0 : ($d<0 ? -1 : 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
$order_by_index=3;
|
||||||
|
if (isset($_GET['order_by']) and is_numeric($_GET['order_by']))
|
||||||
|
{
|
||||||
|
$order_by_index = $_GET['order_by'];
|
||||||
|
}
|
||||||
|
|
||||||
|
$available_order_by= array(
|
||||||
|
array(l10n('Average rate'), 'avg_compare'),
|
||||||
|
array(l10n('Number of rates'), 'count_compare'),
|
||||||
|
array('StDev', 'std_compare'),
|
||||||
|
array('Coeff of Variation', 'cv_compare'),
|
||||||
|
);
|
||||||
|
|
||||||
|
for ($i=0; $i<count($available_order_by); $i++)
|
||||||
|
{
|
||||||
|
$template->append(
|
||||||
|
'order_by_options',
|
||||||
|
$available_order_by[$i][0]
|
||||||
|
);
|
||||||
|
}
|
||||||
|
$template->assign('order_by_options_selected', array($order_by_index) );
|
||||||
|
|
||||||
|
$x = uasort($by_user_ratings, $available_order_by[$order_by_index][1] );
|
||||||
|
|
||||||
|
$template->assign( array(
|
||||||
|
'F_ACTION' => get_root_url().'admin.php',
|
||||||
|
'F_MIN_RATES' => $filter_min_rates,
|
||||||
|
'available_rates' => $conf['rate_items'],
|
||||||
|
'ratings' => $by_user_ratings,
|
||||||
|
'image_urls' => $image_urls,
|
||||||
|
) );
|
||||||
|
$template->set_filename('rating', 'rating_user.tpl');
|
||||||
|
$template->assign_var_from_handle('ADMIN_CONTENT', 'rating');
|
||||||
|
|
||||||
|
?>
|
||||||
76
admin/themes/default/template/rating_user.tpl
Normal file
76
admin/themes/default/template/rating_user.tpl
Normal file
|
|
@ -0,0 +1,76 @@
|
||||||
|
<form action="{$F_ACTION}" method="GET">
|
||||||
|
<fieldset>
|
||||||
|
<label>{'Sort by'|@translate}
|
||||||
|
<select name="order_by">
|
||||||
|
{html_options options=$order_by_options selected=$order_by_options_selected}
|
||||||
|
</select>
|
||||||
|
</label>
|
||||||
|
<label>{'Number of rates'|@translate}>
|
||||||
|
<input type="text" size="5" name="f_min_rates" value="{$F_MIN_RATES}">
|
||||||
|
</label>
|
||||||
|
<input type="submit" value="{'Submit'|@translate}">
|
||||||
|
</label>
|
||||||
|
<input type="hidden" name="page" value="rating_user">
|
||||||
|
</fieldset>
|
||||||
|
</form>
|
||||||
|
|
||||||
|
{combine_script id='core.scripts' load='async' path='themes/default/js/scripts.js'}
|
||||||
|
{footer_script}{literal}
|
||||||
|
function del(elt,uid,aid)
|
||||||
|
{
|
||||||
|
if (!confirm('{'Are you sure?'|@translate|@escape:'javascript'}'))
|
||||||
|
return false;
|
||||||
|
var tr = elt;
|
||||||
|
while ( tr.nodeName != "TR") tr = tr.parentNode;
|
||||||
|
tr = jQuery(tr).fadeTo(1000, 0.4);
|
||||||
|
var ws = new PwgWS({/literal}'{$ROOT_URL|@escape:javascript}'{literal});
|
||||||
|
ws.callService(
|
||||||
|
'pwg.rates.delete', {user_id:uid, anonymous_id:aid},
|
||||||
|
{
|
||||||
|
method: 'POST',
|
||||||
|
onFailure: function(num, text) { tr.stop(); tr.fadeTo(0,1); alert(num + " " + text); },
|
||||||
|
onSuccess: function(result) { if (result) {tr.remove();} else alert(result); }
|
||||||
|
}
|
||||||
|
);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
{/literal}{/footer_script}
|
||||||
|
<table>
|
||||||
|
<tr class="throw">
|
||||||
|
<td>{'Username'|@translate}</td>
|
||||||
|
<td>{'Number of rates'|@translate}</td>
|
||||||
|
<td>{'Average rate'|@translate}</td>
|
||||||
|
<td>StDev</td>
|
||||||
|
<td>CV</td>
|
||||||
|
{foreach from=$available_rates item=rate}
|
||||||
|
<td>{$rate}</td>
|
||||||
|
{/foreach}
|
||||||
|
<td></td>
|
||||||
|
</tr>
|
||||||
|
{foreach from=$ratings item=rating key=user}
|
||||||
|
<tr>
|
||||||
|
<td>{$user}</td>
|
||||||
|
<td>{$rating.count}</td>
|
||||||
|
<td>{$rating.avg|@number_format:2}</td>
|
||||||
|
<td>{$rating.std|@number_format:3}</td>
|
||||||
|
<td>{$rating.cv|@number_format:3}</td>
|
||||||
|
{foreach from=$rating.rates item=rates key=rate}
|
||||||
|
<td>{if !empty($rates)}
|
||||||
|
{capture assign=rate_over}{foreach from=$rates item=rate_arr}<img src="{$image_urls[$rate_arr.id].tn}" alt="thumb-{$rate_arr.id}" title="{$rate_arr.date}"></img>
|
||||||
|
{/foreach}{/capture}
|
||||||
|
<a class="cluetip" title="{$rate_over|@htmlspecialchars}">{$rates|@count}</a>
|
||||||
|
{/if}</td>
|
||||||
|
{/foreach}
|
||||||
|
<td><a onclick="return del(this,{$rating.uid},'{$rating.aid}');"><img src="{$themeconf.admin_icon_dir}/delete.png" alt="[{'Delete'|@translate}]"></a></td>
|
||||||
|
</tr>
|
||||||
|
{/foreach}
|
||||||
|
</table>
|
||||||
|
|
||||||
|
{combine_script id='jquery.cluetip' load='footer' require='jquery' path='themes/default/js/plugins/jquery.cluetip.js'}
|
||||||
|
{footer_script require='jquery.cluetip'}
|
||||||
|
{literal}
|
||||||
|
jQuery('.cluetip').cluetip({
|
||||||
|
width: 350, splitTitle: '|'
|
||||||
|
});
|
||||||
|
{/literal}
|
||||||
|
{/footer_script}
|
||||||
|
|
@ -215,9 +215,7 @@ SELECT DISTINCT('.$this->calendar_levels[$level]['sql'].') as period,
|
||||||
COUNT(DISTINCT id) as nb_images'.
|
COUNT(DISTINCT id) as nb_images'.
|
||||||
$this->inner_sql.
|
$this->inner_sql.
|
||||||
$this->get_date_where($level).'
|
$this->get_date_where($level).'
|
||||||
GROUP BY period
|
GROUP BY period;';
|
||||||
ORDER BY period ASC
|
|
||||||
;';
|
|
||||||
|
|
||||||
$level_items = simple_hash_from_query($query, 'period', 'nb_images');
|
$level_items = simple_hash_from_query($query, 'period', 'nb_images');
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1883,6 +1883,45 @@ SELECT
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function ws_rates_delete($params, &$service)
|
||||||
|
{
|
||||||
|
global $conf;
|
||||||
|
|
||||||
|
if (!$service->isPost())
|
||||||
|
{
|
||||||
|
return new PwgError(405, 'This method requires HTTP POST');
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!is_admin())
|
||||||
|
{
|
||||||
|
return new PwgError(401, 'Access denied');
|
||||||
|
}
|
||||||
|
|
||||||
|
$user_id = (int)$params['user_id'];
|
||||||
|
if ($user_id<=0)
|
||||||
|
{
|
||||||
|
return new PwgError(WS_ERR_INVALID_PARAM, 'Invalid user_id');
|
||||||
|
}
|
||||||
|
|
||||||
|
$query = '
|
||||||
|
DELETE FROM '.RATE_TABLE.'
|
||||||
|
WHERE user_id='.$user_id;
|
||||||
|
|
||||||
|
if (!empty($params['anonymous_id']))
|
||||||
|
{
|
||||||
|
$query .= ' AND anonymous_id=\''.$params['anonymous_id'].'\'';
|
||||||
|
}
|
||||||
|
|
||||||
|
$changes = pwg_db_changes(pwg_query($query));
|
||||||
|
if ($changes)
|
||||||
|
{
|
||||||
|
include_once(PHPWG_ROOT_PATH.'include/functions_rate.inc.php');
|
||||||
|
update_rating_score();
|
||||||
|
}
|
||||||
|
return $changes;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* perform a login (web service method)
|
* perform a login (web service method)
|
||||||
*/
|
*/
|
||||||
|
|
|
||||||
11
ws.php
11
ws.php
|
|
@ -154,7 +154,16 @@ function ws_addDefaultMethods( $arr )
|
||||||
),
|
),
|
||||||
'sets the rank of a photo for a given album (POST method only, for admins)'
|
'sets the rank of a photo for a given album (POST method only, for admins)'
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
||||||
|
$service->addMethod('pwg.rates.delete', 'ws_rates_delete',
|
||||||
|
array(
|
||||||
|
'user_id' => array(),
|
||||||
|
'anonymous_id' => array( 'default'=>'' ),
|
||||||
|
),
|
||||||
|
'deletes all rates for a user (POST method only, admins only)'
|
||||||
|
);
|
||||||
|
|
||||||
$service->addMethod('pwg.session.getStatus', 'ws_session_getStatus', null, '' );
|
$service->addMethod('pwg.session.getStatus', 'ws_session_getStatus', null, '' );
|
||||||
$service->addMethod('pwg.session.login', 'ws_session_login',
|
$service->addMethod('pwg.session.login', 'ws_session_login',
|
||||||
array('username', 'password'),
|
array('username', 'password'),
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue