[icinga-checkins] icinga.org: icinga-web/next: Copyright in Viewport template

git at icinga.org git at icinga.org
Wed Apr 3 17:08:25 CEST 2013


Module: icinga-web
Branch: next
Commit: 5916023604b916fd2e9000df062a19a3f2dd233c
URL:    https://git.icinga.org/?p=icinga-web.git;a=commit;h=5916023604b916fd2e9000df062a19a3f2dd233c

Author: Marius Hein <marius.hein at netways.de>
Date:   Wed Apr  3 17:06:25 2013 +0200

Copyright in Viewport template

Fix wrong copyright in some files, dynamic copyright from
configuration within ViewPort template, added php tags
for file license in ViewPort template.

fixes #3920

---

 app/config/icinga.xml.in        |    2 +-
 app/templates/ExtJsViewport.php |    4 +++-
 doc/LICENSE                     |    4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/config/icinga.xml.in b/app/config/icinga.xml.in
index 2333aae..cf26297 100644
--- a/app/config/icinga.xml.in
+++ b/app/config/icinga.xml.in
@@ -51,7 +51,7 @@
         
         <setting name="version.release"/>
     -->
-    <setting name="version.copyright"><![CDATA[© 2009-2012 Icinga Developer Team]]></setting>
+    <setting name="version.copyright"><![CDATA[© 2009-2013 Icinga Developer Team]]></setting>
     <setting name="version.homeref"><![CDATA[<a href="http://www.icinga.org/">www.icinga.org</a>]]></setting>
     <setting name="version.major">@VERSION_MAJOR@</setting>
     <setting name="version.minor">@VERSION_MINOR@</setting>
diff --git a/app/templates/ExtJsViewport.php b/app/templates/ExtJsViewport.php
index 6ecc776..59c7cfc 100644
--- a/app/templates/ExtJsViewport.php
+++ b/app/templates/ExtJsViewport.php
@@ -1,3 +1,4 @@
+<?php
 // {{{ICINGA_LICENSE_CODE}}}
 // -----------------------------------------------------------------------------
 // This file is part of icinga-web.
@@ -19,6 +20,7 @@
 // along with icinga-web.  If not, see <http://www.gnu.org/licenses/>.
 // -----------------------------------------------------------------------------
 // {{{ICINGA_LICENSE_CODE}}}
+?>
 <!DOCTYPE html>
 <html>
     <head>
@@ -33,7 +35,7 @@
         ?></title>
 
         <meta charset="UTF-8">
-        <meta name="author" content="(c) 2009-2012 Icinga developer team - www.icinga.org">
+        <meta name="author" content="<?php echo AgaviConfig::get('org.icinga.version.copyright') ?> - http://www.icinga.org">
         <meta name="robots" content="noindex">
         <meta http-equiv="X-UA-Compatible" content="IE=edge">
 
diff --git a/doc/LICENSE b/doc/LICENSE
index 84d37a6..c7804b8 100644
--- a/doc/LICENSE
+++ b/doc/LICENSE
@@ -5,7 +5,7 @@ icinga-web:
 
 a new generation interface for Icinga.
 
-Copyright (c) 2009-2012, Icinga Development Team
+Copyright (c) 2009-2013, Icinga Development Team
 All rights reserved.
 
 http://www.icinga.org
@@ -18,7 +18,7 @@ the Open Source GPL version 3 license.
 Opensource License:
 
 icinga-web, web2.0 frontend for the Icinga core
-Copyright (C) 2009-2012  Icinga Development Team
+Copyright (C) 2009-2013  Icinga Development Team
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by





More information about the icinga-checkins mailing list