From ff4409c745ee9a48e1fd105eff2095df1d9abe95 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Felix=20D=C3=B6rre?= <felix@dogcraft.de>
Date: Wed, 5 Nov 2014 10:38:36 +0100
Subject: [PATCH] UPD: Fill up index pages with old descriptive text.

---
 src/org/cacert/gigi/pages/MainPage.java       | 11 +++++++++-
 src/org/cacert/gigi/pages/MainPage.templ      | 14 +++++++++++++
 .../cacert/gigi/pages/MainPageNotLogin.templ  | 21 +++++++++++++++++++
 3 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 src/org/cacert/gigi/pages/MainPage.templ
 create mode 100644 src/org/cacert/gigi/pages/MainPageNotLogin.templ

diff --git a/src/org/cacert/gigi/pages/MainPage.java b/src/org/cacert/gigi/pages/MainPage.java
index bb9c71c3..6e4d8ea2 100644
--- a/src/org/cacert/gigi/pages/MainPage.java
+++ b/src/org/cacert/gigi/pages/MainPage.java
@@ -1,19 +1,28 @@
 package org.cacert.gigi.pages;
 
 import java.io.IOException;
+import java.util.HashMap;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.cacert.gigi.output.template.Template;
+
 public class MainPage extends Page {
 
+    Template notLog = new Template(MainPage.class.getResource("MainPageNotLogin.templ"));
+
     public MainPage(String title) {
         super(title);
     }
 
     @Override
     public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
-        resp.getWriter().println("Access granted.");
+        if (LoginPage.getUser(req) != null) {
+            getDefaultTemplate().output(resp.getWriter(), getLanguage(req), new HashMap<String, Object>());
+        } else {
+            notLog.output(resp.getWriter(), getLanguage(req), new HashMap<String, Object>());
+        }
     }
 
     @Override
diff --git a/src/org/cacert/gigi/pages/MainPage.templ b/src/org/cacert/gigi/pages/MainPage.templ
new file mode 100644
index 00000000..5dfe0a9f
--- /dev/null
+++ b/src/org/cacert/gigi/pages/MainPage.templ
@@ -0,0 +1,14 @@
+<p><?=_Welcome to your account section of the website. Below is a description of the different sections and what they're for.?></p>
+<H4><?=_CAcert.org?></H4>
+<p><?=_If you would like to view news items or change languages you can click the logout or go home links. Go home doesn't log you out of the system, just returns you to the front of the website. Logout logs you out of the system.?></p>
+<H4><?=_My Details?></H4>
+<p><?=_In this section you will be able to edit your personal information (if you haven't been assured), update your pass phrase, and lost pass phrase questions. You will also be able to set your location for the Web of Trust, it also effects the email announcement settings which among other things can be set to notify you if you're within 200km of a planned assurance event. You'll also be able to set additional contact information when you become fully trusted, so others can contact you to meet up outside official events.?></p>
+<h4><?=_Email Accounts and Client Certificates?></h4>
+<p><?=_The email account section is for adding/updating/removing email accounts which can be used to issue client certificates against. The client certificate section steps you through generating a certificate signing request for one or more emails you've registered in the email account section.?></p>
+<h4><?=_Domains and Server Certificates.?></h4>
+<p><?=_Before you can start issuing certificates for your website, irc server, smtp server, pop3, imap etc you will need to add domains to your account under the domain menu. You can also remove domains from here as well. Once you've added a domain you are free then to go into the Server Certificate section and start pasting CSR into the website and have the website return you a valid certificate for up to 2 years if you have 50 trust points, or 6 months for no trust points.?></p>
+<h4><?=_Org Client and Server Certificates?></h4>
+<p><?=_Once you have verified your company you will see these menu options. They allow you to issue as many certificates as you like without proving individual email accounts as you like, further more you are able to get your company details on the certificate.?></p>
+<h4><?=_CAcert Web of Trust?></h4>
+<p><?=_The Web of Trust system CAcert uses is similar to that many involved with GPG/PGP use, they hold face to face meetings to verify each others photo identities match their GPG/PGP key information. CAcert differs however in that we have modified things to work within the PKI framework, for you to gain trust in the system you must first locate someone already trusted. The trust person depending how many people they've trusted or meet before will determine how many points they can issue to you (the number of points they can issue is listed in the locate assurer section). Once you've met up you can show your ID and you will need to fill out a CAP form which the person assuring your details must retain for verification reasons.?></p>
+<p><b><?=s,!"<a href='//wiki.cacert.org/TTP/TTPuser'>https://wiki.cacert.org/TTP/TTPuser</a>",!"<a href='//wiki.cacert.org/TTP/TTPAL'>https://wiki.cacert.org/TTP/TTPAL</a>",For information about the TTP-assisted-assurance program please read %s and %s.?></b></p>
diff --git a/src/org/cacert/gigi/pages/MainPageNotLogin.templ b/src/org/cacert/gigi/pages/MainPageNotLogin.templ
new file mode 100644
index 00000000..80c5d2bf
--- /dev/null
+++ b/src/org/cacert/gigi/pages/MainPageNotLogin.templ
@@ -0,0 +1,21 @@
+<h3><?=_Are you new to CAcert??></h3>
+
+<p><?=_CAcert.org is a community-driven Certificate Authority that issues certificates to the public at large for free.?></p>
+
+<p><?=_CAcert's goal is to promote awareness and education on computer security through the use of encryption, specifically by providing cryptographic certificates. These certificates can be used to digitally sign and encrypt email, authenticate and authorize users connecting to websites and secure data transmission over the internet. Any application that supports the Secure Socket Layer Protocol (SSL or TLS) can make use of certificates signed by CAcert, as can any application that uses X.509 certificates, e.g. for encryption or code signing and document signatures.?></p>
+
+<p><?=s,!"<a href='/register'>",!"</a>",If you want to have free certificates issued to you, %s join the CAcert Community %s.?></p>
+
+<p><?=s,!"<a href='/policy/RootDistributionLicense.html'>",!"</a>",If you want to use certificates issued by CAcert, read the CAcert %s Root Distribution License %s.?>
+<?=s,!"<a href='/roots'>",!"</a>",This license applies to using the CAcert %s root keys %s.?></p>
+
+<hr/>
+
+<h3><?=_For CAcert Community Members?></h3>
+
+<p><?=s,!"<a href='http://wiki.cacert.org/wiki/AssurerChallenge'>",!"</a>",Have you passed the CAcert %s Assurer Challenge %s yet??></p>
+
+<p><?=s,!"<a href='/policy/CAcertCommunityAgreement.html'>",!"</a>",Have you read the CAcert %sCommunity Agreement%s yet??></p>
+
+<p><?=s,!"<a href='http://wiki.CAcert.org'>",!"</a>",For general documentation and help, please visit the CAcert %sWiki Documentation site %s.?>
+<?=s,!"<a href='/policy/'>",!"</a>",For specific policies, see the CAcert %sApproved Policies page%s.?></p>
-- 
2.39.2