Merge pull request #157 from rootcoma/db_connections
adding profile.php, changing user search
This commit is contained in:
tannn
commit
52c59ec40f
|
|
@ -0,0 +1,266 @@
|
|||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<?php
|
||||
include('config.php');
|
||||
if(array_key_exists('username', $_GET)) {
|
||||
// Convert username to lowercase in irc
|
||||
$username = $_GET['username'];
|
||||
$ircLowerSymbols = array("\\"=>"|", "["=>"{", "]"=>"}", "~"=>"^");
|
||||
$usernameCanonical = strtr($username, $ircLowerSymbols);
|
||||
$usernameCanonical = strtolower($usernameCanonical);
|
||||
} else {
|
||||
$username = '';
|
||||
$usernameCanonical = '';
|
||||
}
|
||||
?>
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>Players · TriviaTime</title>
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<meta name="description" content="">
|
||||
<meta name="author" content="">
|
||||
|
||||
<!-- Le styles -->
|
||||
<link href="css/bootstrap.css" rel="stylesheet">
|
||||
<style type="text/css">
|
||||
body {
|
||||
padding-top: 20px;
|
||||
padding-bottom: 60px;
|
||||
}
|
||||
|
||||
/* Custom container */
|
||||
.container {
|
||||
margin: 0 auto;
|
||||
max-width: 1000px;
|
||||
}
|
||||
.container > hr {
|
||||
margin: 60px 0;
|
||||
}
|
||||
|
||||
/* Customize the navbar links to be fill the entire space of the .navbar */
|
||||
.navbar .navbar-inner {
|
||||
padding: 0;
|
||||
}
|
||||
.navbar .nav {
|
||||
margin: 0;
|
||||
display: table;
|
||||
width: 100%;
|
||||
}
|
||||
.navbar .nav li {
|
||||
display: table-cell;
|
||||
width: 1%;
|
||||
float: none;
|
||||
}
|
||||
.navbar .nav li a {
|
||||
font-weight: bold;
|
||||
text-align: center;
|
||||
border-left: 1px solid rgba(255,255,255,.75);
|
||||
border-right: 1px solid rgba(0,0,0,.1);
|
||||
}
|
||||
.navbar .nav li:first-child a {
|
||||
border-left: 0;
|
||||
border-radius: 3px 0 0 3px;
|
||||
}
|
||||
.navbar .nav li:last-child a {
|
||||
border-right: 0;
|
||||
border-radius: 0 3px 3px 0;
|
||||
}
|
||||
</style>
|
||||
<link href="css/bootstrap-responsive.css" rel="stylesheet">
|
||||
|
||||
</head>
|
||||
|
||||
<body>
|
||||
|
||||
<div class="container">
|
||||
|
||||
<div class="masthead">
|
||||
<h3 class="muted">TriviaTime</h3>
|
||||
<div class="navbar">
|
||||
<div class="navbar-inner">
|
||||
<div class="container">
|
||||
<ul class="nav">
|
||||
<li><a href="index.php">Home</a></li>
|
||||
<li><a href="stats.php">Stats</a></li>
|
||||
<li><a href="user.php">Players</a></li>
|
||||
<li><a href="reports.php">Reports</a></li>
|
||||
<li><a href="about.php">About</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
</div><!-- /.navbar -->
|
||||
</div>
|
||||
|
||||
<?php
|
||||
if ($db && $username != '') {
|
||||
$q = $db->prepare('select
|
||||
tl.username as usrname,
|
||||
sum(tl2.t * (tl2.n /
|
||||
(select sum(num_answered)
|
||||
from triviauserlog
|
||||
where username_canonical=:username))
|
||||
) as count,
|
||||
sum(tl2.p * (tl2.n /
|
||||
(select sum(num_answered)
|
||||
from triviauserlog
|
||||
where username_canonical=:username))
|
||||
) as score,
|
||||
(select sum(points_made) from triviauserlog t3 where username_canonical=:username) as points,
|
||||
(select sum(num_answered) from triviauserlog t4 where username_canonical=:username) as q_asked,
|
||||
(select num_editted from triviausers where username_canonical=:username) as num_e,
|
||||
(select num_editted_accepted from triviausers where username_canonical=:username) as num_e_accepted,
|
||||
(select num_questions_added from triviausers where username_canonical=:username) as num_q,
|
||||
(select num_questions_accepted from triviausers where username_canonical=:username) as num_q_accepted,
|
||||
(select num_reported from triviausers where username_canonical=:username) as num_r
|
||||
from (select
|
||||
tl3.id as id2,
|
||||
tl3.average_time * 1.0 as t,
|
||||
tl3.average_score * 1.0 as p,
|
||||
tl3.num_answered * 1.0 as n
|
||||
from triviauserlog tl3
|
||||
) tl2
|
||||
inner join triviauserlog tl
|
||||
on tl.username_canonical=:username
|
||||
and tl.id=tl2.id2
|
||||
');
|
||||
$q->execute(array(':username'=>$usernameCanonical));
|
||||
if ($q === false) {
|
||||
die("Error: database error: table does not exist\n");
|
||||
} else {
|
||||
$result = $q->fetchAll();
|
||||
if(sizeOf($result) > 0) {
|
||||
$result = $result[0];
|
||||
}
|
||||
|
||||
if(is_null($result['usrname'])) {
|
||||
$result['usrname'] = "Not found";
|
||||
$result['count'] = 0;
|
||||
$result['score'] = 0;
|
||||
$result['points'] = 0;
|
||||
$result['q_asked'] = 0;
|
||||
$result['num_e'] = 0;
|
||||
$result['num_e_accepted'] = 0;
|
||||
$result['num_q'] = 0;
|
||||
$result['num_q_accepted'] = 0;
|
||||
$result['num_r'] = 0;
|
||||
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if(isset($err)) {
|
||||
die($err);
|
||||
}
|
||||
}
|
||||
?>
|
||||
<div class="hero-unit">
|
||||
<h1><?php echo $result['usrname']; ?></h1>
|
||||
<p>Profile and user summary.</p>
|
||||
<p>
|
||||
</p>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="row">
|
||||
<div class="span12">
|
||||
<h2>Averages</h2>
|
||||
<table class="table">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Average Time/Question*</th>
|
||||
<th>Average Points/Question*</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<?php
|
||||
|
||||
if(isset($result)) {
|
||||
if(!is_null($result['usrname']) && $result['usrname'] != 'Not found') {
|
||||
echo '<tr>';
|
||||
echo '<td>' . number_format($result['count'],2) . '</td>';
|
||||
echo '<td>' . number_format($result['score'],2) . '</td>';
|
||||
echo '</tr>';
|
||||
}
|
||||
}
|
||||
?>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="span12">
|
||||
<h2>Totals</h2>
|
||||
<table class="table">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Total Points</th>
|
||||
<th>Number Answered*</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<?php
|
||||
|
||||
if(isset($result)) {
|
||||
if(!is_null($result['usrname']) && $result['usrname'] != 'Not found') {
|
||||
echo '<tr>';
|
||||
echo '<td>' . number_format($result['points'],0) . '</td>';
|
||||
echo '<td>' . number_format($result['q_asked'],0) . '</td>';
|
||||
echo '</tr>';
|
||||
}
|
||||
}
|
||||
?>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="span12">
|
||||
<h2>Contributions</h2>
|
||||
<table class="table">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Number Edited</th>
|
||||
<th>Edits Accepted</th>
|
||||
<th>Questions Added</th>
|
||||
<th>Questions Accepted</th>
|
||||
<th>Reports Made</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<?php
|
||||
|
||||
if(isset($result)) {
|
||||
if(!is_null($result['usrname']) && $result['usrname'] != 'Not found') {
|
||||
echo '<tr>';
|
||||
echo '<td>' . number_format($result['num_e'],0) . '</td>';
|
||||
echo '<td>' . number_format($result['num_e_accepted'],0) . '</td>';
|
||||
echo '<td>' . number_format($result['num_q'],0) . '</td>';
|
||||
echo '<td>' . number_format($result['num_q_accepted'],0) . '</td>';
|
||||
echo '<td>' . number_format($result['num_r'],0) . '</td>';
|
||||
echo '</tr>';
|
||||
}
|
||||
}
|
||||
?>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
<div class="span12">
|
||||
<p>* These stats do not include KAOS</p>
|
||||
</div>
|
||||
</div>
|
||||
<div class="footer">
|
||||
<p>© Trivialand 2013 - <a target="_blank" href="https://github.com/tannn/TriviaTime">github</a></p>
|
||||
</div>
|
||||
|
||||
</div> <!-- /container -->
|
||||
|
||||
<!-- Le javascript
|
||||
================================================== -->
|
||||
<!-- Placed at the end of the document so the pages load faster -->
|
||||
<script src="http://codeorigin.jquery.com/jquery-2.0.3.min.js"></script>
|
||||
<script src="js/bootstrap.min.js"></script>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -171,7 +171,7 @@
|
|||
foreach($result as $key=>$res) {
|
||||
echo '<tr>';
|
||||
echo '<td>' . ($key+1) . '</td>';
|
||||
echo '<td><a href="user.php?username=' . $res['username'] . '">' . $res['username'] . '</a></td>';
|
||||
echo '<td><a href="profile.php?username=' . $res['username'] . '">' . $res['username'] . '</a></td>';
|
||||
echo '<td>' . number_format($res['points'],0) . '</td>';
|
||||
echo '</tr>';
|
||||
}
|
||||
|
|
@ -212,7 +212,7 @@
|
|||
foreach($result as $key=>$res) {
|
||||
echo '<tr>';
|
||||
echo '<td>' . ($key+1) . '</td>';
|
||||
echo '<td><a href="user.php?username=' . $res['username'] . '">' . $res['username'] . '</a></td>';
|
||||
echo '<td><a href="profile.php?username=' . $res['username'] . '">' . $res['username'] . '</a></td>';
|
||||
echo '<td>' . number_format($res['points'],0) . '</td>';
|
||||
echo '</tr>';
|
||||
}
|
||||
|
|
@ -253,7 +253,7 @@
|
|||
foreach($result as $key=>$res) {
|
||||
echo '<tr>';
|
||||
echo '<td>' . ($key+1) . '</td>';
|
||||
echo '<td><a href="user.php?username=' . $res['username'] . '">' . $res['username'] . '</a></td>';
|
||||
echo '<td><a href="profile.php?username=' . $res['username'] . '">' . $res['username'] . '</a></td>';
|
||||
echo '<td>' . number_format($res['points'],0) . '</td>';
|
||||
echo '</tr>';
|
||||
}
|
||||
|
|
@ -282,5 +282,3 @@
|
|||
|
||||
</body>
|
||||
</html>
|
||||
|
||||
|
||||
|
|
|
|||
61
php/user.php
61
php/user.php
|
|
@ -105,44 +105,23 @@
|
|||
<input type="submit"></input>
|
||||
</form>
|
||||
<?php
|
||||
if ($db && $username != '') {
|
||||
if ($db) {
|
||||
$q = $db->prepare('select
|
||||
tl.username as usrname,
|
||||
sum(tl2.t * (tl2.n /
|
||||
(select sum(num_answered)
|
||||
from triviauserlog
|
||||
where username_canonical=:username))
|
||||
) as count,
|
||||
sum(tl2.p * (tl2.n /
|
||||
(select sum(num_answered)
|
||||
from triviauserlog
|
||||
where username_canonical=:username))
|
||||
) as score,
|
||||
(select sum(points_made) from triviauserlog t3 where username_canonical=:username) as points,
|
||||
(select sum(num_answered) from triviauserlog t4 where username_canonical=:username) as q_asked,
|
||||
(select num_editted from triviausers where username_canonical=:username) as num_e,
|
||||
(select num_editted_accepted from triviausers where username_canonical=:username) as num_e_accepted,
|
||||
(select num_questions_added from triviausers where username_canonical=:username) as num_q,
|
||||
(select num_questions_accepted from triviausers where username_canonical=:username) as num_q_accepted,
|
||||
(select num_reported from triviausers where username_canonical=:username) as num_r
|
||||
from (select
|
||||
tl3.id as id2,
|
||||
tl3.average_time * 1.0 as t,
|
||||
tl3.average_score * 1.0 as p,
|
||||
tl3.num_answered * 1.0 as n
|
||||
from triviauserlog tl3
|
||||
) tl2
|
||||
inner join triviauserlog tl
|
||||
on tl.username_canonical=:username
|
||||
and tl.id=tl2.id2
|
||||
tl.username,
|
||||
sum(tl.points_made) as points,
|
||||
sum(tl.num_answered) as total
|
||||
from triviauserlog tl
|
||||
where tl.username_canonical like :username
|
||||
group by tl.username_canonical
|
||||
limit 20
|
||||
');
|
||||
$q->execute(array(':username'=>$usernameCanonical));
|
||||
$q->execute(array(':username'=>'%'.$usernameCanonical.'%'));
|
||||
if ($q === false) {
|
||||
die("Error: database error: table does not exist\n");
|
||||
} else {
|
||||
$result = $q->fetchAll();
|
||||
foreach($result as $res) {
|
||||
if(is_null($res['usrname'])) {
|
||||
if(is_null($res['username'])) {
|
||||
echo "<div class='alert alert-error'>User not found.</div>";
|
||||
}
|
||||
}
|
||||
|
|
@ -168,15 +147,8 @@
|
|||
<thead>
|
||||
<tr>
|
||||
<th>Username</th>
|
||||
<th>Average Time/Question*</th>
|
||||
<th>Average Points/Question*</th>
|
||||
<th>Total Points</th>
|
||||
<th>Question Answered*</th>
|
||||
<th>Edits Made</th>
|
||||
<th>Edits Accepted</th>
|
||||
<th>Questions Made</th>
|
||||
<th>Questions Accepted</th>
|
||||
<th>Reports Made</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
|
|
@ -184,18 +156,11 @@
|
|||
|
||||
if(isset($result)) {
|
||||
foreach($result as $res) {
|
||||
if(!is_null($res['usrname'])) {
|
||||
if(!is_null($res['username'])) {
|
||||
echo '<tr>';
|
||||
echo '<td>' . $res['usrname'] . '</td>';
|
||||
echo '<td>' . number_format($res['count'],2) . '</td>';
|
||||
echo '<td>' . number_format($res['score'],2) . '</td>';
|
||||
echo '<td><a href="profile.php?username=' . $res['username'] . '">' . $res['username'] . '</a></td>';
|
||||
echo '<td>' . number_format($res['points'],0) . '</td>';
|
||||
echo '<td>' . number_format($res['q_asked'],0) . '</td>';
|
||||
echo '<td>' . number_format($res['num_e'],0) . '</td>';
|
||||
echo '<td>' . number_format($res['num_e_accepted'],0) . '</td>';
|
||||
echo '<td>' . number_format($res['num_q'],0) . '</td>';
|
||||
echo '<td>' . number_format($res['num_q_accepted'],0) . '</td>';
|
||||
echo '<td>' . number_format($res['num_r'],0) . '</td>';
|
||||
echo '<td>' . number_format($res['total'],0) . '</td>';
|
||||
echo '</tr>';
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue