From 6fe5e90691b803079e02c7d98d629a9e46ee7d7e Mon Sep 17 00:00:00 2001 From: rootcoma Date: Sun, 3 Nov 2013 08:47:01 -0800 Subject: [PATCH 1/7] more info for reports --- php/reports.php | 158 ++++++++++++++++++++++++++++-------------------- 1 file changed, 91 insertions(+), 67 deletions(-) diff --git a/php/reports.php b/php/reports.php index 5d2c1cc..67da838 100644 --- a/php/reports.php +++ b/php/reports.php @@ -87,81 +87,105 @@

- -
-
-

Reports

- - - - - - - - - - query('SELECT * FROM triviareport LIMIT 10'); - if ($q === false) { - die("Error: database error: table does not exist\n"); - } else { - $result = $q->fetchAll(); - foreach($result as $res) { +
+
+
+ + Hide reports + +
+
+
+
+
+

Reports

+
#UsernameReport Text
+ + + + + + + + + + + query('SELECT tr.*, tq.question as original FROM triviareport tr INNER JOIN triviaquestion tq on tq.id=question_num LIMIT 10'); + if ($q === false) { + die("Error: database error: table does not exist\n"); + } else { + $result = $q->fetchAll(); + foreach($result as $res) { echo ''; echo ''; echo ''; + echo ''; + echo ''; echo ''; echo ''; + } } - } - } else { - die('Couldnt connect to db'); - } - ?> - -
Report #UsernameQuestion #QuestionReport Text
' . $res['id'] . '' . $res['username'] . '' . $res['question_num'] . '' . $res['original'] . '' . $res['report_text'] . '
+ } else { + die('Couldnt connect to db'); + } + ?> + + +
+
+ + +
+
+
+ + Hide edits + +
+
+
+
+
+

Edits

+ + + + + + + + + + + + query('SELECT te.*, tq.question as original FROM triviaedit te INNER JOIN triviaquestion tq on tq.id=question_id ORDER BY id DESC LIMIT 10'); + if ($q === false) { + die("Error: database error: table does not exist\n"); + } else { + $result = $q->fetchAll(); + foreach($result as $res) { + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + } + } + } else { + die($err); + } + ?> + +
Edit #UsernameNew QuestionOld QuestionQuestion #
' . $res['id'] . '' . $res['username'] . '' . $res['question'] . '' . $res['original'] . '' . $res['question_id'] . '
+
-
-
-

Edits

