Fixed copyright notice

- fixed copyright place inside HTML file in order to keep encoding information in the first 1024 bytes
- updated licence notice to AGPL
This commit is contained in:
Giulio Cesare Solaroli 2015-07-31 18:29:15 +02:00
parent 80b82d2524
commit ce3fd5d19c
4 changed files with 8 additions and 9 deletions

View File

@ -1,12 +1,11 @@
<!--
@copyright@
-->
<html manifest="manifest.appcache">
<head>
<title>Clipperz - keep it to yourself</title>
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<!--
@copyright@
-->
<meta name="viewport" content="width=device-width, height=device-height, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0" />
<meta name="robots" content="noindex" />
<meta http-equiv="cleartype" content="on" />

View File

@ -1,6 +1,6 @@
@clipperz.license@
==> This application is build using also the following libraries
==> This application is build using also the following libraries
# MochiKit (http://www.mochikit.com)
* Repository: @mochikit.repository@ (version: @mochikit.version@ - commit: @mochikit.commit@)
@ -62,5 +62,4 @@
* Other contributors: Greg Holt, Andrew Kepert, Ydnar, Lostinet
* License: http://opensource.org/licenses/BSD-3-Clause
===============================================================================
===============================================================================

View File

@ -1,3 +1,4 @@
GNU AFFERO GENERAL PUBLIC LICENSE
Copyright 2008-2015 Clipperz Srl
@ -29,4 +30,4 @@ For further information about Clipperz: https://clipperz.is
this application refer to this page:
<https://clipperz.is/security_privacy/security_code_review/>
===============================================================================
===============================================================================

View File

@ -314,7 +314,7 @@ class FrontendBuilder(object):
if not self.processedFiles.has_key(processedFile):
#self.log("assembling copyright header")
copyrightValues = self.settings['copyright.values']
license = self.loadFilesContent('../../properties', ['license.txt'])
license = self.loadFilesContent('../../properties', ['license.AGPL.txt'])
result = self.loadFilesContent('properties', ['creditsAndCopyrights.txt'])
result = re.sub('@clipperz.license@', license, result)