From 6184c4270663900df7989ed83a46717389c1a9ac Mon Sep 17 00:00:00 2001
From: Janis Streib <janis@dogcraft.de>
Date: Fri, 20 Jun 2014 20:58:44 +0200
Subject: [PATCH] Add: Added support for $year$

---
 src/org/cacert/gigi/Gigi.java | 4 ++++
 templates/base.html           | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/org/cacert/gigi/Gigi.java b/src/org/cacert/gigi/Gigi.java
index a888b091..7144ea27 100644
--- a/src/org/cacert/gigi/Gigi.java
+++ b/src/org/cacert/gigi/Gigi.java
@@ -6,6 +6,7 @@ import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.security.cert.X509Certificate;
+import java.util.Calendar;
 import java.util.HashMap;
 
 import javax.servlet.ServletException;
@@ -84,12 +85,15 @@ public class Gigi extends HttpServlet {
 		}
 		if (pages.containsKey(req.getPathInfo())) {
 			String b0 = baseTemplate[0];
+			int year = Calendar.getInstance().get(Calendar.YEAR);
 			Page p = pages.get(req.getPathInfo());
 			b0 = b0.replaceAll("\\$title\\$", p.getTitle());
+			b0 = b0.replaceAll("\\$year\\$", year + "");
 			resp.getWriter().print(b0);
 			p.doGet(req, resp);
 			String b1 = baseTemplate[1];
 			b1 = b1.replaceAll("\\$title\\$", p.getTitle());
+			b1 = b1.replaceAll("\\$year\\$", year + "");
 			resp.getWriter().print(b1);
 		} else {
 			resp.sendError(404, "Page not found.");
diff --git a/templates/base.html b/templates/base.html
index b2ce6887..98f6e239 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -109,7 +109,7 @@
 				href="http://wiki.cacert.org/wiki/CAcertIncorporated">Vereins-Mitgliedschaft</a>
 			| <a href="/policy/PrivacyPolicy.html">Datenschutzrichtlinien</a> | <a
 				href="/index.php?id=51">Unsere Ziele</a> | <a
-				href="/index.php?id=11">Kontakt</a> | ©2002-2014 von CAcert
+				href="/index.php?id=11">Kontakt</a> | ©2002-$year$ von CAcert
 		</div>
 	</div>
 	</div>
-- 
2.39.2