f0ck/f0ckv1
3
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bugfix

Browse Source
This commit is contained in:
Flummi 2016-11-07 02:15:08 +01:00
parent 948fd4e647
commit 0826223d5c
2 changed files with 307 additions and 299 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/lib.js
View File

@ -40,8 +40,8 @@ module.exports = Lib;
function Lib() { function Lib() {
//self.cfg = require('../cfg/main.json'); //self.cfg = require('../cfg/main.json');
self.cfg = {}; self.cfg = {};
self.getcfg((cfg) => { self.getcfg('main', cfg => {
self.cfg = cfg; self.cfg.main = cfg;
self.debug = self.cfg.main.debug; self.debug = self.cfg.main.debug;
self.loadIRC(); self.loadIRC();
self.loadUser((cb) => console.log((cb)?"Admins wurden geladen":"Admins konnten nicht geladen werden")); self.loadUser((cb) => console.log((cb)?"Admins wurden geladen":"Admins konnten nicht geladen werden"));
@ -234,15 +234,17 @@ self.levelToModes = level => {
return ""; return "";
}; };
self.getcfg = (cb) => { self.getcfg = (kat, cb) => {
var out = { // main, websrv, irc
/*var out = {
irc: {}, irc: {},
main: {}, main: {},
websrv: {} websrv: {}
}; };*/
self.sql.query("select * from `f0ck`.`cfg`", (err, rows) => { var out = {};
self.sql.query("select * from `f0ck`.`cfg` where `class` = ?", kat, (err, rows) => {
rows.forEach(e => { rows.forEach(e => {
out[e.class][e.key] = ((type, value) => { out[e.key] = ((type, value) => {
switch(type) { switch(type) {
case 'string': case 'string':
return value; return value;
@ -264,6 +266,8 @@ self.getcfg = (cb) => {
}; };
self.loadIRC = () => { self.loadIRC = () => {
self.getcfg('irc', cfg => {
self.cfg.irc = cfg;
self.cfg.irc.forEach(e => { self.cfg.irc.forEach(e => {
self.bot.add({ self.bot.add({
"name": e.name, "name": e.name,
@ -279,4 +283,5 @@ self.loadIRC = () => {
}); });
console.log("Server "+e.name+" wurde geladen"); console.log("Server "+e.name+" wurde geladen");
}); });
});
}; };

3
src/websrv.js
View File

@ -13,6 +13,8 @@ module.exports = Websrv;
function Websrv(tlib) { function Websrv(tlib) {
this.lib = lib = tlib; this.lib = lib = tlib;
lib.getcfg('websrv', cfg => {
lib.cfg.websrv = cfg;
Websrv.prototype.getTpls(); Websrv.prototype.getTpls();
http.createServer((req, res) => { http.createServer((req, res) => {
@ -316,6 +318,7 @@ function Websrv(tlib) {
res.end('403 - forbidden'); res.end('403 - forbidden');
} }
}).listen(lib.cfg.websrv.port); }).listen(lib.cfg.websrv.port);
});
} }
Websrv.prototype.getTpls = () => { Websrv.prototype.getTpls = () => {