- - - - - - - - - - - - query('SELECT *, tq.question as original FROM triviaedit INNER JOIN triviaquestion tq on tq.id=question_id ORDER BY id DESC LIMIT 10'); - if ($q === false) { - die("Error: database error: table does not exist\n"); - } else { - $result = $q->fetchAll(); - foreach($result as $res) { - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - } - } - } else { - die($err); - } - ?> - -
Edit #UsernameNew QuestionOld QuestionQuestion #
' . $res['id'] . '' . $res['username'] . '' . $res['question'] . '' . $res['original'] . '' . $res['question_id'] . '
-
-
From 1fc295be7b385d2af6289051ac4cea1479a76aac Mon Sep 17 00:00:00 2001 From: rootcoma Date: Sun, 3 Nov 2013 09:26:57 -0800 Subject: [PATCH 2/7] fixing week top scores stat bug --- php/stats.php | 1 + 1 file changed, 1 insertion(+) diff --git a/php/stats.php b/php/stats.php index cc92342..e5a3484 100644 --- a/php/stats.php +++ b/php/stats.php @@ -246,6 +246,7 @@ sub($interval); From 3d64326fa44c690afbd96d9f0ae609bc76987e3e Mon Sep 17 00:00:00 2001 From: rootcoma Date: Sun, 3 Nov 2013 10:25:50 -0800 Subject: [PATCH 3/7] Adding underlining to edits to show edit --- php/reports.php | 43 ++++++++++++++++++++++++++++++++++--------- 1 file changed, 34 insertions(+), 9 deletions(-) diff --git a/php/reports.php b/php/reports.php index 67da838..3e01206 100644 --- a/php/reports.php +++ b/php/reports.php @@ -168,15 +168,40 @@ } else { $result = $q->fetchAll(); foreach($result as $res) { - echo ''; - echo '' . $res['id'] . ''; - echo '' . $res['username'] . ''; - echo '' . $res['question'] . ''; - echo '' . $res['original'] . ''; - echo '' . $res['question_id'] . ''; - echo ''; - } - } + $isItalic = false; + $brokenNew = str_split($res['question']); + $brokenOld = str_split($res['original']); + $differenceString = ''; + for($i=0;$i'; + echo '' . $res['id'] . ''; + echo '' . $res['username'] . ''; + echo '' . $differenceString . ''; + echo '' . $res['original'] . ''; + echo '' . $res['question_id'] . ''; + echo ''; + } + } } else { die($err); } From 50ef9dfd165d91fb2c8df75ce570ddd84965ac8d Mon Sep 17 00:00:00 2001 From: rootcoma Date: Sun, 3 Nov 2013 10:44:44 -0800 Subject: [PATCH 4/7] Fixed clearpoints bug, dropped users showing up on website, added a score of 0 --- plugin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin.py b/plugin.py index b7b494f..8ff0bd7 100644 --- a/plugin.py +++ b/plugin.py @@ -143,6 +143,7 @@ class TriviaTime(callbacks.Plugin): """ self.storage.removeUserLogs(str.lower(username)) irc.reply('Removed all points from %s' % (username)) + self.storage.insertUserLog(username, 0, 0) clearpoints = wrap(clearpoints, ['admin','nick']) def day(self, irc, msg, arg): @@ -1965,4 +1966,3 @@ class TriviaTime(callbacks.Plugin): Class = TriviaTime # vim:set shiftwidth=4 softtabstop=4 expandtab textwidth=79: - From 14b1ab872cae52e8607beba893d9323475d66387 Mon Sep 17 00:00:00 2001 From: rootcoma Date: Sun, 3 Nov 2013 10:57:21 -0800 Subject: [PATCH 5/7] Fixing clearpoints so people dont show up on all the toplists on website people showed up on top10 even if cleared --- plugin.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/plugin.py b/plugin.py index 8ff0bd7..54abf21 100644 --- a/plugin.py +++ b/plugin.py @@ -141,9 +141,11 @@ class TriviaTime(callbacks.Plugin): Deletes all of a users points, and removes all their records """ + d = datetime.date.today() + d -= datetime.timedelta(366) + self.storage.updateUserLog(str.lower(username), 0, 0,d.day,d.month,d.year) self.storage.removeUserLogs(str.lower(username)) irc.reply('Removed all points from %s' % (username)) - self.storage.insertUserLog(username, 0, 0) clearpoints = wrap(clearpoints, ['admin','nick']) def day(self, irc, msg, arg): From 68fb6f1e0f4da7b1db927237f50dda3447b956e6 Mon Sep 17 00:00:00 2001 From: rootcoma Date: Sun, 3 Nov 2013 11:04:01 -0800 Subject: [PATCH 6/7] Update plugin.py --- plugin.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/plugin.py b/plugin.py index 54abf21..4f9ec98 100644 --- a/plugin.py +++ b/plugin.py @@ -1950,12 +1950,14 @@ class TriviaTime(callbacks.Plugin): c = self.conn.cursor() c.execute('''delete from triviaedit where id=?''', (editId,)) + self.conn.commit() c.close() def removeReport(self, repId): c = self.conn.cursor() c.execute('''delete from triviareport where id=?''', (repId,)) + self.conn.commit() c.close() def removeUserLogs(self, username): @@ -1963,6 +1965,7 @@ class TriviaTime(callbacks.Plugin): c = self.conn.cursor() c.execute('''delete from triviauserlog where username=?''', (username,)) + self.conn.commit() c.close() From 681ccd98357bf126c3025d9f0985a7ec353df9cf Mon Sep 17 00:00:00 2001 From: rootcoma Date: Sun, 3 Nov 2013 11:06:31 -0800 Subject: [PATCH 7/7] Refixing delete not working, need to commit the db connection --- plugin.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/plugin.py b/plugin.py index 4f9ec98..01e1bca 100644 --- a/plugin.py +++ b/plugin.py @@ -141,9 +141,6 @@ class TriviaTime(callbacks.Plugin): Deletes all of a users points, and removes all their records """ - d = datetime.date.today() - d -= datetime.timedelta(366) - self.storage.updateUserLog(str.lower(username), 0, 0,d.day,d.month,d.year) self.storage.removeUserLogs(str.lower(username)) irc.reply('Removed all points from %s' % (username)) clearpoints = wrap(clearpoints, ['admin','nick'])