Add: Added support for $year$

diff --git a/src/org/cacert/gigi/Gigi.java b/src/org/cacert/gigi/Gigi.java
index a888b0912cb7e4d5eaa17fbc82283306db08394b..7144ea270870821dcf5c566ea496898ecbfe035c 100644 (file)
--- 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 b2ce68870e5dfe5b6c70aa6436992066f1005c8b..98f6e239e1ab679317f36b51804150b1707ab6c8 100644 (file)
--- 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>