From 1ff9ccd01eca5b0b3ae9a397b9950d268258b4fe Mon Sep 17 00:00:00 2001 From: Andrea Spacca Date: Sat, 10 Jul 2021 20:20:19 +0200 Subject: [PATCH] copyright update --- LICENSE | 2 ++ README.md | 3 +++ server/clamav.go | 2 ++ server/codec.go | 48 ++++++++++++++++------------------------------ server/handlers.go | 2 ++ server/utils.go | 2 ++ 6 files changed, 27 insertions(+), 32 deletions(-) diff --git a/LICENSE b/LICENSE index bc796f9..8af1a8e 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,8 @@ The MIT License (MIT) Copyright (c) 2014-2018 DutchCoders [https://github.com/dutchcoders/] +Copyright (c) 2018-2020 Andrea Spacca. +Copyright (c) 2020- Andrea Spacca and Stefan Benten. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index 8e385c4..01dfdd2 100644 --- a/README.md +++ b/README.md @@ -224,4 +224,7 @@ Contributions are welcome. ## Copyright and license Code and documentation copyright 2011-2018 Remco Verhoef. +Code and documentation copyright 2018-2020 Andrea Spacca. +Code and documentation copyright 2020- Andrea Spacca and Stefan Benten. + Code released under [the MIT license](LICENSE). diff --git a/server/clamav.go b/server/clamav.go index 06edf1b..e16a28c 100644 --- a/server/clamav.go +++ b/server/clamav.go @@ -2,6 +2,8 @@ The MIT License (MIT) Copyright (c) 2014-2017 DutchCoders [https://github.com/dutchcoders/] +Copyright (c) 2018-2020 Andrea Spacca. +Copyright (c) 2020- Andrea Spacca and Stefan Benten. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/server/codec.go b/server/codec.go index 1ede6a9..1bd304f 100644 --- a/server/codec.go +++ b/server/codec.go @@ -1,33 +1,31 @@ /* -https://github.com/fs111/kurz.go/blob/master/src/codec.go +The MIT License (MIT) -Originally written and Copyright (c) 2011 André Kelpe -Modifications Copyright (c) 2015 John Ko +Copyright (c) 2020- Andrea Spacca and Stefan Benten. -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: +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 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. +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. */ package server import ( - "math" "math/rand" - "strings" ) const ( @@ -48,17 +46,3 @@ func Token(length int) string { return result } - -// Decodes a string given in our encoding and returns the decimal -// integer. -func Decode(input string) int64 { - const floatbase = float64(BASE) - l := len(input) - var sum int = 0 - for index := l - 1; index > -1; index -= 1 { - current := string(input[index]) - pos := strings.Index(SYMBOLS, current) - sum = sum + (pos * int(math.Pow(floatbase, float64((l-index-1))))) - } - return int64(sum) -} diff --git a/server/handlers.go b/server/handlers.go index 199668f..1531fcb 100644 --- a/server/handlers.go +++ b/server/handlers.go @@ -2,6 +2,8 @@ The MIT License (MIT) Copyright (c) 2014-2017 DutchCoders [https://github.com/dutchcoders/] +Copyright (c) 2018-2020 Andrea Spacca. +Copyright (c) 2020- Andrea Spacca and Stefan Benten. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/server/utils.go b/server/utils.go index ff8973d..4b7ee3d 100644 --- a/server/utils.go +++ b/server/utils.go @@ -2,6 +2,8 @@ The MIT License (MIT) Copyright (c) 2014-2017 DutchCoders [https://github.com/dutchcoders/] +Copyright (c) 2018-2020 Andrea Spacca. +Copyright (c) 2020- Andrea Spacca and Stefan Benten. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal