X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Foutput%2Ftemplate%2FTemplate.java;h=0bd9cce170096b4d4088ed158edca8c4f9dfb459;hb=cd14b85c60f736a643842b421b11f41d8fca86c7;hp=08f261afce3dc64c9c07d2e42d90544a2fa56b3c;hpb=def33550ed8f7bfc5f44dfc5e025d4be2092443e;p=gigi.git

diff --git a/src/org/cacert/gigi/output/template/Template.java b/src/org/cacert/gigi/output/template/Template.java
index 08f261af..0bd9cce1 100644
--- a/src/org/cacert/gigi/output/template/Template.java
+++ b/src/org/cacert/gigi/output/template/Template.java
@@ -15,150 +15,158 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import org.cacert.gigi.DevelLauncher;
-import org.cacert.gigi.Language;
-import org.cacert.gigi.output.Outputable;
+import org.cacert.gigi.localisation.Language;
+import org.cacert.gigi.util.HTMLEncoder;
 
 public class Template implements Outputable {
-	TemplateBlock data;
 
-	long lastLoaded;
-	File source;
+    private TemplateBlock data;
 
-	private static final Pattern CONTROL_PATTERN = Pattern.compile(" ?([a-z]+)\\(\\$([^)]+)\\) ?\\{ ?");
+    private long lastLoaded;
 
-	public Template(URL u) {
-		try {
-			Reader r = new InputStreamReader(u.openStream(), "UTF-8");
-			try {
-				if (u.getProtocol().equals("file") && DevelLauncher.DEVEL) {
-					source = new File(u.toURI());
-					lastLoaded = source.lastModified() + 1000;
-				}
-			} catch (URISyntaxException e) {
-				e.printStackTrace();
-			}
-			data = parse(r);
-			r.close();
-		} catch (IOException e) {
-			throw new Error(e);
-		}
-	}
+    private File source;
 
-	public Template(Reader r) {
-		try {
-			data = parse(r);
-			r.close();
-		} catch (IOException e) {
-			throw new Error(e);
-		}
-	}
+    private static final Pattern CONTROL_PATTERN = Pattern.compile(" ?([a-z]+)\\(\\$([^)]+)\\) ?\\{ ?");
 
-	private TemplateBlock parse(Reader r) throws IOException {
-		LinkedList<String> splitted = new LinkedList<String>();
-		LinkedList<Outputable> commands = new LinkedList<Outputable>();
-		StringBuffer buf = new StringBuffer();
-		int ch = r.read();
-		outer: while (true) {
-			while (!endsWith(buf, "<?")) {
-				if (ch == -1) {
-					break outer;
-				}
-				buf.append((char) ch);
-				ch = r.read();
-			}
-			buf.delete(buf.length() - 2, buf.length());
-			splitted.add(buf.toString());
-			buf.delete(0, buf.length());
-			while (!endsWith(buf, "?>")) {
-				buf.append((char) ch);
-				ch = r.read();
-				if (ch == -1) {
-					throw new EOFException();
-				}
-			}
-			buf.delete(buf.length() - 2, buf.length());
-			String com = buf.toString().replace("\n", "");
-			buf.delete(0, buf.length());
-			Matcher m = CONTROL_PATTERN.matcher(com);
-			if (m.matches()) {
-				String type = m.group(1);
-				String variable = m.group(2);
-				TemplateBlock body = parse(r);
-				if (type.equals("if")) {
-					commands.add(new IfStatement(variable, body));
-				} else if (type.equals("foreach")) {
-					commands.add(new ForeachStatement(variable, body));
-				} else {
-					throw new IOException("Syntax error: unknown control structure: " + type);
-				}
-				continue;
-			}
-			if (com.matches(" ?\\} ?")) {
-				break;
-			}
-			commands.add(parseCommand(com));
-		}
-		splitted.add(buf.toString());
-		String[] contents = splitted.toArray(new String[splitted.size()]);
-		Outputable[] vars = commands.toArray(new Outputable[commands.size()]);
-		return new TemplateBlock(contents, vars);
-	}
+    public Template(URL u) {
+        try {
+            Reader r = new InputStreamReader(u.openStream(), "UTF-8");
+            try {
+                if (u.getProtocol().equals("file") && DevelLauncher.DEVEL) {
+                    source = new File(u.toURI());
+                    lastLoaded = source.lastModified() + 1000;
+                }
+            } catch (URISyntaxException e) {
+                e.printStackTrace();
+            }
+            data = parse(r);
+            r.close();
+        } catch (IOException e) {
+            throw new Error(e);
+        }
+    }
 
-	private boolean endsWith(StringBuffer buf, String string) {
-		return buf.length() >= string.length()
-			&& buf.substring(buf.length() - string.length(), buf.length()).equals(string);
-	}
+    public Template(Reader r) {
+        try {
+            data = parse(r);
+            r.close();
+        } catch (IOException e) {
+            throw new Error(e);
+        }
+    }
 
-	private Outputable parseCommand(String s2) {
-		if (s2.startsWith("=_")) {
-			final String raw = s2.substring(2);
-			return new TranslateCommand(raw);
-		} else if (s2.startsWith("=$")) {
-			final String raw = s2.substring(2);
-			return new OutputVariableCommand(raw);
-		} else if (s2.startsWith("=s,")) {
-			String command = s2.substring(3);
-			final LinkedList<String> store = new LinkedList<String>();
-			while (command.startsWith("$")) {
-				int idx = command.indexOf(",");
-				store.add(command.substring(0, idx));
-				command = command.substring(idx + 1);
-			}
-			final String text = command;
-			return new SprintfCommand(text, store);
-		} else {
-			System.out.println("Unknown processing instruction: " + s2);
-		}
-		return null;
-	}
+    private TemplateBlock parse(Reader r) throws IOException {
+        LinkedList<String> splitted = new LinkedList<String>();
+        LinkedList<Outputable> commands = new LinkedList<Outputable>();
+        StringBuffer buf = new StringBuffer();
+        outer:
+        while (true) {
+            while ( !endsWith(buf, "<?")) {
+                int ch = r.read();
+                if (ch == -1) {
+                    break outer;
+                }
+                buf.append((char) ch);
+            }
+            buf.delete(buf.length() - 2, buf.length());
+            splitted.add(buf.toString());
+            buf.delete(0, buf.length());
+            while ( !endsWith(buf, "?>")) {
+                int ch = r.read();
+                if (ch == -1) {
+                    throw new EOFException();
+                }
+                buf.append((char) ch);
+            }
+            buf.delete(buf.length() - 2, buf.length());
+            String com = buf.toString().replace("\n", "");
+            buf.delete(0, buf.length());
+            Matcher m = CONTROL_PATTERN.matcher(com);
+            if (m.matches()) {
+                String type = m.group(1);
+                String variable = m.group(2);
+                TemplateBlock body = parse(r);
+                if (type.equals("if")) {
+                    commands.add(new IfStatement(variable, body));
+                } else if (type.equals("foreach")) {
+                    commands.add(new ForeachStatement(variable, body));
+                } else {
+                    throw new IOException("Syntax error: unknown control structure: " + type);
+                }
+                continue;
+            }
+            if (com.matches(" ?\\} ?")) {
+                break;
+            }
+            commands.add(parseCommand(com));
+        }
+        splitted.add(buf.toString());
+        String[] contents = splitted.toArray(new String[splitted.size()]);
+        Outputable[] vars = commands.toArray(new Outputable[commands.size()]);
+        return new TemplateBlock(contents, vars);
+    }
 
-	public void output(PrintWriter out, Language l, Map<String, Object> vars) {
-		if (source != null && DevelLauncher.DEVEL) {
-			if (lastLoaded < source.lastModified()) {
-				try {
-					System.out.println("Reloading template.... " + source);
-					InputStreamReader r = new InputStreamReader(new FileInputStream(source), "UTF-8");
-					data = parse(r);
-					r.close();
-					lastLoaded = source.lastModified() + 1000;
-				} catch (IOException e) {
-					e.printStackTrace();
-				}
-			}
-		}
-		data.output(out, l, vars);
-	}
+    private boolean endsWith(StringBuffer buf, String string) {
+        return buf.length() >= string.length() && buf.substring(buf.length() - string.length(), buf.length()).equals(string);
+    }
 
-	protected static void outputVar(PrintWriter out, Language l, Map<String, Object> vars, String varname) {
-		Object s = vars.get(varname);
+    private Outputable parseCommand(String s2) {
+        if (s2.startsWith("=_")) {
+            final String raw = s2.substring(2);
+            return new TranslateCommand(raw);
+        } else if (s2.startsWith("=$")) {
+            final String raw = s2.substring(2);
+            return new OutputVariableCommand(raw);
+        } else if (s2.startsWith("=s,")) {
+            String command = s2.substring(3);
+            final LinkedList<String> store = new LinkedList<String>();
+            while (command.startsWith("$") || command.startsWith("\"") || command.startsWith("!\"")) {
+                int idx;
+                if (command.startsWith("\"") || command.startsWith("!\"")) {
+                    idx = command.indexOf("\"", command.charAt(0) == '!' ? 2 : 1) + 1;
+                    store.add(command.substring(0, idx - 1));
+                } else {
+                    idx = command.indexOf(",");
+                    store.add(command.substring(0, idx));
+                }
+                command = command.substring(idx + 1);
+            }
+            final String text = command;
+            return new SprintfCommand(text, store);
+        } else {
+            System.out.println("Unknown processing instruction: " + s2);
+        }
+        return null;
+    }
 
-		if (s == null) {
-			System.out.println("Empty variable: " + varname);
-		}
-		if (s instanceof Outputable) {
-			((Outputable) s).output(out, l, vars);
-		} else {
-			out.print(s);
-		}
-	}
+    @Override
+    public void output(PrintWriter out, Language l, Map<String, Object> vars) {
+        if (source != null && DevelLauncher.DEVEL) {
+            if (lastLoaded < source.lastModified()) {
+                try {
+                    System.out.println("Reloading template.... " + source);
+                    InputStreamReader r = new InputStreamReader(new FileInputStream(source), "UTF-8");
+                    data = parse(r);
+                    r.close();
+                    lastLoaded = source.lastModified() + 1000;
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        data.output(out, l, vars);
+    }
+
+    protected static void outputVar(PrintWriter out, Language l, Map<String, Object> vars, String varname, boolean unescaped) {
+        Object s = vars.get(varname);
+
+        if (s == null) {
+            System.out.println("Empty variable: " + varname);
+        }
+        if (s instanceof Outputable) {
+            ((Outputable) s).output(out, l, vars);
+        } else {
+            out.print(s == null ? "null" : (unescaped ? s.toString() : HTMLEncoder.encodeHTML(s.toString())));
+        }
+    }
 }