diff --git a/LICENSE b/LICENSE index 5bb952ef..a672ccb3 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ /* The MIT License (MIT) -Copyright (c) 2013 Calvin Montgomery and contributors +Copyright (c) 2013-2015 Calvin Montgomery and contributors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: diff --git a/README.md b/README.md index 60729e7b..bed06466 100644 --- a/README.md +++ b/README.md @@ -89,5 +89,4 @@ Please open a GitHub Issue. License ------- -Licensed under MIT -See LICENSE for the full license text +Licensed under MIT. See LICENSE for the full license text. diff --git a/lib/acp.js b/lib/acp.js index b860e780..fd670401 100644 --- a/lib/acp.js +++ b/lib/acp.js @@ -1,14 +1,3 @@ -/* -The MIT License (MIT) -Copyright (c) 2013 Calvin Montgomery - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -*/ - var Logger = require("./logger"); var Server = require("./server"); var db = require("./database"); diff --git a/lib/asyncqueue.js b/lib/asyncqueue.js index 7d450855..2383056c 100644 --- a/lib/asyncqueue.js +++ b/lib/asyncqueue.js @@ -1,14 +1,3 @@ -/* -The MIT License (MIT) -Copyright (c) 2013 Calvin Montgomery - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -*/ - var AsyncQueue = function () { this._q = []; this._lock = false; diff --git a/lib/bgtask.js b/lib/bgtask.js index 9cf1367e..02aca717 100644 --- a/lib/bgtask.js +++ b/lib/bgtask.js @@ -1,15 +1,3 @@ - -/* -The MIT License (MIT) -Copyright (c) 2013 Calvin Montgomery - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -*/ - /* bgtask.js diff --git a/lib/config.js b/lib/config.js index 94bb7987..2af23154 100644 --- a/lib/config.js +++ b/lib/config.js @@ -1,14 +1,3 @@ -/* -The MIT License (MIT) -Copyright (c) 2013 Calvin Montgomery - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -*/ - var fs = require("fs"); var path = require("path"); var Logger = require("./logger"); diff --git a/lib/filter-master.js b/lib/filter-master.js deleted file mode 100644 index 3a7e4a67..00000000 --- a/lib/filter-master.js +++ /dev/null @@ -1,49 +0,0 @@ -function FilterMaster(worker) { - this.waiting = {}; - this.worker = worker; - this.id = 0; - - this.worker.on("message", this.handleMessage.bind(this)); -} - -FilterMaster.prototype.filterMessage = function (channel, message, cb) { - var req = { - cmd: "filter", - channel: channel.name, - message: message, - id: this.id++ - }; - - var resdata = { - cb: cb, - channel: channel, - message: message, - time: Date.now() - }; - - this.waiting[req.id] = resdata; - this.worker.send(req); -}; - -FilterMaster.prototype.handleMessage = function (data) { - if (data.cmd === "filterResult") { - var res = this.waiting[data.id]; - if (!res) return; - delete this.waiting[data.id]; - - if (data.error) { - // TODO log error - return; - } - - res.cb(data.message); - } else if (data.cmd === "needFilterData") { - var res = this.waiting[data.id]; - if (!res) return; - - var data = { - filters: res.channel.modules.filters.filters.pack(), - channel: res.channel.name, - - } -}; diff --git a/lib/filter-worker.js b/lib/filter-worker.js deleted file mode 100644 index 5658030f..00000000 --- a/lib/filter-worker.js +++ /dev/null @@ -1,84 +0,0 @@ -var FilterList = require("./channel/filters").FilterList; - -function FilterWorker() { - this.cache = {}; -} - -FilterWorker.prototype.cacheData = function (channel, filters, convertLinks) { - this.cache[channel] = { - filters: new FilterList(filters), - convertLinks: convertLinks - }; -}; - -FilterWorker.prototype.removeData = function (channel) { - if (this.cache.hasOwnProperty(channel)) { - delete this.cache[channel]; - } -}; - -FilterWorker.prototype.hasData = function (channel) { - return this.cache.hasOwnProperty(channel); -}; - -const link = /(\w+:\/\/(?:[^:\/\[\]\s]+|\[[0-9a-f:]+\])(?::\d+)?(?:\/[^\/\s]*)*)/ig; -FilterWorker.prototype.filterMessage = function (channel, msg) { - if (!this.hasData(channel)) { - throw new Error("Missing channel data"); - } - - var parts = msg.split(link); - var filters = this.cache[channel].filters; - var convertLinks = this.cache[channel].convertLinks; - - for (var j = 0; j < parts.length; j++) { - /* substring is a URL */ - if (convertLinks && parts[j].match(link)) { - var original = parts[j]; - parts[j] = filters.exec(parts[j], { filterlinks: true }); - - /* no filters changed the URL, apply link filter */ - if (parts[j] === original) { - parts[j] = url.format(url.parse(parts[j])); - parts[j] = parts[j].replace(link, "$1"); - } - - } else { - /* substring is not a URL */ - parts[j] = filters.exec(parts[j], { filterlinks: false }); - } - } - - msg = parts.join(""); -}; - -var procWorker = new FilterWorker(); -process.on("message", function (data) { - if (data.cmd === "addChannel") { - procWorker.cacheData(data.channel.toLowerCase(), data.filters, data.convertLinks); - } else if (data.cmd === "delChannel") { - procWorker.removeData(data.channel.toLowerCase()); - } else if (data.cmd === "filter") { - try { - var filtered = procWorker.filterMessage(data.channel.toLowerCase(), data.message); - process.send({ - cmd: "filterResult", - id: data.id, - message: filtered - }); - } catch (err) { - if (err.message === "Missing channel data") { - process.send({ - cmd: "needFilterData", - id: data.id - }); - } else { - process.send({ - cmd: "filterResult", - id: data.id, - error: err - }); - } - } - } -}); diff --git a/lib/filter.js b/lib/filter.js deleted file mode 100644 index f7213fe1..00000000 --- a/lib/filter.js +++ /dev/null @@ -1,37 +0,0 @@ -/* -The MIT License (MIT) -Copyright (c) 2013 Calvin Montgomery - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -*/ - -var Filter = function(name, regex, flags, replace) { - this.name = name; - this.source = regex; - this.flags = flags; - this.regex = new RegExp(this.source, this.flags); - this.replace = replace; - this.active = true; - this.filterlinks = false; -} - -Filter.prototype.pack = function() { - return { - name: this.name, - source: this.source, - flags: this.flags, - replace: this.replace, - active: this.active, - filterlinks: this.filterlinks - } -} - -Filter.prototype.filter = function(text) { - return text.replace(this.regex, this.replace); -} - -exports.Filter = Filter; diff --git a/lib/get-info.js b/lib/get-info.js index f4d702e9..e016fe2c 100644 --- a/lib/get-info.js +++ b/lib/get-info.js @@ -1,13 +1,3 @@ -/* -The MIT License (MIT) -Copyright (c) 2013 Calvin Montgomery - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -*/ var http = require("http"); var https = require("https"); var Logger = require("./logger.js"); diff --git a/lib/logger.js b/lib/logger.js index 2b3851c1..84f4ef48 100644 --- a/lib/logger.js +++ b/lib/logger.js @@ -1,14 +1,3 @@ -/* -The MIT License (MIT) -Copyright (c) 2013 Calvin Montgomery - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -*/ - var fs = require("fs"); var path = require("path"); diff --git a/lib/nodefilterlist.js b/lib/nodefilterlist.js deleted file mode 100644 index 3eea873a..00000000 --- a/lib/nodefilterlist.js +++ /dev/null @@ -1,57 +0,0 @@ -function fixFilter(f) { - if (typeof f.name !== "string" || - typeof f.source !== "string" || - typeof f.replace !== "string") { - - return null; - } - - f.replace = f.replace.replace(/([^\\]\\(\d)/g, "$1$$$2"); - - if (typeof f.flags !== "string") { - f.flags = ""; - } - - f.active = !!f.active; - f.filterlinks = !!f.filterlinks; - return f; -} - -function NodeFilterList(filters) { - if (!filters) filters = []; - - this.filters = filters.map(function (f) { - f.regexp = new RegExp(f.source, f.flags); - return f; - }); -} - -NodeFilterList.prototype.pack = function () { - return this.filters.map(function (f) { - return { - name: f.name, - source: f.source, - flags: f.flags, - replace: f.replace, - active: f.active, - filterlinks: f.filterlinks - }; - }); -}; - -NodeFilterList.prototype.addFilter = function (f) { - this.filters.push(f); -}; - -NodeFilterList.prototype.updateFilter = function (f) { - if (!f.name) return; - - for (var i = 0; i < this.filters.length; i++) { - if (this.filters[i].name === filter.name) { - for (var key in f) { - this.filters[i][key] = f[key]; - } - break; - } - } -}; diff --git a/lib/poll.js b/lib/poll.js index 43344055..64b1454a 100644 --- a/lib/poll.js +++ b/lib/poll.js @@ -1,13 +1,3 @@ -/* -The MIT License (MIT) -Copyright (c) 2013 Calvin Montgomery - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -*/ const link = /(\w+:\/\/(?:[^:\/\[\]\s]+|\[[0-9a-f:]+\])(?::\d+)?(?:\/[^\/\s]*)*)/ig; var XSS = require("./xss"); diff --git a/lib/server.js b/lib/server.js index 8e4080c2..1082aa57 100644 --- a/lib/server.js +++ b/lib/server.js @@ -1,14 +1,3 @@ -/* -The MIT License (MIT) -Copyright (c) 2013 Calvin Montgomery - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -*/ - const VERSION = "3.6.0"; var singleton = null; var Config = require("./config"); diff --git a/lib/ullist.js b/lib/ullist.js index 47cd50c3..535c3982 100644 --- a/lib/ullist.js +++ b/lib/ullist.js @@ -1,14 +1,3 @@ -/* -The MIT License (MIT) -Copyright (c) 2013 Calvin Montgomery - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -*/ - /* ullist.js diff --git a/lib/xss.js b/lib/xss.js index 3e58434a..9b02ce2b 100644 --- a/lib/xss.js +++ b/lib/xss.js @@ -1,14 +1,3 @@ -/* -The MIT License (MIT) -Copyright (c) 2013 Calvin Montgomery - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -*/ - /* WARNING diff --git a/templates/footer.jade b/templates/footer.jade index a0324e58..d4be14d9 100644 --- a/templates/footer.jade +++ b/templates/footer.jade @@ -2,7 +2,7 @@ mixin footer footer#footer .container p.text-muted.credit. - Copyright © 2013-2014 Calvin Montgomery · GitHub · User Agreement · Contact · Wiki + Copyright © 2013-2015 Calvin Montgomery · GitHub · User Agreement · Contact · Wiki script(src="//code.jquery.com/jquery-1.11.0.min.js") // Must be included before jQuery-UI since jQuery-UI overrides jQuery.fn.button // I should really abandon this crap one day diff --git a/www/js/callbacks.js b/www/js/callbacks.js index a258458e..ef52d164 100644 --- a/www/js/callbacks.js +++ b/www/js/callbacks.js @@ -1,14 +1,3 @@ -/* -The MIT License (MIT) -Copyright (c) 2013 Calvin Montgomery - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -*/ - Callbacks = { error: function (reason) { diff --git a/www/js/data.js b/www/js/data.js index 21084f32..6fef78d5 100644 --- a/www/js/data.js +++ b/www/js/data.js @@ -1,14 +1,3 @@ -/* -The MIT License (MIT) -Copyright (c) 2013 Calvin Montgomery - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -*/ - var CL_VERSION = 3.0; var CLIENT = { diff --git a/www/js/player.js b/www/js/player.js index 1ffc767d..d0d0ef57 100644 --- a/www/js/player.js +++ b/www/js/player.js @@ -1,14 +1,3 @@ -/*} -The MIT License (MIT) -Copyright (c) 2013 Calvin Montgomery - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -*/ - var VIMEO_FLASH = false; function removeOld(replace) { diff --git a/www/js/ui.js b/www/js/ui.js index 3609faaa..ccdca705 100644 --- a/www/js/ui.js +++ b/www/js/ui.js @@ -1,14 +1,3 @@ -/* -The MIT License (MIT) -Copyright (c) 2013 Calvin Montgomery - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -*/ - /* window focus/blur */ $(window).focus(function() { FOCUSED = true; diff --git a/www/js/util.js b/www/js/util.js index e175cdfc..aadb8e83 100644 --- a/www/js/util.js +++ b/www/js/util.js @@ -1,14 +1,3 @@ -/* -The MIT License (MIT) -Copyright (c) 2013 Calvin Montgomery - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -*/ - function makeAlert(title, text, klass) { if(!klass) { klass = "alert-info";