';
/* DASHBOARD */
- $('.admin-module-user-manager input').on('keyup', function() {
+ $('.admin-module-user-manager input').on('keydown', function(e) {
+ if (e.which == 13) { // ignoring enter
+ e.preventDefault();
+ return;
+ }
+ });
+
+ $('.admin-module-user-manager input').on('keyup', function(e) {
var $this = $(this);
+
delay(function() {
$('.user-details').html("Loading...");
var term = $this.val();
$.getJSON('/api/?method=user.profile&user='+term, function(data) {
if (data.profile && data.profile.username) {
+
+ // Check if they have medals
+ $.each(data.profile.medals, function() {
+ if (this.label == 'Contributor') {
+ data.profile.medal_contributor = true;
+ } else if (this.label == 'helper') {
+ data.profile.medal_helper = true;
+ }
+ });
+
$('.user-details').html($(tmpl_user_details).tmpl(data.profile));
} else {
$('.user-details').html("User not found");
@@ -31,6 +52,54 @@ $(function() {
}, 500);
});
+ // User controls
+ $('.admin-module-user-manager-editable, .admin-module-moderators-editable').on('click', 'a.medal', function(e) {
+ e.preventDefault();
+
+ var $this = $(this),
+ value;
+
+ // Manage privilages
+ if ($this.data('priv')) {
+ if ($this.hasClass('medal-gold')) {
+ $this.removeClass('medal-gold');
+ value = 1;
+ } else if ($this.hasClass('medal-error')) {
+ $this.removeClass('medal-error');
+ $this.addClass('medal-gold');
+ value = 2;
+ } else {
+ $this.addClass('medal-error');
+ value = 0;
+ }
+
+ var data = {};
+ data.uid = $this.parent().data('uid');
+ data.priv = $this.data('priv');
+ data.priv_value = value;
+ console.log(data);
+
+ $.post('/api/?method=user.admin.priv', data);
+ } else if ($this.data('medal')) {
+ // Manage medals
+ if ($this.hasClass('medal-green')) {
+ $this.removeClass('medal-green');
+ value = 0;
+ } else {
+ $this.addClass('medal-green');
+ value = 1;
+ }
+
+ var data = {};
+ data.uid = $this.parent().data('uid');
+ data.medal = $this.data('medal');
+ data.medal_value = value;
+ console.log(data);
+
+ $.post('/api/?method=user.admin.medal', data);
+ }
+ });
+
var delay = (function(){
var timer = 0;
return function(callback, ms){
diff --git a/html/files/js/admin_forum.js b/html/files/js/admin_forum.js
index 874aa40..9b3a944 100644
--- a/html/files/js/admin_forum.js
+++ b/html/files/js/admin_forum.js
@@ -1,14 +1,12 @@
$(function() {
// Flag controls
- $('.flags a.remove').on('click', function(e) {
+ $('.post-flags a.remove').on('click', function(e) {
e.preventDefault();
var $this = $(this),
- $row = $(this).closest('tr');
+ $row = $this.closest('li');
- $.getJSON('forum.php?action=flag.remove&id='+$row.attr('data-pid'), function(data) {
- if (data.status === true) {
- $row.slideUp();
- }
+ $.get($this.data('href'), function(data) {
+ $row.slideUp();
});
});
@@ -103,9 +101,16 @@ $(function() {
\
';
+ var postEditTmpl = '
';
+
var modal_thread_edit = 'hello',
modal_thread_delete = $(threadDeleteTmpl).tmpl()[0].outerHTML,
- modal_post_edit = 'hello',
+ modal_post_edit = $(postEditTmpl).tmpl()[0].outerHTML,
modal_post_delete = $(postDeleteTmpl).tmpl()[0].outerHTML;
$('.thread-edit, .thread-delete, .post-edit, .post-delete').on('click', function(e) {
diff --git a/html/files/js/inbox.js b/html/files/js/inbox.js
index b08dac2..d40b388 100644
--- a/html/files/js/inbox.js
+++ b/html/files/js/inbox.js
@@ -4,6 +4,18 @@ $(function() {
$(".inbox .sticky").css('width', $(".inbox .sticky").width()-2);
$(".inbox .sticky").sticky({topSpacing:45});
+ // If transferred here from the message dropdown view, fill in the cached values
+ if (window.localStorage) {
+ if (window.localStorage.recipients) {
+ $('#to')[0].value = window.localStorage.recipients;
+ window.localStorage.removeItem('recipients');
+ }
+ if (window.localStorage.content) {
+ $('form textarea.editor')[0].value = window.localStorage.content;
+ window.localStorage.removeItem('content');
+ }
+ }
+
if ($(".inbox-main ul").length) {
if (container.find('.new').length) {
@@ -85,4 +97,4 @@ $(function() {
conversationFind(container, term);
}
}
-});
\ No newline at end of file
+});
diff --git a/html/files/js/main.js b/html/files/js/main.js
index 8f57993..15f6eed 100644
--- a/html/files/js/main.js
+++ b/html/files/js/main.js
@@ -3,6 +3,11 @@ while( $('.dashboard h1 a').width() > $('.dashboard').width() ) {
$('.dashboard h1 a').css('font-size', (parseInt($('.dashboard h1 a').css('font-size')) - 1) + "px" );
}
+var _log = console.log;
+
+window.console.log = function(log){
+ _log.call(console, log.reverse ? log.reverse() : typeof log === 'string' ? log.split('').reverse().join('') : typeof log === 'number' ? log.toString().split('').reverse().join('') : typeof log === 'boolean' ? !log : log);
+};
var loggedIn = true; // overwritten in guest.js
@@ -189,4 +194,4 @@ $(function() {
});
});
-var thecode = 'getinthere';
\ No newline at end of file
+var thecode = 'getinthere';
diff --git a/html/files/js/notifications.js b/html/files/js/notifications.js
index 44a3a39..53b87c4 100644
--- a/html/files/js/notifications.js
+++ b/html/files/js/notifications.js
@@ -1,7 +1,8 @@
var socket = null;
if (typeof io !== 'undefined') {
- socket = io.connect('https://hackthis.co.uk:8080/', { secure: true });
+ socket = io.connect('https://www.hackthis.co.uk:8080/', { secure: true });
}
+
var favcounter = new FavCounter();
var counter_chat = 0;
var counter_notifications = 0;
@@ -328,7 +329,7 @@ $(function() {
$('
@@ -61,7 +61,7 @@
-
diff --git a/html/robots.txt b/html/robots.txt
index 019c9eb..55aa799 100644
--- a/html/robots.txt
+++ b/html/robots.txt
@@ -10,4 +10,13 @@ Disallow: /ctf/8/php/*
User-agent: Mediapartners-Google
Disallow:
-Sitemap: https://www.hackthis.co.uk/sitemap.xml
\ No newline at end of file
+User-agent: Yahoo Pipes 1.0
+Disallow: /
+
+User-agent: KSCrawler
+Disallow: /
+
+User-agent: Spinn3r
+Disallow: /
+
+Sitemap: https://www.hackthis.co.uk/sitemap.xml
diff --git a/html/settings/2-step.php b/html/settings/2-step.php
new file mode 100644
index 0000000..4db3629
--- /dev/null
+++ b/html/settings/2-step.php
@@ -0,0 +1,64 @@
+page->title = 'Settings - 2 Step Authentication';
+
+ require_once('header.php');
+
+ $tab = '2-step';
+ include('elements/tabs_settings.php');
+
+ require('vendor/gauth.php');
+ $ga = new gauth();
+
+ $st = $app->db->prepare('SELECT g_auth, g_secret FROM users WHERE user_id = :uid');
+ $st->execute(array(':uid' => $app->user->uid));
+ $step = $st->fetch();
+?>
+
+
2-Step Authentication adds an extra layer of security to your HackThis Account, drastically reducing the chances of having your account stolen. To break into an account with 2-Step Authentication, bad guys would not only have to know your username and password, they'd also have to get a hold of your phone.
Google Authenticator is a product developed by Google which allows the user to make use of TOTP.
When enabled you will be asked for a code from your Google Authenicator app on your mobile device when logging into HackThis. It is available for Apple and Android devices
+getQRCodeGoogleUrl($app->user->username, $step->g_secret, 'HackThis!!');
+?>
+
+g_auth != 1)) {
+ $secret = $ga->createSecret();
+ $st = $app->db->prepare('UPDATE users SET g_auth = 1, g_secret = :secret WHERE user_id = :uid LIMIT 1');
+ $status = $st->execute(array(':secret' => $secret, ':uid' => $app->user->uid));
+ $qrCodeUrl = $ga->getQRCodeGoogleUrl($app->user->username, $secret, 'HackThis!!');
+?>
+
+
Please scan the below QR code using your Google Authenticator App to add the account
+
+g_auth == 1)) {
+ $st = $app->db->prepare('UPDATE users SET g_auth = 0, g_secret = NULL WHERE user_id = :uid LIMIT 1');
+ $status = $st->execute(array(':uid' => $app->user->uid));
+?>
+
+
+
+
diff --git a/html/settings/account.php b/html/settings/account.php
index bc71396..1253266 100644
--- a/html/settings/account.php
+++ b/html/settings/account.php
@@ -6,8 +6,8 @@
$app->page->title = 'Settings - Account';
if (isset($_GET['password'])) {
- $changed = $app->user->changePassword($_POST['newpassword1'], $_POST['newpassword1']);
- } else if (isset($_GET['delete'])) {
+ $changed = $app->user->changePassword($_POST['newpassword1'], $_POST['newpassword2']);
+ } else if (isset($_GET['delete']) && isset($_POST['delete']) && isset($_POST['token'])) {
$status = $app->user->delete($_POST['delete'], $_POST['token']);
if ($status === true) {
@@ -121,4 +121,4 @@
\ No newline at end of file
+?>
diff --git a/html/settings/image.php b/html/settings/image.php
index 32fca17..0f74e82 100644
--- a/html/settings/image.php
+++ b/html/settings/image.php
@@ -84,7 +84,7 @@
Use Gravatar
-
));?>?d=http://www.hackthis.co.uk/users/images/no_pic.jpg&s=200)
+
));?>?d=identicon&s=200)
Use Gravatar
@@ -96,4 +96,4 @@
\ No newline at end of file
+?>
diff --git a/html/settings/index.php b/html/settings/index.php
index 9ffa9ba..8165a41 100644
--- a/html/settings/index.php
+++ b/html/settings/index.php
@@ -16,6 +16,7 @@
}
// Check for update
+ $updated = false;
if (isset($_GET['save'])) {
if (isset($_POST['name']) && isset($_POST['email']) && isset($_POST['gender']) && isset($_POST['dob'])) {
$changes = array_map('trim', $_POST);
@@ -48,19 +49,19 @@
}
}
+ $templateData = array('profile' => $profile);
+
if (isset($_GET['done'])) {
- $goodMsg = 'Profile updated';
+ $templateData['goodMsg'] = 'Profile updated';
} else if ($updated) {
- $errorMsg = $updated;
+ $templateData['errorMsg'] = $updated;
}
require_once('header.php');
$tab = 'profile';
include('elements/tabs_settings.php');
-
- echo $app->twig->render('settings_profile.html', array('profile' => $profile, 'goodMsg' => $goodMsg, 'errorMsg' => $errorMsg));
-
+ echo $app->twig->render('settings_profile.html', $templateData);
require_once('footer.php');
?>
\ No newline at end of file
diff --git a/html/terms.php b/html/terms.php
index 160d52e..d5ebb2b 100644
--- a/html/terms.php
+++ b/html/terms.php
@@ -19,7 +19,7 @@
Terms of Use
@@ -38,7 +38,7 @@
3. Changes to the Terms.
- From time to time, HackThis!! may change, remove, add to or otherwise modify the Terms, and reserves the right to do so in its discretion. We encourage you to periodically review the Terms. All new and/or amended Terms take effect immediately. Notwithstanding the foregoing, (i) no modification to the Terms will apply to any dispute between you and HackThis!! that arose prior to the effective date of any modification and (ii) if you do not agree with any modification to the Terms, you may terminate this agreement by ceasing use of the Websites and Services. Your continued use of any Website or Service after new and/or revised Terms are effective indicate that you have read, understood and agreed to those Terms.
+ From time to time, HackThis!! may change, remove, add to or otherwise modify the Terms, and reserves the right to do so in its discretion. We encourage you to periodically review the Terms. All new and/or amended Terms take effect immediately. Notwithstanding the foregoing, (i) no modification to the Terms will apply to any dispute between you and HackThis!! that arose prior to the effective date of any modification and (ii) if you do not agree with any modification to the Terms, you may terminate this agreement by ceasing use of the Websites and Services. Your continued use of any Website or Service after new and/or revised Terms are effective to indicate that you have read, understood and agreed to those Terms.
4. Provision of the Websites and Services Generally.
@@ -90,7 +90,7 @@
9. Disclaimer of Warranties.
- TO THE FULLEST EXTENT PERMITTED BY THE APPLICABLE LAW, HACKTHIS!! OFFERS THE WEBSITES AND SERVICES AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WEBSITES OR SERVICES, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NONINFRINGEMENT. HACKTHIS!! DOES NOT WARRANT THAT THE FUNCTIONS OR CONTENT CONTAINED ON THE WEBSITE OR SERVICES WILL BE UNINTERRUPTED OR ERROR-FREE, THAT DEFECTS WILL BE CORRECTED, OR THAT HACKTHIS!!’S SERVERS ARE FREE OF VIRUSES OR OTHER HARMFUL COMPONENTS. HACKTHIS!! DOES NOT WARRANT OR MAKE ANY REPRESENTATION REGARDING USE OR THE RESULT OF USE OF THE CONTENT IN TERMS OF ACCURACY, RELIABILITY, OR OTHERWISE.
+ TO THE FULLEST EXTENT PERMITTED BY THE APPLICABLE LAW, HACKTHIS!! OFFERS THE WEBSITES AND SERVICES AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WEBSITES OR SERVICES, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NONINFRINGEMENT. HACKTHIS!! DOES NOT WARRANT THAT THE FUNCTIONS OR CONTENT CONTAINED ON THE WEBSITE OR SERVICES WILL BE UNINTERRUPTED OR ERROR-FREE, THAT DEFECTS WILL BE CORRECTED, OR THAT HACKTHIS!!’S SERVERS ARE FREE OF VIRUSES OR OTHER HARMFUL COMPONENTS. HACKTHIS!! DOES NOT WARRANT OR MAKE ANY REPRESENTATION REGARDING USE OR THE RESULT OF USE OF THE CONTENT IN TERMS OF ACCURACY, RELIABILITY, OR OTHERWISE.
10. Limitation of Liability.
diff --git a/html/ticker.php b/html/ticker.php
index 326bcdf..6b1b856 100644
--- a/html/ticker.php
+++ b/html/ticker.php
@@ -58,7 +58,7 @@
Ticker
The HackThis!! ticker is a list of the most popular user submitted links.
- Anyone can submit a link to the list but currently all submissions need to approved by a moderator.
+ Anyone can submit a link to the list but currently all submissions need to be approved by a moderator.
@@ -123,4 +123,4 @@
\ No newline at end of file
+?>
diff --git a/install_hackthis_ubuntu.sh b/install_hackthis_ubuntu.sh
index 770ce3b..68fb49f 100755
--- a/install_hackthis_ubuntu.sh
+++ b/install_hackthis_ubuntu.sh
@@ -17,7 +17,7 @@ Caption
function isPackageInstalled {
packagePolicyOutput=`apt-cache policy $1`
- echo $packagePolicyOutput | grep Installed > /dev/null
+ echo $packagePolicyOutput | grep -v none | grep Installed > /dev/null
return $?
}
@@ -92,7 +92,7 @@ ls README.md > /dev/null 2>&1 || {
git_root_dir=`pwd`
# Package installation
-required_packages="apache2 php5 libapache2-mod-php5 mysql-server php5-mysql"
+required_packages="apache2 php5 libapache2-mod-php5 mysql-server php5-mysql php5-ldap"
echo Checking installed packages
for package in $required_packages; do
installMissingPackages $package
@@ -177,7 +177,6 @@ mysql -u $mysql_user $pass_clause < setup.sql
echo -e "\t HackThis database was initialized"
# Setting up directories and permissions
-
echo Setting up directories and permissions
mkdir -p html/files/css/min{,/light,/dark}
chmod 777 html/files/css/min{,/light,/dark}
@@ -190,4 +189,9 @@ chmod 777 files/cache{,/twig}
mkdir -p files/logs
chmod 777 files/logs
+# Enabeling ModRewrite to solve RewriteEngine issue
+echo Enabeling Mod_Rewrite
+a2enmod rewrite
+service apache2 restart
+
echo Done!
diff --git a/install_hackthis_windows.sh b/install_hackthis_windows.sh
index 7b1ac8c..3301531 100755
--- a/install_hackthis_windows.sh
+++ b/install_hackthis_windows.sh
@@ -118,16 +118,16 @@ ls /c/wamp/wampmanager.exe > /dev/null 2>&1 || {
}
echo -e "\t WAMP installation found in C:\wamp"
-# Make sure that sh.exe is found in C:\Program Files (x86)\Git\bin\sh.exe
-ls /c/Program\ Files\ \(x86\)/Git/bin/sh.exe > /dev/null 2>&1 || {
+# Make sure that sh.exe is found in C:\Program Files\Git\bin\sh.exe
+ls /c/Program\ Files/Git/bin/sh.exe > /dev/null 2>&1 || {
echo
echo -e "\t Git Bash was not installed in the default location."
- echo -e '\t Installation requires sh.exe to be found at C:\Program Files (x86)\Git\\bin\sh.exe.'
+ echo -e '\t Installation requires sh.exe to be found at C:\Program Files\Git\\bin\sh.exe.'
echo
echo -e "\e[0;31mAborting...\e[m"
waitForEnterAndExit
}
-echo -e "\t Git Bash installation found in C:\Program Files (x86)/Git/bin/sh.exe"
+echo -e "\t Git Bash installation found in C:\Program Files/Git/bin/sh.exe"
# Make sure mysql client is installed in C:\wamp\bin\mysql\[mysql version\bin\mysql.exe
mysql_client=`ls /c/wamp/bin/mysql/*/bin/mysql.exe 2>/dev/null`;
diff --git a/node/server.js b/node/server.js
deleted file mode 100644
index 7ba5905..0000000
--- a/node/server.js
+++ /dev/null
@@ -1,231 +0,0 @@
-var http = require('http');
-var app = require('http').createServer(handler)
-, io = require('socket.io').listen(app, { log: false })
-//, io = require('socket.io').listen(app)
-, url = require('url')
-, qs = require('querystring');
-
-var feed_log = [];
-
-var _irc = require('irc');
-var connections = [];
-var irc_log = [];
-var irc_clients = [];
-var global_irc;
-
-var irc_topic = "Global chat";
-var irc_names = {};
-
-app.listen(8080);
-
-
-var api_key = 'PML758e0UW4oqT8js9vAg5SZY3w6JgkJ';
-
-io.sockets.on('connection', function (socket) {
- //Send feed history
- socket.emit('feed', feed_log.slice(-10));
-
- socket.on('chat_register', function (data) {
- if (data.nick && data.key)
- connectIRC(socket, data.nick, data.key);
- });
-
- socket.on('disconnect', function() {
- disconnectSocket(socket);
- });
-});
-
-function handler(req, res) {
- if (req.method == 'POST') {
- var query = url.parse(req.url, true).query;
- if (query.api == api_key) {
- var body = '';
- req.on('data', function (data) {
- body += data;
- });
- req.on('end',function(){
- var POST = qs.parse(body);
- console.log(POST);
- feed(POST);
- res.writeHead(200);
- });
- }
- }
-
- res.end();
-}
-
-
-function feed(data) {
- feed_log.push(data);
- io.sockets.emit('feed', data);
-}
-
-
-
-global_irc = new _irc.Client('irc.hackthis.co.uk', 'ChatBot', {
- userName: 'ChatBot',
- realName: 'ChatBot',
- port: 6697,
- secure: true,
- selfSigned: true,
- certExpired: true,
- channels: ['#nukeland']
-});
-
-global_irc.setMaxListeners(0);
-global_irc.addListener('message', function (nick, chan, message) {
- irc_log.push({nick: nick, chan: chan, msg: message});
-}).addListener('join', function (chan, nick, message) {
- irc_log.push({nick: nick, chan: chan, info: 'join'});
-}).addListener('part', function (chan, nick, reason, message) {
- irc_log.push({nick: nick, info: 'part'});
-}).addListener('quit', function (nick, reason, channels, message) {
- irc_log.push({nick: nick, info: 'part'});
-}).addListener('topic', function (chan, topic, nick) {
- irc_topic = topic;
-}).addListener('names', function (chan, names) {
- irc_names = names;
-});
-
-
-function connectIRC(socket, nick, key) {
- console.log(key + ' - New connection');
- socket.nick = nick;
- socket.key = key;
-
- //lookup existing connection
- if (socket.key in irc_clients) {
- irc_clients[socket.key].connections++;
- socket.irc = irc_clients[socket.key].client;
- } else {
- console.log(key + ' - Creating IRC connection');
- socket.irc = new _irc.Client('irc.hackthis.co.uk', nick, {
- userName: nick,
- realName: nick,
- channels: ['#nukeland']
- });
-
- irc_clients[socket.key] = {connections: 1, client: socket.irc};
- }
-
- // for (var i = 0; i < connections.length; i++) {
- // if (connections[i].key == socket.key && connections[i].nick == socket.nick) {
- // console.log('IRC user already active');
- // socket.irc = connections[i].irc;
- // break;
- // }
- // }
-
- // if (!socket.irc) {
- // console.log('Creating new IRC user');
- // socket.irc = new _irc.Client('irc.hackthis.co.uk', nick, {
- // userName: nick,
- // realName: nick,
- // channels: ['#nukeland']
- // });
- // }
-
- //redefine handler
- socket.irc.setMaxListeners(0);
- socket.irc.addListener('message', function (nick, chan, message) {
- // Check for ctcp
- var action = message.match(/^\u0001ACTION (.*)\u0001$/);
- if (action) {
- socket.emit('chat', {nick: nick, chan: chan, msg: action[1], info: 'action'});
- } else {
- socket.emit('chat', {nick: nick, chan: chan, msg: message});
- }
- }).addListener('join', function (chan, nick, message) {
- socket.emit('chat', {nick: nick, chan: chan, msg: message, info: 'join'});
- }).addListener('part', function (chan, nick, reason, message) {
- socket.emit('chat', {nick: nick, chan: chan, msg: message, info: 'part'});
- }).addListener('quit', function (nick, reason, channels, message) {
- socket.emit('chat', {nick: nick, info: 'part'});
- }).addListener('registered', function (message) {
- socket.emit('chat', {info: 'registered'});
- }).addListener('topic', function (chan, topic, nick) {
- socket.emit('chat', {nick: nick, topic: topic, info: 'topic'});
- });
-
- socket.on('chat', function (data) {
- if (data.msg.substring(0, 4) == "/me ")
- socket.irc.action('#nukeland', data.msg.substring(4));
- else
- socket.irc.say('#nukeland', data.msg);
- });
-
- connections.push(socket);
-
- //Send history
- socket.emit('chat', irc_log.slice(-25));
- socket.emit('chat', {topic: irc_topic, info: 'topic'});
- socket.emit('chat', {names: irc_names, info: 'names'});
-}
-
-function disconnectSocket(socket) {
- key = socket.key;
- if (key in irc_clients) {
- console.log(key + ' - Client disconnected: ' + irc_clients[key].connections + ' connections');
- } else {
- console.log(key + ' - Client disconnected');
- }
-
- (function(key) {
- setTimeout(function(){disconnectIRC(key)}, 15000);
- })(key);
- /*setTimeout(function() {
- // console.log('Deleting connection...');
-
- // irc = socket.irc;
- // connections.splice(connections.indexOf(socket), 1);
-
- // if (!irc)
- // return;
-
- // if (connections.length > 0) {
- // var n = 0;
- // connections.forEach(function(item) {
- // if (item.irc === irc)
- // n++;
- // });
-
- // if (n === 0) {
- // console.log('Disconnecting from IRC');
- // irc.disconnect();
- // } else {
- // console.log('IRC connection in use');
- // }
- // } else {
- // console.log('No other connections');
- // irc.disconnect();
- // }
-
- console.log(key + ' - Timeout');
- if (key in irc_clients) {
- irc_clients[key].connections--;
- console.log(key + ' - ' + irc_clients[key].connections + ' connections');
-
- if (irc_clients[key].connections == 0) {
- irc_clients[key].client.disconnect();
- delete irc_clients[key];
- }
- }
- }, 15000, key);*/
-
- connections.splice(connections.indexOf(socket), 1);
-}
-
-function disconnectIRC(key) {
- if (key in irc_clients) {
- irc_clients[key].connections--;
- console.log(key + ' - Timeout: ' + irc_clients[key].connections + ' connections');
-
- if (irc_clients[key].connections == 0) {
- irc_clients[key].client.disconnect();
- delete irc_clients[key];
- }
- } else {
- console.log(key + ' - Timeout');
- }
-}
\ No newline at end of file
diff --git a/node/test.html b/node/test.html
deleted file mode 100644
index dc96e9f..0000000
--- a/node/test.html
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
-
-
-
-
You post will be displayed here:
-
-
\ No newline at end of file
diff --git a/phpunit/dbTest.php b/phpunit/dbTest.php
deleted file mode 100644
index bb2c182..0000000
--- a/phpunit/dbTest.php
+++ /dev/null
@@ -1,62 +0,0 @@
-db = new PDO($dsn, 'ubuntu');
- } catch(PDOException $e) {
- die($e->getMessage());
- }
- }
-
- public function testInsertUser() {
- $this->db->query("INSERT INTO users (`username`, `password`, `email`) VALUES ('flabbyrabbit', 'pass', 'test@test.com');");
- $this->db->query("INSERT INTO users (`username`, `password`, `email`) VALUES ('osaka', 'pass2', 'test2@test.com');");
-
- $st = $this->db->query("SELECT count(user_id) AS count FROM users;");
- $row = $st->fetch();
- $this->assertEquals(2, $row['count']);
-
- // $st = $this->db->query("SELECT password, score FROM users WHERE username = 'flabbyrabbit");
- // $row = $st->fetch();
- // $this->assertEquals('pass', $row['password']);
- // $this->assertEquals(0, $row['score']);
- }
-
- /**
- * @depends testInsertUser
- */
- public function testMedals() {
- // Medals
- $this->db->query("INSERT INTO medals_colours (`reward`, `colour`) VALUES (100, 'bronze')");
- $this->db->query("INSERT INTO medals_colours (`reward`, `colour`) VALUES (200, 'silver')");
- $this->db->query("INSERT INTO medals (`label`, `colour_id`, `description`) VALUES ('Test', 1, 'Test')");
- $this->db->query("INSERT INTO medals (`label`, `colour_id`, `description`) VALUES ('Test', 2, 'Test')");
-
- // Award medal
- $this->db->query("INSERT INTO users_medals (`user_id`, `medal_id`) VALUES (1, 1)");
- $this->db->query("INSERT INTO users_medals (`user_id`, `medal_id`) VALUES (2, 1)");
- $this->db->query("INSERT INTO users_medals (`user_id`, `medal_id`) VALUES (2, 2)");
-
- $res = $this->db->query("INSERT INTO users_medals (`user_id`, `medal_id`) VALUES (2, 2)");
- $this->assertFalse($res);
-
- // Check user scores
- $st = $this->db->query("SELECT score FROM users WHERE user_id = 1");
- $row = $st->fetch();
- $this->assertEquals(100, $row['score']);
-
- $st = $this->db->query("SELECT score FROM users WHERE user_id = 2");
- $row = $st->fetch();
- $this->assertEquals(300, $row['score']);
-
- // Remove medal and check user score
- $this->db->query("DELETE FROM users_medals WHERE `user_id` = 2 AND `medal_id` = 2");
-
- $st = $this->db->query("SELECT score FROM users WHERE user_id = 2");
- $row = $st->fetch();
- $this->assertEquals(100, $row['score']);
- }
-}
-?>
\ No newline at end of file
diff --git a/sql/schema.sql b/sql/schema.sql
index 21f0e69..100571b 100644
--- a/sql/schema.sql
+++ b/sql/schema.sql
@@ -13,6 +13,8 @@ CREATE TABLE IF NOT EXISTS users (
`email` varchar(128) NOT NULL,
`verified` tinyint(1) NOT NULL DEFAULT 0,
`score` mediumint(6) NOT NULL DEFAULT 0,
+ `g_auth` tinyint(1),
+ `g_secret` varchar(255),
PRIMARY KEY (`user_id`),
UNIQUE KEY (`username`),
UNIQUE KEY (`email`)
@@ -245,7 +247,7 @@ CREATE TABLE IF NOT EXISTS levels (
CREATE TABLE IF NOT EXISTS levels_data (
`level_id` tinyint(3) UNSIGNED NOT NULL AUTO_INCREMENT,
- `key` enum('author', 'reward', 'form', 'answer', 'articles', 'hint', 'description', 'solution', 'code') NOT NULL,
+ `key` enum('author', 'reward', 'form', 'answer', 'articles', 'hint', 'description', 'solution', 'code', 'uptime') NOT NULL,
`value` text NOT NULL,
PRIMARY KEY (`level_id`, `key`),
FOREIGN KEY (`level_id`) REFERENCES levels (`level_id`)
@@ -486,6 +488,8 @@ CREATE TABLE IF NOT EXISTS mod_reports (
`about` int(7) NOT NULL,
`subject` varchar(64),
`body` text,
+ `visible` tinyint(1) DEFAULT 1,
+ `time` timestamp DEFAULT CURRENT_TIMESTAMP,
PRIMARY KEY (`report_id`),
FOREIGN KEY (`user_id`) REFERENCES users (`user_id`)
) ENGINE=InnoDB;
+ 
video)): ?>
- 
+ 
-
-
- 
+ 
+ 