From 649b36f8917211a1268ae9de22f7d0071b166c28 Mon Sep 17 00:00:00 2001
From: rk <rk>
Date: Sun, 17 Mar 2002 19:36:46 +0000
Subject: [PATCH] update new style :)

---
 source/mir/storage/Database.java                | 170 +++++----
 templates-dist/en/bilder.template               | 237 ++++++------
 templates-dist/en/bilderlist.template           | 220 +++++------
 templates-dist/en/breaking.template             |  70 ++--
 templates-dist/en/breakinglist.template         |  86 ++---
 templates-dist/en/comment.template              | 152 ++++----
 templates-dist/en/commentlist.template          | 190 +++++-----
 templates-dist/en/confirm.template              |  68 ++--
 templates-dist/en/content.template              | 383 +++++++++----------
 templates-dist/en/contentlist.template          |  86 ++---
 templates-dist/en/languagelist.template         |  10 +-
 templates-dist/en/mediafolder.template          | 104 +++---
 templates-dist/en/mediafolderlist.template      |  93 ++---
 templates-dist/en/message.template              | 115 +++---
 templates-dist/en/messagelist.template          |  89 +++--
 templates-dist/en/open/comment.template         | 234 ++++++------
 templates-dist/en/open/comment.template.en      |   4 +-
 templates-dist/en/open/comment_done.template    |   4 +-
 templates-dist/en/open/minimal_posting.template |  16 +-
 templates-dist/en/open/posting.template         | 390 ++++++++++----------
 templates-dist/en/schwerpunkt.template          | 130 +++----
 templates-dist/en/schwerpunktlist.template      | 114 +++---
 templates-dist/en/start_admin.template          | 467 ++++++++++++------------
 templates-dist/en/themen.template               | 116 +++---
 templates-dist/en/themenlist.template           | 117 +++---
 25 files changed, 1830 insertions(+), 1835 deletions(-)

diff --git a/source/mir/storage/Database.java b/source/mir/storage/Database.java
index 257c1c72..1ed463cf 100755
--- a/source/mir/storage/Database.java
+++ b/source/mir/storage/Database.java
@@ -8,11 +8,13 @@ import  java.lang.*;
 import  java.io.*;
 import  java.util.*;
 import  freemarker.template.*;
+import  com.codestudio.sql.*;
+import  com.codestudio.util.*;
+
 import  mir.storage.StorageObject;
+import  mir.storage.store.*;
 import  mir.entity.*;
 import  mir.misc.*;
-import com.codestudio.sql.*;
-import com.codestudio.util.*;
 
 
 /**
@@ -31,36 +33,38 @@ public class Database implements StorageObject {
 	protected String                    theTable;
 	protected String                    theCoreTable=null;
 	protected String                    thePKeyName="id";
-	protected int                       thePKeyType;
+	protected int                       thePKeyType, thePKeyIndex;
 	protected boolean                   evaluatedMetaData=false;
 	protected ArrayList                 metadataFields,metadataLabels,
 																			metadataNotNullFields;
 	protected int[]                     metadataTypes;
 	protected Class                     theEntityClass;
 	protected StorageObject             myselfDatabase;
-
-	/** @todo DatabaseCache will soon be replaced by
-	 *  ObjectStore. Points to interweave Database with
-	 *  ObjectStore are marked "todo: OS:" below */
-	protected DatabaseCache             cache;
-
 	protected SimpleList                popupCache=null;
 	protected boolean                   hasPopupCache = false;
 	protected SimpleHash                hashCache=null;
 	protected boolean                   hasTimestamp=true;
-	private       String                database_driver;
-	private       String                database_url;
+	private String                      database_driver, database_url;
 	private int                         defaultLimit;
 	protected DatabaseAdaptor           theAdaptor;
 	protected Logfile                   theLog;
-	protected static final SimpleHash   POPUP_EMTYLINE=new SimpleHash();
+	private static Class                GENERIC_ENTITY_CLASS=null,
+                                      STORABLE_OBJECT_ENTITY_CLASS=null;
+  private static SimpleHash           POPUP_EMTYLINE=new SimpleHash();
+  protected static final ObjectStore  o_store=ObjectStore.getInstance();
 
 	static {
 		// always same object saves a little space
 		POPUP_EMTYLINE.put("key", ""); POPUP_EMTYLINE.put("value", "--");
+    try {
+      GENERIC_ENTITY_CLASS = Class.forName("mir.entity.GenericEntity");
+      STORABLE_OBJECT_ENTITY_CLASS = Class.forName("mir.entity.StorableObjectEntity");
+    }
+    catch (Exception e) {
+      System.err.println("FATAL: Database.java could not initialize" + e.toString());
+    }
+  }
 
-		/** @todo OS: init ObjectStore*/
-	}
 
 	/**
 	 * Kontruktor bekommt den Filenamen des Konfigurationsfiles übergeben.
@@ -78,7 +82,7 @@ public class Database implements StorageObject {
 		String theAdaptorName=MirConfig.getProp("Database.Adaptor");
 		defaultLimit = Integer.parseInt(MirConfig.getProp("Database.Limit"));
 		try {
-			theEntityClass = Class.forName("mir.entity.GenericEntity");
+			theEntityClass = GENERIC_ENTITY_CLASS;
 			theAdaptor = (DatabaseAdaptor)Class.forName(theAdaptorName).newInstance();
 		} catch (Exception e){
 			theLog.printError("Error in Database() constructor with "+
@@ -271,15 +275,21 @@ public class Database implements StorageObject {
 	 *   @param id Primaerschluessel des Datensatzes.
 	 *   @return liefert EntityObject des gefundenen Datensatzes oder null.
 	 */
-	public Entity selectById(String id)
-		throws StorageObjectException {
-
+	public Entity selectById(String id)	throws StorageObjectException
+  {
 		if (id==null||id.equals(""))
 			throw new StorageObjectException("id war null");
 
-		/** @todo OS: build StoreIdenfier and check ObjectStore for StoreIdentifier */
-		if (cache != null && (cache.containsKey(id) > -1))
-			return (Entity)cache.get(id);  // wenn cache gesetzt, evtl. kein roundtrip zur Datenbank
+    // ask object store for object
+    if ( StoreUtil.implementsStorableObject(theEntityClass) ) {
+      String uniqueId = id;
+      if ( theEntityClass.equals(StorableObjectEntity.class) )
+        uniqueId+="@"+theTable;
+      StoreIdentifier search_sid = new StoreIdentifier(theEntityClass, uniqueId);
+      theLog.printDebugInfo("CACHE: (dbg) looking for sid " + search_sid.toString());
+      Entity hit = (Entity)o_store.use(search_sid);
+      if ( hit!=null ) return hit;
+    }
 
 		Statement stmt=null;Connection con=getPooledCon();
 		Entity returnEntity=null;
@@ -415,12 +425,25 @@ public class Database implements StorageObject {
 	 */
 
 	public EntityList selectByWhereClause(String wc, String ob, int offset, int limit)
-		throws StorageObjectException   {
+		throws StorageObjectException
+  {
+
+    // check o_store for entitylist
+    if ( StoreUtil.implementsStorableObject(theEntityClass) ) {
+      StoreIdentifier search_sid =
+        new StoreIdentifier( theEntityClass,
+                             StoreContainerType.STOC_TYPE_ENTITYLIST,
+                             StoreUtil.getEntityListUniqueIdentifierFor(wc,ob,offset,limit) );
+      EntityList hit = (EntityList)o_store.use(search_sid);
+      if ( hit!=null ) {
+        theLog.printDebugInfo("CACHE (hit): " + search_sid.toString());
+        return hit;
+      }
+    }
 
 		// local
 		EntityList    theReturnList=null;
-		Connection    con=null;
-		Statement     stmt=null;
+		Connection    con=null;	Statement stmt=null;
 		ResultSet     rs;
 		int           offsetCount = 0, count=0;
 
@@ -453,8 +476,6 @@ public class Database implements StorageObject {
 			}
 		}
 
-		/** @todo OS: make StoreIdentifier and ask Ostore*/
-
 		// execute sql
 		try {
 			con = getPooledCon();
@@ -497,20 +518,21 @@ public class Database implements StorageObject {
 				theReturnList.setOffset(offset);
 				theReturnList.setWhere(wc);
 				theReturnList.setOrder(ob);
-				if (offset >= limit) {
+        theReturnList.setEntityClass(theEntityClass);
+        theReturnList.setLimit(limit);
+				if ( offset >= limit )
 					theReturnList.setPrevBatch(offset - limit);
-				}
-				if (offset + offsetCount < count) {
+				if ( offset+offsetCount < count )
 					theReturnList.setNextBatch(offset + limit);
-				}
+        if ( StoreUtil.implementsStorableObject(theEntityClass) ) {
+          StoreIdentifier sid=theReturnList.getStoreIdentifier();
+          theLog.printDebugInfo("CACHE (add): " + sid.toString());
+          o_store.add(sid);
+        }
 			}
 		}
-		catch (SQLException sqe) {
-			throwSQLException(sqe, "selectByWhereClause");
-		}
-		finally {
-			freeConnection(con, stmt);
-		}
+		catch (SQLException sqe) { throwSQLException(sqe, "selectByWhereClause"); }
+		finally { freeConnection(con, stmt); }
 
 		return  theReturnList;
 	}
@@ -559,26 +581,17 @@ public class Database implements StorageObject {
 					theResultHash.put(metadataFields.get(i), theResult);
 				}
 			}
-
-			/** @todo why fetching all data (above) and then consulting the
-			 *  cache? we should fetch pkeyname first // rk  */
-			if (cache != null && theResultHash.containsKey(thePKeyName) &&
-					(cache.containsKey((String)theResultHash.get(thePKeyName)) > -1)) {
-				returnEntity = (Entity)cache.get((String)theResultHash.get(thePKeyName));
-			} else {
-				if (theEntityClass != null) {
-					returnEntity = (Entity)theEntityClass.newInstance();
-					returnEntity.setValues(theResultHash);
-					returnEntity.setStorage(myselfDatabase);
-					if (cache != null) {
-						//theLog.printDebugInfo("CACHE: ( in) " + returnEntity.getId() + " :"+theTable);
-						/** @todo put element into ObjectStore */
-						cache.put(returnEntity.getId(), returnEntity);
-					}
-				} else {
-					throwStorageObjectException("Internal Error: theEntityClass not set!");
-				}
-			}
+      if (theEntityClass != null) {
+        returnEntity = (Entity)theEntityClass.newInstance();
+        returnEntity.setValues(theResultHash);
+        returnEntity.setStorage(myselfDatabase);
+        if ( returnEntity instanceof StorableObject ) {
+          theLog.printDebugInfo("CACHE: ( in) " + returnEntity.getId() + " :"+theTable);
+          o_store.add(((StorableObject)returnEntity).getStoreIdentifier());
+        }
+      } else {
+        throwStorageObjectException("Internal Error: theEntityClass not set!");
+      }
 		} catch (IllegalAccessException e) {
 			throwStorageObjectException("Kein Zugriff! -- " + e.toString());
 		} catch (IOException e) {
@@ -689,17 +702,19 @@ public class Database implements StorageObject {
 	 *
 	 * @param theEntity
 	 */
-	public void update (Entity theEntity) throws StorageObjectException {
-		Connection con = null;
+	public void update (Entity theEntity) throws StorageObjectException
+  {
+		Connection con = null; PreparedStatement pstmt = null;
 		/** @todo this is stupid: why do we prepare statement, when we
 		 *  throw it away afterwards. should be regular statement
 		 *  update/insert could better be one routine called save()
 		 *  that chooses to either insert or update depending if we
 		 *  have a primary key in the entity. i don't know if we
 		 *  still need the streamed input fields. // rk  */
+
 		/** @todo extension: check if Entity did change, otherwise we don't need */
 		/** @todo OS: invalidate in Ostore if Entity is StorableObject */
-		PreparedStatement pstmt = null;
+
 		ArrayList streamedInput = theEntity.streamedInput();
 		String id = theEntity.getId();
 		String aField;
@@ -766,31 +781,28 @@ public class Database implements StorageObject {
 	 *   @return boolean liefert true zurueck, wenn loeschen erfolgreich war.
 	 */
 	public boolean delete (String id) throws StorageObjectException {
-		Statement stmt = null;
-		Connection con = null;
-		String sql;
-		int res = 0;
-		// loeschen des caches
+
 		invalidatePopupCache();
-		/** @todo OS: invalidate if StorableObject */
+    // ostore send notification
+    if (StoreUtil.implementsStorableObject(theEntityClass) ) {
+			theLog.printInfo("CACHE: (del) " + id);
+			StoreIdentifier search_sid =
+        new StoreIdentifier(theEntityClass, StoreContainerType.STOC_TYPE_ENTITY, id);
+      o_store.invalidate(search_sid);
+		}
+
 		/** @todo could be prepared Statement */
-		sql = "delete from " + theTable + " where " + thePKeyName + "='" + id +
-				"'";
+		Statement stmt = null; Connection con = null;
+		int res = 0;
+		String sql="delete from "+theTable+" where "+thePKeyName+"='"+id+"'";
 		theLog.printInfo("DELETE " + sql);
 		try {
-			con = getPooledCon();
-			stmt = con.createStatement();
+			con = getPooledCon(); stmt = con.createStatement();
 			res = stmt.executeUpdate(sql);
-		} catch (SQLException sqe) {
-			throwSQLException(sqe, "delete");
-		} finally {
-			freeConnection(con, stmt);
-		}
-		/** @todo should take place before we delete */
-		if (cache != null) {
-			theLog.printInfo("CACHE: deleted " + id);
-			cache.remove(id);
 		}
+    catch (SQLException sqe) { throwSQLException(sqe, "delete"); }
+    finally { freeConnection(con, stmt); }
+
 		return  (res > 0) ? true : false;
 	}
 
@@ -1061,7 +1073,7 @@ public class Database implements StorageObject {
 				aType = md.getColumnType(i);
 				metadataTypes[i - 1] = aType;
 				if (aField.equals(thePKeyName)) {
-					thePKeyType = aType;
+					thePKeyType = aType; thePKeyIndex = i;
 				}
 				if (md.isNullable(i) == md.columnNullable) {
 					metadataNotNullFields.add(aField);
diff --git a/templates-dist/en/bilder.template b/templates-dist/en/bilder.template
index e915dd51..4bb33068 100755
--- a/templates-dist/en/bilder.template
+++ b/templates-dist/en/bilder.template
@@ -1,118 +1,119 @@
-<html>
-<head>
-<title>
-indymedia.de | image
-</title>
-<head>
-<SCRIPT LANGUAGE="JavaScript">
-function openWin(url) {
-   window.open(url,"vc","scrollbars=0,height=${img_height},width=${img_width}");   
-}
-</SCRIPT>
-<body bgcolor="#FFFFFF">
-<include "head.template">
-
-
-<form enctype="multipart/form-data" method="post" action="${actionRoot}?module=Images&<compress>do=
-	<if new>insert<else>update</if></compress>&id=${id}">
-<if icon_data=="" || icon_data=="0">
-	<INPUT TYPE="file" NAME="mptest">
-</if>
-
-	<input type="hidden" name="where" value="${where}">
-	<input type="hidden" name="offset" value="${offset}">
-	<input type="hidden" name="order" value="${order}">
-	<input type="hidden" name="id" value="${id}">
-	
-	<table border="0">  	
-	<tr> 
-    <td align="right" bgcolor="#006600">
-		<if (icon_data!="" && icon_data!="0") && !new>
-		<font color="#ffffff" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
-	  	<a href="JavaScript:openWin('${actionRoot}?module=Images&do=showimg&id=${id}')">
-	  	<img src="${actionRoot}?module=Images&do=showicon&id=${id}" border=0></a></font></td>
-		</if>
-    <td valign="bottom"><font color="Silver" face="Verdana, Arial, Helvetica, sans-serif" size=1>
-	  	erzeugt: ${webdb_create} <if webdb_lastchange>/ geaendert ${webdb_lastchange}</if><br>
-	  	<if is_published=="1">publiziert: ${publish_date} / ${publish_server}${publish_path}<br></if>
-	  	format: ${img_width}x${img_height} / ${imgformatHashdata[to_img_format]["name"]} / ${imglayoutHashdata[to_img_layout]["name"]} /  ${imgcolorHashdata[to_img_color]["name"]}<br>
-	  	rechte: <b>${rightsHashdata[to_rights]["name"]}</b><br>
-	  	bildtyp: <b>${imgtypeHashdata[to_img_type]["name"]}</b><br>
-	</td>
-  	</tr>
-	
-	<tr> 
-    <td align="right" bgcolor="#006600"><font color="#ffffff" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
-	 <B>media folder:</B></font></td>
-    <td>
-		<select name="to_media_folder">
- 		<list mediafolderPopupData as m>
-		<option value="${m.key}" <if m.key == to_media_folder>selected</if>>${m.value}</option>
-	  	</list>
-	    </select>
-  	</td>
-	</tr>
-
-	
-	<tr> 
-    <td align="right" bgcolor="#006600"><font color="#ffffff" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
-	 <B>titel:</B></font></td>
-    <td><input type="text" size="40" maxlength="255" name="title" value="${title}"></td>
-  	</tr>
-
-	<tr> 
-    <td align="right" bgcolor="#006600"><font color="#ffffff" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
-	 <B>description:</B></font></td>
-    <td><input type="text" size="40" maxlength="255" name="description" value="${description}"></td>
-  	</tr>
-  
-	<tr> 
-    <td align="right" bgcolor="#006600"><font color="#ffffff" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
-	 <B>date/zusatz:</B></font></td>
-    <td><input type="text" size="8" maxlength="8" name="date" value="${date}">
-		<input type="text" size="20" maxlength="40" name="year" value="${year}"></td>
-  	</tr>
-	
-	<tr> 
-    <td align="right" bgcolor="#006600"><font color="#ffffff" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
-	 <B>location:</B></font></td>
-    <td><input type="text" size="40" maxlength="80" name="place" value="${place}"></td>
-  	</tr>
-  
-	<tr> 
-    <td align="right" bgcolor="#006600"><font color="#ffffff" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
-	 <B>author:</B></font></td>
-    <td>
-		<input type="text" size="40" maxlength="80" name="creator" value="${creator}">
-  	</tr>
-
-	<tr> 
-    <td align="right" bgcolor="#006600"><font color="#ffffff" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
-	 <B>keywords:</B></font></td>
-    <td><textarea cols="40" rows="2" name="keywords">${keywords}</textarea></td>
-  	</tr>
-
-	<tr> 
-    <td align="right" bgcolor="#006600"><font color="#ffffff" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
-	 <B>comments:</B></font></td>
-    <td><textarea cols="40" rows="2" name="comment">${comment}</textarea></td>
-  	</tr>
-
-	<tr> 
-    <td align="right" bgcolor="#006600"><font color="#ffffff" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
-	 <B>source:</B></font></td>
-    <td><input type="text" size="40" maxlength="80" name="source" value="${source}"></td>
-  	</tr>
-	<tr> 
-    <td colspan="2" align="right"> <font color="black">
-	free to publish <input type="checkbox" name="is_published" value="1"<if is_published!="0" && is_published!=""> checked</if>>
-	<if new> 
-      <input type="submit" name="save" value="einfügen">
-    <else> 
-    <input type="submit" name="save" value="speichern">
-    </if> </font></form></font>
-    </td>
-</table>
-<include "foot.template">
-</body>
-</html>
+<html>
+<head>
+<title>
+indymedia.de | image
+</title>
+<head>
+
+<SCRIPT LANGUAGE="JavaScript">
+function openWin(url) {
+   window.open(url,"vc","scrollbars=0,height=${data.img_height},width=${data.img_width}");
+}
+</SCRIPT>
+
+<body bgcolor="#FFFFFF">
+<include "head.template">
+
+
+<form enctype="multipart/form-data" method="post" action="${config.actionRoot}?module=Images&do=<if new>insert<else>update</if></compress>&id=${data.id}">
+<if data.icon_data=="" || data.icon_data=="0">
+	<INPUT TYPE="file" NAME="mptest">
+</if>
+
+	<input type="hidden" name="where" value="${data.where}">
+	<input type="hidden" name="offset" value="${data.offset}">
+	<input type="hidden" name="order" value="${data.order}">
+	<input type="hidden" name="id" value="${data.id}">
+
+	<table border="0">
+	<tr>
+    <td align="right" bgcolor="#006600">
+		<if (data.icon_data!="" && data.icon_data!="0") && !new>
+		<font color="#ffffff" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
+	  	<a href="JavaScript:openWin('${config.actionRoot}?module=Images&do=showimg&id=${data.id}')">
+	  	<img src="${config.actionRoot}?module=Images&do=showicon&id=${data.id}" border=0></a></font></td>
+		</if>
+    <td valign="bottom"><font color="Silver" face="Verdana, Arial, Helvetica, sans-serif" size=1>
+	  	erzeugt: ${data.webdb_create} <if data.webdb_lastchange>/ changed ${data.webdb_lastchange}</if><br>
+	  	<if data.is_published=="1">published: ${data.publish_date} / ${data.publish_server}${data.publish_path}<br></if>
+	  	format: ${data.img_width}x${data.img_height} / ${imgformatHashdata[data.to_img_format]["name"]} / ${imglayoutHashdata[data.to_img_layout]["name"]} /  ${imgcolorHashdata[data.to_img_color]["name"]}<br>
+	  	rights: <b>${rightsHashdata[data.to_rights]["name"]}</b><br>
+	  	bildtyp: <b>${imgtypeHashdata[data.to_img_type]["name"]}</b><br>
+	</td>
+  	</tr>
+
+	<tr>
+    <td align="right" bgcolor="#006600"><font color="#ffffff" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
+	 <B>media folder:</B></font></td>
+    <td>
+		<select name="to_media_folder">
+ 		<list mediafolderPopupData as m>
+		<option value="${m.key}" <if m.key == data.to_media_folder>selected</if>>${m.value}</option>
+	  	</list>
+	    </select>
+  	</td>
+	</tr>
+
+
+	<tr>
+    <td align="right" bgcolor="#006600"><font color="#ffffff" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
+	 <B>titel:</B></font></td>
+    <td><input type="text" size="40" maxlength="255" name="title" value="${data.title}"></td>
+  	</tr>
+
+	<tr>
+    <td align="right" bgcolor="#006600"><font color="#ffffff" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
+	 <B>description:</B></font></td>
+    <td><input type="text" size="40" maxlength="255" name="description" value="${data.description}"></td>
+  	</tr>
+
+	<tr>
+    <td align="right" bgcolor="#006600"><font color="#ffffff" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
+	 <B>date/zusatz:</B></font></td>
+    <td><input type="text" size="8" maxlength="8" name="date" value="${data.date}">
+		<input type="text" size="20" maxlength="40" name="year" value="${data.year}"></td>
+  	</tr>
+
+	<tr>
+    <td align="right" bgcolor="#006600"><font color="#ffffff" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
+	 <B>location:</B></font></td>
+    <td><input type="text" size="40" maxlength="80" name="place" value="${data.place}"></td>
+  	</tr>
+
+	<tr>
+    <td align="right" bgcolor="#006600"><font color="#ffffff" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
+	 <B>author:</B></font></td>
+    <td>
+		<input type="text" size="40" maxlength="80" name="creator" value="${data.creator}">
+  	</tr>
+
+	<tr>
+    <td align="right" bgcolor="#006600"><font color="#ffffff" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
+	 <B>keywords:</B></font></td>
+    <td><textarea cols="40" rows="2" name="keywords">${data.keywords}</textarea></td>
+  	</tr>
+
+	<tr>
+    <td align="right" bgcolor="#006600"><font color="#ffffff" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
+	 <B>comments:</B></font></td>
+    <td><textarea cols="40" rows="2" name="comment">${data.comment}</textarea></td>
+  	</tr>
+
+	<tr>
+    <td align="right" bgcolor="#006600"><font color="#ffffff" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
+	 <B>source:</B></font></td>
+    <td><input type="text" size="40" maxlength="80" name="source" value="${data.source}"></td>
+  	</tr>
+	<tr>
+    <td colspan="2" align="right"> <font color="black">
+	free to publish <input type="checkbox" name="is_published" value="1"<if data.is_published!="0" && data.is_published!=""> checked</if>>
+	<if new>
+      <input type="submit" name="save" value="insert">
+    <else>
+    <input type="submit" name="save" value="save">
+    </if> </font></form></font>
+    </td>
+</table>
+<include "foot.template">
+</body>
+</html>
diff --git a/templates-dist/en/bilderlist.template b/templates-dist/en/bilderlist.template
index e484f1c2..3e8bbaa0 100755
--- a/templates-dist/en/bilderlist.template
+++ b/templates-dist/en/bilderlist.template
@@ -1,109 +1,111 @@
-<html>
-<head>
-	<title>indymedia.de | imagelist</title>
-</head>
-
-<body bgcolor="#FFFFFF">
-<include "head.template">
-
-<table border="0" cellpadding="2" cellspacing="1">
-  <tr>
-    <td colspan="5"><form method="post" action="${actionRoot}">
-	<input type="hidden" name="module" value="Images">
-	<input type="hidden" name="do" value="list">
-	<input type="hidden" name="cid" value="${cid}">
-	<table border="0">
-	<tr bgcolor="Pink">
-		<td>search text in:</td>
-		<td>published:</td>
-		<td>media-folder:</td>
-		<td>&nbsp;</td>
-	</tr>
-	
-	<tr>
-	<td>
-		<input type="text" size="10" maxlength="20" name="query_text" value="${query_text}">
-		<select name="query_field">
-    		<option value="title"<if query_field=="title"> selected</if>>title</option>
-    		<option value="creator"<if query_field=="creator"> selected</if>>author</option>
-    		<option value="place"<if query_field=="place"> selected</if>>location</option>
-    		<option value="keywords"<if query_field=="keywords"> selected</if>>keywords</option>
-    	</select>
-	</td>
-	<td>
-		<select name="query_is_published">
-		    <option value="">egal</option>
-    		<option value="0" <if query_is_published=="0"> selected</if>>no</option>
-		    <option value="1" <if query_is_published=="1"> selected</if>>yes</option>
-	    </select>
-	</td>
-	<td>
-	<select name="query_media_folder">
- 	<list mediafolderPopupData as m>
-	<option value="${m.key}" <if m.key == query_media_folder>selected</if>>${m.value}</option>
-  	</list>
-   	</select>
-	</td>
-	<td>
-		<input type="submit" name="search" value="filter">	
-	</td>
-	</tr>	
-	</table>
-	</form>
-	</td>
-  </tr>
-
-  <tr bgcolor="#006600" >
-  	<td><font color="#FFFFFF" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
-	<b>icon</b></font></td>
-	<td><font color="#FFFFFF" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
-	<b>titel</b></font></td>
-    <td><font color="#FFFFFF" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
-	<b>medienmappe</b></font></td>
-    <td><font color="#FFFFFF" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
-	<b>urheber</b></font></td>
-  </tr>
-  <if contentlist>
-  <list contentlist as entry>
-  <tr <compress><if grey=="1"><assign grey="0">bgcolor="#dddddd" <else><assign grey="1"> </if></compress>>
-  <td>
-  	<if entry.icon_data!="" && entry.icon_data!="0">
-  	<a href="${actionRoot}?module=Images&do=showimg&id=${entry.id}" target="new">
-	  <img src="${actionRoot}?module=Images&do=showicon&id=${entry.id}" border=0></a></font></td>
-	</if>
-  <td>${entry.title}&nbsp;
-  	  <if decription><br>${description}</if></td>
-  <td>${mediafolderHashdata[entry.to_media_folder]["name"]}&nbsp;</td>
-  <td>${entry.creator}&nbsp;</td>
-  <td><font size="1">&nbsp;
-	<if cid><a href="${actionRoot}?module=Content&do=attach&mid=${entry.id}&cid=${cid}">attach</a>
-	<else>
-	<a href="${actionRoot}?module=Images&do=delete&id=${entry.id}">delete</a>
-    | <a href="${actionRoot}?module=Images&do=edit&id=${entry.id}">edit</a> 
-	</if>
-	</font></td>
-  </tr>
-  </list>
-  <tr>
-    <td colspan="4" bgcolor="#006600"><font color="#ffffff">${count} entries
-      / showing from ${from} to ${to}</font></td>
-    <td>&nbsp;</td>
-  </tr>
-
-<tr><td>
-<if prev>
-	<a href="${actionRoot}?module=Images&do=list&query_text=${query_text_encoded}&query_field=${query_field}&query_is_published=${query_is_published}&query_media_folder=${query_media_folder}&offset=${prev}&prev=zur&uuml;ck&cid=${cid}">zurueck</a>&nbsp;
-</if>
-<if next>
-<a href="${actionRoot}?module=Images&do=list&query_text=${query_text_encoded}&query_field=${query_field}&query_is_published=${query_is_published}&query_media_folder=${query_media_folder}&offset=${next}&next=weiter&cid=${cid}">weiter</a>
-</if>
-</td></tr>
-<else>
-  <tr><td align="center">No matching entrie found!</td></tr>
-</if>
-</table>
-<include "foot.template">
-</body>
-</html>
-
-
+<html>
+<head>
+	<title>indymedia.de | imagelist</title>
+</head>
+
+<body bgcolor="#FFFFFF">
+<include "head.template">
+
+<table border="0" cellpadding="2" cellspacing="1">
+  <tr>
+    <td colspan="5"><form method="post" action="${config.actionRoot}">
+	<input type="hidden" name="module" value="Images">
+	<input type="hidden" name="do" value="list">
+	<input type="hidden" name="cid" value="${cid}">
+	<table border="0">
+	<tr bgcolor="Pink">
+		<td>search text in:</td>
+		<td>published:</td>
+		<td>media-folder:</td>
+		<td>&nbsp;</td>
+	</tr>
+
+	<tr>
+	<td>
+		<input type="text" size="10" maxlength="20" name="query_text" value="${query_text}">
+		<select name="query_field">
+    		<option value="title"<if query_field=="title"> selected</if>>title</option>
+    		<option value="creator"<if query_field=="creator"> selected</if>>author</option>
+    		<option value="place"<if query_field=="place"> selected</if>>location</option>
+    		<option value="keywords"<if query_field=="keywords"> selected</if>>keywords</option>
+    	</select>
+	</td>
+	<td>
+		<select name="query_is_published">
+		    <option value="">egal</option>
+    		<option value="0" <if query_is_published=="0"> selected</if>>no</option>
+		    <option value="1" <if query_is_published=="1"> selected</if>>yes</option>
+	    </select>
+	</td>
+	<td>
+	<select name="query_media_folder">
+ 	<list mediafolderPopupData as m>
+	<option value="${m.key}" <if m.key == query_media_folder>selected</if>>${m.value}</option>
+  	</list>
+   	</select>
+	</td>
+	<td>
+		<input type="submit" name="search" value="filter">
+	</td>
+	</tr>
+	</table>
+	</form>
+	</td>
+  </tr>
+
+  <tr bgcolor="#006600" >
+  	<td><font color="#FFFFFF" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
+	<b>icon</b></font></td>
+	<td><font color="#FFFFFF" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
+	<b>titel</b></font></td>
+    <td><font color="#FFFFFF" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
+	<b>medienmappe</b></font></td>
+    <td><font color="#FFFFFF" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
+	<b>urheber</b></font></td>
+  </tr>
+  <if contentlist>
+  <list contentlist as entry>
+  <tr <compress><if grey=="1"><assign grey="0">bgcolor="#dddddd" <else><assign grey="1"> </if></compress>>
+  <td>
+  	<if entry.icon_data!="" && entry.icon_data!="0">
+  	<a href="${config.actionRoot}?module=Images&do=showimg&id=${entry.id}" target="new">
+	  <img src="${config.actionRoot}?module=Images&do=showicon&id=${entry.id}" border=0></a></font></td>
+	</if>
+  <td>${entry.title}&nbsp;
+  	  <if decription><br>${description}</if></td>
+  <td>${mediafolderHashdata[entry.to_media_folder]["name"]}&nbsp;</td>
+  <td>${entry.creator}&nbsp;</td>
+  <td><font size="1">&nbsp;
+	<if cid><a href="${actionRoot}?module=Content&do=attach&mid=${entry.id}&cid=${cid}">attach</a>
+	<else>
+	<a href="${config.actionRoot}?module=Images&do=delete&id=${entry.id}">delete</a>
+    | <a href="${config.actionRoot}?module=Images&do=edit&id=${entry.id}">edit</a>
+	</if>
+	</font></td>
+  </tr>
+  </list>
+  <tr>
+    <td colspan="4" bgcolor="#006600"><font color="#ffffff">${count} entries
+      / showing from ${from} to ${to}</font></td>
+    <td>&nbsp;</td>
+  </tr>
+
+<tr><td>
+	<if prev>
+		<a href="${config.actionRoot}?module=Images&do=list&query_text=${query_text_encoded}&query_field=${query_field}&query_is_published=${query_is_published}&query_media_folder=${query_media_folder}&offset=${prev}&prev=zur&uuml;ck&cid=${cid}">zurueck</a>&nbsp;
+	</if>
+	<if next>
+	<a href="${config.actionRoot}?module=Images&do=list&query_text=${query_text_encoded}&query_field=${query_field}&query_is_published=${query_is_published}&query_media_folder=${query_media_folder}&offset=${next}&next=weiter&cid=${cid}">weiter</a>
+	</if>
+</td></tr>
+
+<else>
+  <tr><td align="center">No matching entrie found!</td></tr>
+</if>
+</table>
+
+<include "foot.template">
+</body>
+</html>
+
+
diff --git a/templates-dist/en/breaking.template b/templates-dist/en/breaking.template
index 67d26018..63b377f2 100755
--- a/templates-dist/en/breaking.template
+++ b/templates-dist/en/breaking.template
@@ -1,4 +1,4 @@
-<html>
+<html>
 <head>
 <title>
 indymedia.de | breaking
@@ -6,37 +6,37 @@ indymedia.de | breaking
 <head>
 
 <body bgcolor="#FFFFFF">
-<include "head.template">
-<form action="${actionRoot}" method="post">
-	<input type="hidden" name="module" value="Breaking">
-	<input type="hidden" name="id" value="${id}">
-	<if new><input type="hidden" name="do" value="insert">
-	<else><input type="hidden" name="do" value="update"></if>
-<table border="0">
-  <tr> 
-    <td align="right" bgcolor="#006600"><font color="#ffffff" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
-	<B>date:</B></font></td>
-    <td>
-      ${webdb_create_formatted}
-    </td>
-  </tr>
-
-  <tr> 
-    <td align="right" bgcolor="#006600"><font color="#ffffff" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
-	<B>text:</B> (max. 5 lines / 250 characters)</font></td>
-    <td>
-	 <textarea cols="50" rows="3" name="text" wrap=virtual>${text}</textarea>
-    </td>
-  </tr>
-
-  <tr> 
-    <td colspan="2" align="right"> <font color="#ffffff"><if new> 
-      <input type="submit" name="save" value="add">
-    <else> 
-    <input type="submit" name="save" value="save">
-    </if> </font></form></font>
-    </td>
-</table>
-<include "foot.template">
-</body>
-</html>
+<include "head.template">
+<form action="${config.actionRoot}" method="post">
+	<input type="hidden" name="module" value="Breaking">
+	<input type="hidden" name="id" value="${id}">
+	<if new><input type="hidden" name="do" value="insert">
+	<else><input type="hidden" name="do" value="update"></if>
+<table border="0">
+  <tr>
+    <td align="right" bgcolor="#006600"><font color="#ffffff" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
+	<B>date:</B></font></td>
+    <td>
+      ${data.webdb_create_formatted}
+    </td>
+  </tr>
+
+  <tr>
+    <td align="right" bgcolor="#006600"><font color="#ffffff" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
+	<B>text:</B> (max. 5 lines / 250 characters)</font></td>
+    <td>
+	 <textarea cols="50" rows="3" name="text" wrap=virtual>${data.text}</textarea>
+    </td>
+  </tr>
+
+  <tr>
+    <td colspan="2" align="right"> <font color="#ffffff"><if new>
+      <input type="submit" name="save" value="add">
+    <else>
+    <input type="submit" name="save" value="save">
+    </if> </font></form></font>
+    </td>
+</table>
+<include "foot.template">
+</body>
+</html>
diff --git a/templates-dist/en/breakinglist.template b/templates-dist/en/breakinglist.template
index 80760b36..4d90c758 100755
--- a/templates-dist/en/breakinglist.template
+++ b/templates-dist/en/breakinglist.template
@@ -1,47 +1,47 @@
-<html>
+<html>
 <head>
 	<title>indymedia.de | breaking new list</title>
 </head>
 
-<body bgcolor="#FFFFFF">
-<include "head.template">
-<if contentlist>
-<table border="0" cellpadding="2" cellspacing="1">
-  <tr bgcolor="#006600">
-    <td><font color="#FFFFFF" face="Verdana, Arial, Helvetica, sans-serif" size="-1"><b>date</b></font></td>
-    <td><font color="#FFFFFF" face="Verdana, Arial, Helvetica, sans-serif" size="-1"><b>text</b></font></td>
-  </tr>
-
-  <list contentlist as entry>
-  <tr
-       <if grey=="1"><assign grey="0">bgcolor="#dddddd" <else><assign grey="1"> </if>
-  >
-  <td>${entry.webdb_create_formatted}&nbsp;</td>
-  <td>${entry.text}&nbsp;</td>
-  <td><font size="1">&nbsp;<a href="${actionRoot}?module=Breaking&do=delete&id=${entry.id}">delete</a>
-    | <a href="${actionRoot}?module=Breaking&do=edit&id=${entry.id}">edit</a></font></td>
-  </tr>
-  </list>
-  <tr>
-    <td colspan="3" bgcolor="#006600"><font color="#ffffff">${count} entries
-      / showing from ${from} to ${to}</font></td>
-    <td>&nbsp;</td>
-  </tr>
-</table>
-
-      <P>
-<if prev>
-	<a href="${actionRoot}?module=Breaking&do=list&where=${where}&prevoffset=${prev}&prev=zur&uuml;ck">back</a>&nbsp;
-</if>
-<if next>
-<a href="${actionRoot}?module=Breaking&do=list&where=${where}&nextoffset=${next}&next=weiter">go on</a>
-</if>
-
-<else>
-  <P align="center"> no matching entry!</p>
-</if>
-<include "foot.template">
-</body>
-</html>
-
-
+<body bgcolor="#FFFFFF">
+<include "head.template">
+<if contentlist>
+<table border="0" cellpadding="2" cellspacing="1">
+  <tr bgcolor="#006600">
+    <td><font color="#FFFFFF" face="Verdana, Arial, Helvetica, sans-serif" size="-1"><b>date</b></font></td>
+    <td><font color="#FFFFFF" face="Verdana, Arial, Helvetica, sans-serif" size="-1"><b>text</b></font></td>
+  </tr>
+
+  <list contentlist as entry>
+  <tr
+       <if grey=="1"><assign grey="0">bgcolor="#dddddd" <else><assign grey="1"> </if>
+  >
+  <td>${entry.webdb_create_formatted}&nbsp;</td>
+  <td>${entry.text}&nbsp;</td>
+  <td><font size="1">&nbsp;<a href="${actionRoot}?module=Breaking&do=delete&id=${entry.id}">delete</a>
+    | <a href="${actionRoot}?module=Breaking&do=edit&id=${entry.id}">edit</a></font></td>
+  </tr>
+  </list>
+  <tr>
+    <td colspan="3" bgcolor="#006600"><font color="#ffffff">${count} entries
+      / showing from ${from} to ${to}</font></td>
+    <td>&nbsp;</td>
+  </tr>
+</table>
+
+      <P>
+<if prev>
+	<a href="${config.actionRoot}?module=Breaking&do=list&where=${where}&prevoffset=${prev}&prev=zur&uuml;ck">back</a>&nbsp;
+</if>
+<if next>
+<a href="${config.actionRoot}?module=Breaking&do=list&where=${where}&nextoffset=${next}&next=weiter">go on</a>
+</if>
+
+<else>
+  <P align="center"> no matching entry!</p>
+</if>
+<include "foot.template">
+</body>
+</html>
+
+
diff --git a/templates-dist/en/comment.template b/templates-dist/en/comment.template
index 5325182c..c632c4cd 100755
--- a/templates-dist/en/comment.template
+++ b/templates-dist/en/comment.template
@@ -1,4 +1,4 @@
-<html>
+<html>
 <head>
 <title>
 indymedia.de | comment
@@ -7,79 +7,79 @@ indymedia.de | comment
 
 <body bgcolor="#FFFFFF">
 <include "head.template">
-
-<form method="post" action="${actionRoot}">
+
+<form method="post" action="${config.actionRoot}">
 	<input type="hidden" name="module" value="Comment">
-	<input type="hidden" name="where" value="${where}">
-	<input type="hidden" name="offset" value="${offset}">
-	<input type="hidden" name="order" value="${order}">
-	<input type="hidden" name="id" value="${id}">
-	<input type="hidden" name="date" value="${date}">
-	<input type="hidden" name="to_media" value="${to_media}">
-	<if new> <input type="hidden" name="do" value="insert">
-	<else>	 <input type="hidden" name="do" value="update">
-	</if>
-
-	<table border="0">  	
-
-	<tr> 
-    <td align="right" bgcolor="#006600"><font color="#ffffff" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
-	 <B>date:</B></font></td>
-    <td>${date}</td>
-  	</tr>
-	
-	<tr> 
-    <td align="right" bgcolor="#006600"><font color="#ffffff" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
-	 <B>titel:</B></font></td>
-    <td><input type="text" size="40" maxlength="255" name="title" value="${title}"></td>
-  	</tr>
-
-	<tr> 
-    <td align="right" bgcolor="#006600"><font color="#ffffff" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
-	 <B>auther:</B></font></td>
-    <td><input type="text" size="40" maxlength="80" name="creator" value="${creator}"></td>
-  	</tr>
-
-	<tr> 
-    <td align="right" bgcolor="#006600"><font color="#ffffff" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
-	 <B>url:</B></font></td>
-    <td><input type="text" size="40" maxlength="255" name="main_url" value="${main_url}"></td>
-  	</tr>
-  
-	<tr> 
-    <td align="right" bgcolor="#006600"><font color="#ffffff" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
-	 <B>email:</B></font></td>
-    <td><input type="text" size="40" maxlength="80" name="email" value="${email}"></td>
-  	</tr>
-  
-	<tr> 
-    <td align="right" bgcolor="#006600"><font color="#ffffff" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
-	 <B>phone:</B></font></td>
-    <td><input type="text" size="40" maxlength="80" name="phone" value="${phone}"></td>
-  	</tr>
-  
-	<tr> 
-    <td align="right" bgcolor="#006600"><font color="#ffffff" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
-	 <B>address:</B></font></td>
-    <td><input type="text" size="40" maxlength="80" name="address" value="${address}"></td>
-  	</tr>
-  
-	<tr> 
-    <td align="right" bgcolor="#006600"><font color="#ffffff" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
-	 <B>text:</B></font></td>
-    <td><textarea cols="40" rows="10" name="description" wrap="virtual">${description}</textarea></td>
-  	</tr>
-
-    <td colspan="2" align="right"> <font color="black">
-	published <input type="checkbox" name="is_published" value="1" <if is_published=="1"> checked</if>>
-	<if new> 
-      <input type="submit" name="save" value="insert">
-    <else> 
-    <input type="submit" name="save" value="save">
-    </if> </font></form></font>
-    </td>
-</table>
-
-<include "foot.template">
-</body>
-</html>
+	<input type="hidden" name="where" value="${data.where}">
+	<input type="hidden" name="offset" value="${data.offset}">
+	<input type="hidden" name="order" value="${data.order}">
+	<input type="hidden" name="id" value="${data.id}">
+	<input type="hidden" name="date" value="${data.date}">
+	<input type="hidden" name="to_media" value="${data.to_media}">
+	<if new> <input type="hidden" name="do" value="insert">
+	<else>	 <input type="hidden" name="do" value="update">
+	</if>
+
+	<table border="0">
+
+	<tr>
+    <td align="right" bgcolor="#006600"><font color="#ffffff" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
+	 <B>date:</B></font></td>
+    <td>${data.date}</td>
+  	</tr>
+
+	<tr>
+    <td align="right" bgcolor="#006600"><font color="#ffffff" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
+	 <B>titel:</B></font></td>
+    <td><input type="text" size="40" maxlength="255" name="title" value="${data.title}"></td>
+  	</tr>
+
+	<tr>
+    <td align="right" bgcolor="#006600"><font color="#ffffff" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
+	 <B>auther:</B></font></td>
+    <td><input type="text" size="40" maxlength="80" name="creator" value="${data.creator}"></td>
+  	</tr>
+
+	<tr>
+    <td align="right" bgcolor="#006600"><font color="#ffffff" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
+	 <B>url:</B></font></td>
+    <td><input type="text" size="40" maxlength="255" name="main_url" value="${data.main_url}"></td>
+  	</tr>
+
+	<tr>
+    <td align="right" bgcolor="#006600"><font color="#ffffff" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
+	 <B>email:</B></font></td>
+    <td><input type="text" size="40" maxlength="80" name="email" value="${data.email}"></td>
+  	</tr>
+
+	<tr>
+    <td align="right" bgcolor="#006600"><font color="#ffffff" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
+	 <B>phone:</B></font></td>
+    <td><input type="text" size="40" maxlength="80" name="phone" value="${data.phone}"></td>
+  	</tr>
+
+	<tr>
+    <td align="right" bgcolor="#006600"><font color="#ffffff" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
+	 <B>address:</B></font></td>
+    <td><input type="text" size="40" maxlength="80" name="address" value="${data.address}"></td>
+  	</tr>
+
+	<tr>
+    <td align="right" bgcolor="#006600"><font color="#ffffff" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
+	 <B>text:</B></font></td>
+    <td><textarea cols="40" rows="10" name="description" wrap="virtual">${data.description}</textarea></td>
+  	</tr>
+
+    <td colspan="2" align="right"> <font color="black">
+	published <input type="checkbox" name="is_published" value="1" <if data.is_published=="1"> checked</if>>
+	<if new>
+      <input type="submit" name="save" value="insert">
+    <else>
+    <input type="submit" name="save" value="save">
+    </if> </font></form></font>
+    </td>
+</table>
+
+<include "foot.template">
+</body>
+</html>
diff --git a/templates-dist/en/commentlist.template b/templates-dist/en/commentlist.template
index 6206f66a..e7a454af 100755
--- a/templates-dist/en/commentlist.template
+++ b/templates-dist/en/commentlist.template
@@ -1,95 +1,97 @@
-<html>
-<head>
-	<title>indymedia.de | commentlist</title>
-</head>
-
-<body bgcolor="#FFFFFF">
-
-<include "head.template">
-
-<table border="0" cellpadding="2" cellspacing="1">
-  <tr>
-    <td colspan="5"><form method="post" action="${actionRoot}">
-	<input type="hidden" name="module" value="Comment">
-	<input type="hidden" name="do" value="list">
-        <input type="hidden" name="order" value="webdb_create">
+<html>
+<head>
+	<title>indymedia.de | commentlist</title>
+</head>
+
+<body bgcolor="#FFFFFF">
+
+<include "head.template">
+
+<table border="0" cellpadding="2" cellspacing="1">
+  <tr>
+    <td colspan="5"><form method="post" action="${config.actionRoot}">
+	<input type="hidden" name="module" value="Comment">
+	<input type="hidden" name="do" value="list">
+        <input type="hidden" name="order" value="webdb_create">
         <input type="hidden" name="offset" value="${offset}">
-	<input type="text" size="10" maxlength="20" name="query_text" value="${query_text}">
-	<select name="query_field">
-    <option value="title"<if query_field=="title"> selected</if>>Titel</option>
-    <option value="creator"<if query_field=="creator"> selected</if>>author</option>
-    <option value="description"<if query_field=="description"> selected</if>>content</option>
-    </select>
-	<select name="query_is_published">
-    <option value="">--</option>
-    <option value="0" <if query_is_published=="0"> selected</if>>hidden</option>
-    <option value="1" <if query_is_published=="1"> selected</if>>produced</option>
-    </select>
-    <select name="order">
-    <option value="webdb_create" <if order=="webdb_create"> selected</if>>time</option>
-    <option value="articletitle" <if order=="articletitle"> selected</if>>article-titel</option>
-    </select>
-	<input type="submit" name="search" value="go!">
-	</form>
-	</td>
-  </tr>
-
-  <tr bgcolor="#006600" >
-  	<td><font color="#FFFFFF" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
-	<b>date</b></font></td>
-	<td><font color="#FFFFFF" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
-	<b>titel<br>author</b></font></td>
-    <td><font color="#FFFFFF" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
-	<b>comment-text</b></font></td>
-    <td><font color="#FFFFFF" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
-	<b>for article</b></font></td>
-  </tr>
-<if contentlist>
-
-  <list contentlist as entry>
-  <tr <compress><if grey=="1"><assign grey="0">bgcolor="#dddddd" <else><assign grey="1"> </if></compress>>
-  	<td>${entry.date}<br>
-  	<if entry.is_published=="0"><font color="Brown">V</font><else>-</if>
-	</td>
-
- 	<td>
-		<b>${entry.title}</b><br>${entry.creator}
-	</td>
-
-	<td>
-		<font size="-1">${entry.description}</font>
-		<a href="${actionRoot}?module=Comment&do=edit&id=${entry.id}&order=${order}&offset=${offset}">edit</a>
-	</td>
-
-	<td>
-  		<a href="${actionRoot}?module=Content&do=edit&id=${articleHash[entry.to_media]["id"]}">
-		${articleHash[entry.to_media]["title"]}</a>
-	</td>
-
- 	<td><font size="1">&nbsp;<a href="${actionRoot}?module=Comment&do=delete&id=${entry.id}">delete</a>
-    </font></td>
-  </tr>
-  </list>
-
-  <tr>
-    <td colspan="4" bgcolor="#006600"><font color="#ffffff">${count} entries
-      / show from ${from} to ${to}</font></td>
-    <td>&nbsp;</td>
-  </tr>
-<tr><td>
-<if prev>
-<a href="${actionRoot}?module=Comment&do=list&order=${order}&query_text=${query_text_encoded}&query_field=${query_field}&query_is_published=${query_is_published}&query_media_folder=${query_media_folder}&offset=${prev}&prev=zur&uuml;ck">back</a>&nbsp;
-</if>
-<if next>
-<a href="${actionRoot}?module=Comment&do=list&order=${order}&query_text=${query_text_encoded}&query_field=${query_field}&query_is_published=${query_is_published}&query_media_folder=${query_media_folder}&offset=${next}&next=weiter">weiter</a>
-</if>
-</td></tr>
-<else>
-  <tr><td align="center">No matching entries!</td></tr>
-</if>
-</table>
-<include "foot.template">
-</body>
-</html>
-
-
+	<input type="text" size="10" maxlength="20" name="query_text" value="${query_text}">
+	<select name="query_field">
+    <option value="title"<if query_field=="title"> selected</if>>Titel</option>
+    <option value="creator"<if query_field=="creator"> selected</if>>author</option>
+    <option value="description"<if query_field=="description"> selected</if>>content</option>
+    </select>
+	<select name="query_is_published">
+    <option value="">--</option>
+    <option value="0" <if query_is_published=="0"> selected</if>>hidden</option>
+    <option value="1" <if query_is_published=="1"> selected</if>>produced</option>
+    </select>
+    <select name="order">
+    <option value="webdb_create" <if order=="webdb_create"> selected</if>>time</option>
+    <option value="articletitle" <if order=="articletitle"> selected</if>>article-titel</option>
+    </select>
+	<input type="submit" name="search" value="go!">
+	</form>
+	</td>
+  </tr>
+
+  <tr bgcolor="#006600" >
+  	<td><font color="#FFFFFF" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
+	<b>date</b></font></td>
+	<td><font color="#FFFFFF" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
+	<b>titel<br>author</b></font></td>
+    <td><font color="#FFFFFF" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
+	<b>comment-text</b></font></td>
+    <td><font color="#FFFFFF" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
+	<b>for article</b></font></td>
+  </tr>
+
+<if contentlist>
+
+  <list contentlist as entry>
+  <tr <compress><if grey=="1"><assign grey="0">bgcolor="#dddddd" <else><assign grey="1"> </if></compress>>
+  	<td>${entry.date}<br>
+  	<if entry.is_published=="0"><font color="Brown">V</font><else>-</if>
+	</td>
+
+ 	<td>
+		<b>${entry.title}</b><br>${entry.creator}
+	</td>
+
+	<td>
+		<font size="-1">${entry.description}</font>
+		<a href="${config.actionRoot}?module=Comment&do=edit&id=${entry.id}&order=${order}&offset=${offset}">edit</a>
+	</td>
+
+	<td>
+  		<a href="${actionRoot}?module=Content&do=edit&id=${articleHash[entry.to_media]["id"]}">
+		${articleHash[entry.to_media]["title"]}</a>
+	</td>
+
+ 	<td><font size="1">&nbsp;<a href="${config.actionRoot}?module=Comment&do=delete&id=${entry.id}">delete</a>
+    </font></td>
+  </tr>
+  </list>
+
+  <tr>
+    <td colspan="4" bgcolor="#006600"><font color="#ffffff">${count} entries
+      / show from ${from} to ${to}</font></td>
+    <td>&nbsp;</td>
+  </tr>
+
+<tr><td>
+<if prev>
+<a href="${config.actionRoot}?module=Comment&do=list&order=${order}&query_text=${query_text_encoded}&query_field=${query_field}&query_is_published=${query_is_published}&query_media_folder=${query_media_folder}&offset=${prev}&prev=zur&uuml;ck">back</a>&nbsp;
+</if>
+<if next>
+<a href="${config.actionRoot}?module=Comment&do=list&order=${order}&query_text=${query_text_encoded}&query_field=${query_field}&query_is_published=${query_is_published}&query_media_folder=${query_media_folder}&offset=${next}&next=weiter">weiter</a>
+</if>
+</td></tr>
+<else>
+  <tr><td align="center">No matching entries!</td></tr>
+</if>
+</table>
+<include "foot.template">
+</body>
+</html>
+
+
diff --git a/templates-dist/en/confirm.template b/templates-dist/en/confirm.template
index 7c393948..69047f0b 100755
--- a/templates-dist/en/confirm.template
+++ b/templates-dist/en/confirm.template
@@ -1,32 +1,36 @@
-<html>
-  <head>
-    <title>indymedia.de | confirm delete delete</title>
-  </head>
-  <body>
-  <include "head_nonavi.template">
-<table width="100%" border="0" align="center">
-  <tr bgcolor="#006600"> 
-    <td colspan="2"> 
-      <h2 align="center"><font color="#ffffff">Do you really want to delete this entry?</font></h2>
-    </td>
-  </tr>
-  <tr> 
-    <td colspan="2">
-      <form method="post" action="${actionRoot}">
-        <div align="center">
-          <input type="hidden" name="module" value=${module}>
-          <input type="hidden" name="do" value="delete">
-          <input type="hidden" name="id" value="${id}">
-          <input type="hidden" name="where" value="${where}">
-          <input type="hidden" name="order" value="${order}">
-          <input type="hidden" name="offset" value="${offset}">
-          <input type="submit" name="cancel" value="abbrechen">
-          <input type="submit" name="confirm" value="l&ouml;schen">
-        </div>
-      </form>
-    </td>
-  </tr>
-</table>
-<include "foot.template">
-  </body>
-</html>
+<html>
+<head>
+	<title>indymedia.de | confirm delete delete</title>
+</head>
+
+<body>
+
+<include "head_nonavi.template">
+
+<table width="100%" border="0" align="center">
+  <tr bgcolor="#006600">
+    <td colspan="2">
+      <h2 align="center"><font color="#ffffff">Do you really want to delete this entry?</font></h2>
+    </td>
+  </tr>
+  <tr>
+    <td colspan="2">
+      <form method="post" action="${config.actionRoot}">
+        <div align="center">
+          <input type="hidden" name="module" value=${module}>
+          <input type="hidden" name="do" value="delete">
+          <input type="hidden" name="id" value="${id}">
+          <input type="hidden" name="where" value="${where}">
+          <input type="hidden" name="order" value="${order}">
+          <input type="hidden" name="offset" value="${offset}">
+          <input type="submit" name="cancel" value="cancel">
+          <input type="submit" name="confirm" value="delete">
+        </div>
+      </form>
+    </td>
+  </tr>
+</table>
+
+<include "foot.template">
+</body>
+</html>
diff --git a/templates-dist/en/content.template b/templates-dist/en/content.template
index 6b867ff3..e89179c3 100755
--- a/templates-dist/en/content.template
+++ b/templates-dist/en/content.template
@@ -1,67 +1,67 @@
-<html>
-<head>
-<title>
-indymedia.de | content_objekt
-</title>
-<style type="text/css">
-<!--
-td {  font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt}
-p {  font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt}
--->
-</style></head>
-
-<body bgcolor="#FFFFFF" link="#aaaaaa">
-<include "head.template">
-<form method="post" action="${actionRoot}">
-	<input type="hidden" name="module" value="Content">
-	<input type="hidden" name="where" value="${where}">
-	<input type="hidden" name="offset" value="${offset}">
-	<input type="hidden" name="order" value="${order}">
-	<input type="hidden" name="id" value="${id}">
-	<if new>
-		<input type="hidden" name="do" value="insert">
-	<else>
-		<input type="hidden" name="do" value="update">
-	</if>
-
-<table border="0" width="80%" align=middle>
-<tr>
-	<font face="Verdana, Arial, Helvetica, sans-serif" size="-1" color="#FFFFFF">
-	<td align="right" bgcolor="#AAAAAA">
-		<b>Datensatz geh&ouml;rt:</b></td>
-	<td> ${login_user.login}<br>${date}</td>
-	</font>
-	<td colspan="3">&nbsp;</td>
-</tr>
-<tr>
-	<td align="right" valign="top" bgcolor="#AAAAAA"><font color="#ffffff">
-		<B>Topic&nbsp;<a href="${docRoot}/help/content.html">
-		<img src="${docRoot}/img/help.gif" border="0" align="absmiddle"></a>
-		&nbsp;/&nbsp;Feature:&nbsp;
-		<a href="${docRoot}/help/content.html">
-		<img src="${docRoot}/img/help.gif" border="0" align="absmiddle"></a>
-		</B></font>
-	</td>
-	<td colspan="4" >
+<html>
+<head>
+<title>
+indymedia.de | content_objekt
+</title>
+<style type="text/css">
+<!--
+td {  font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt}
+p {  font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt}
+-->
+</style></head>
+
+<body bgcolor="#FFFFFF" link="#aaaaaa">
+<include "head.template">
+<form method="post" action="${config.actionRoot}">
+	<input type="hidden" name="module" value="Content">
+	<input type="hidden" name="where" value="${where}">
+	<input type="hidden" name="offset" value="${offset}">
+	<input type="hidden" name="order" value="${order}">
+	<input type="hidden" name="id" value="${id}">
+	<if new>
+		<input type="hidden" name="do" value="insert">
+	<else>
+		<input type="hidden" name="do" value="update">
+	</if>
+
+<table border="0" width="80%" align=middle>
+<tr>
+	<font face="Verdana, Arial, Helvetica, sans-serif" size="-1" color="#FFFFFF">
+	<td align="right" bgcolor="#AAAAAA">
+		<b>Datensatz geh&ouml;rt:</b></td>
+	<td> ${login_user.login}<br>${date}</td>
+	</font>
+	<td colspan="3">&nbsp;</td>
+</tr>
+<tr>
+	<td align="right" valign="top" bgcolor="#AAAAAA"><font color="#ffffff">
+		<B>Topic&nbsp;<a href="${config.docRoot}/help/content.html">
+		<img src="${config.docRoot}/img/help.gif" border="0" align="absmiddle"></a>
+		&nbsp;/&nbsp;Feature:&nbsp;
+		<a href="${config.docRoot}/help/content.html">
+		<img src="${config.docRoot}/img/help.gif" border="0" align="absmiddle"></a>
+		</B></font>
+	</td>
+	<td colspan="4" >
 		<table border=0 cellpadding="0" cellspacing="0">
 		<tr>
 		<td>
 		<select name="to_article_type">
 		<list articletypePopupData as a>
-			<option value="${a.key}" <if (a.key == to_article_type)>selected</if>>${a.value}</option>
+			<option value="${a.key}" <if (a.key == data.to_article_type)>selected</if>>${a.value}</option>
 		</list>
 		</select>
 		<select name="to_feature">
 		<list schwerpunktPopupData as s>
-			<option value="${s.key}" <if (s.key == to_feature)>selected</if>>${s.value}</option>
+			<option value="${s.key}" <if (s.key == data.to_feature)>selected</if>>${s.value}</option>
 		</list>
 		</select>
 		</td>
 		<td rowspan="2">
-		<select name="to_topic" size="5" multiple>
-		<list themenPopupData as t>
-		<option value="${t.key}" <list to_topic as to><if (t.key == to)>selected</if></list>>${t.value}</option>			
-		</list>
+		<select name="to_topic" size="5" multiple>
+		<list themenPopupData as t>
+		<option value="${t.key}" <list to_topic as to><if (t.key == to)>selected</if></list>>${t.value}</option>
+		</list>
 		</select>
 		</td>
 		</tr>
@@ -69,170 +69,151 @@ p {  font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt}
 		<td>
 		<select name="to_language">
 		<list languagePopupData as l>
-			<option value="${l.key}" <if (l.key == to_language)>selected</if>>${l.value}</option>
+			<option value="${l.key}" <if (l.key == data.to_language)>selected</if>>${l.value}</option>
 		</list>
 		</select>
 		<td>
 		</tr>
 		</table>
-	</td>
-</tr>
-<tr>
-	<td align="right" valign="top" bgcolor="#AAAAAA">
-		<B><font color="#ffffff">long titel:&nbsp;<br><br>short title/context-title:&nbsp;<br>
-		<a href="${docRoot}/help/content.html#title">
-		<img src="${docRoot}/img/help.gif" border="0" align="absmiddle"></a>
-		</font></B>
-	</td>
-	<td colspan="4">
-		<input type="text" size="40" name="title" value="${title}"><br>
-		<input type="text" size="20" name="subtitle" value="${subtitle}">
-		<input type="text" size="20" name="edittitle" value="${edittitle}">
-	</td>
-</tr>
-<tr>
-   	<td align="right" valign="top" bgcolor="#AAAAAA">
-		<B><font color="#ffffff">location:</font>
-		<font color="#FFFFFF">
-		<a href="${docRoot}/help/content.html">
-		<img src="${docRoot}/img/help.gif" border="0" align="absmiddle"></a>
-		</font></B>
-	</td>
-	<td colspan="4" >
-		<input type="text" size="40" name="place" value="${place}">
-	</td>
-</tr>
-<tr>
-	<td align="right" valign="top" bgcolor="#AAAAAA">
-		<font color="#ffffff"><B>author:</B></font>
-		<font color="#ffffff">
-		<a href="${docRoot}/help/content.html">
-		<img src="${docRoot}/img/help.gif" border="0" align="absmiddle"></a></font>
-	</td>
-	<td colspan="4" >
-		<input type="text" size="40" name="creator" value="${creator}"><br>
-	</td>
-</tr>
-
-<tr>
-	<td align="right" valign="top" bgcolor="#AAAAAA">
-		<font color="#ffffff"><B>Email/Web:</B></font>
-		<font color="#ffffff">
-		<a href="${docRoot}/help/content.html">
-		<img src="${docRoot}/img/help.gif" border="0" align="absmiddle"></a></font>
-	</td>
-	<td colspan="4" >
-		<input type="text" size="20" name="creator_email" value="${creator_email}">
-		<input type="text" size="20" name="creator_main_url" value="${creator_main_url}">
-	</td>
-</tr>
-<tr>
-	<td align="right" valign="top" bgcolor="#AAAAAA">
-		<font color="#ffffff"><B>Adresse/Telefon:</B></font>
-		<font color="#ffffff">
-		<a href="${docRoot}/help/content.html">
-		<img src="${docRoot}/img/help.gif" border="0" align="absmiddle"></a></font>
-	</td>
-	<td colspan="4" >
-		<input type="text" size="20" name="creator_address" value="${creator_address}">
-		<input type="text" size="20" name="creator_phone" value="${creator_phone}">
-	</td>
-</tr>
-<tr>
-  <td align="right" valign="top" bgcolor="#AAAAAA">
-		<B><font color="#ffffff">abstract:</font></B>
-		<a href="${docRoot}/help/content.html">
-		<img src="${docRoot}/img/help.gif" border="0" align="absmiddle"></a>
-	</td>
-	<td colspan="4">
-		<textarea cols="50" rows="4" name="description" wrap=virtual>${description}</textarea>
-	</td>
-</tr>
-
-<tr>
-    <td align="right" valign="top" bgcolor="#AAAAAA">
-		<B><font color="#ffffff">Inhalt:
-		<a href="${docRoot}/help/content.html">
-		<img src="${docRoot}/img/help.gif" border="0" align="absmiddle"></a>
-		HTML?</font> <input type="checkbox" name="is_html" value="1"<if
-		is_html=="1"> checked</if>>&nbsp;
-		<a href="${docRoot}/help/content.html">
-		<img src="${docRoot}/img/help.gif" border="0" align="absmiddle"></a>
-	</font></b></td>
-	<td colspan="4">
-	<textarea cols="50" rows="15" name="content_data" wrap=virtual>${content_data}</textarea></td>
-</tr>
-<!--
-<tr>
-	<td align="right" valign="top" bgcolor="#aaaaaa"><B><font color="#ffffff">Termin (von/bis)
-		<font color="#000000">
-		<a href="${docRoot}/help/content.html">
-		<img src="${docRoot}/img/help.gif" border="0" align="absmiddle"></a></font>
-		</font>:</B></td>
-	<td nowrap>
-		<input type="text" size="8" maxlength="8" name="date_from" value="${date_from}">
-		<input type="text" size="8" maxlength="8" name="date_to" value="${date_to}">
-	</td>
-	<td>
-		&nbsp;
-	</td>
-	<td align="right" valign="top" bgcolor="#aaaaaa">
-		<B><font color="#ffffff">Termin Name:&nbsp;
-		<a href="${docRoot}/help/content.html"><img src="${docRoot}/img/help.gif" border="0" align="absmiddle"></a>
-		</font></B>
-	</td>
-	<td>
-		<input type="text" size="25" name="date_name" value="${date_name}">
-	</td>
-</tr>
--->
-<tr>
-	<td align="right" valign="top" bgcolor="#aaaaaa">
-		<B><font color="#ffffff">comment:</B><br>
-		<i>(internal)</i></font>
-	</td>
-	<td colspan="4">
-		<textarea cols="50" rows="6" name="comment" wrap=virtual>${comment}</textarea>
-	</td>
-</tr>
-
-<tr>
-	<td>&nbsp;</td>
-	<td>&nbsp;</td>
-	<td>&nbsp;</td>
-	<td colspan="2" align="right" valign="top">
-		frei <a href="${docRoot}/help/content.html"><img src="${docRoot}/img/help.gif" border="0" align="absmiddle"></a>:
-		<input type="checkbox" name="is_published" value="1"<if is_published!="0" && is_published!=""> checked</if>>
-		<if new>
-		<input type="submit" name="save" value="einfügen">
-		<else>
-		<input type="submit" name="save" value="speichern">
-		</if>
-	</td>
-</tr>
-
-<tr><td bgcolor="Pink" colspan="5">Attachments</td></tr>
-<!-- image stuff -->
-<list to_media as m>
+	</td>
+</tr>
+<tr>
+	<td align="right" valign="top" bgcolor="#AAAAAA">
+		<B><font color="#ffffff">long title:&nbsp;<br><br>short title/context-title:&nbsp;<br>
+		<a href="${config.docRoot}/help/content.html#title">
+		<img src="${config.docRoot}/img/help.gif" border="0" align="absmiddle"></a>
+		</font></B>
+	</td>
+	<td colspan="4">
+		<input type="text" size="40" name="title" value="${data.title}"><br>
+		<input type="text" size="20" name="subtitle" value="${data.subtitle}">
+		<input type="text" size="20" name="edittitle" value="${data.edittitle}">
+	</td>
+</tr>
+<tr>
+   	<td align="right" valign="top" bgcolor="#AAAAAA">
+		<B><font color="#ffffff">location:</font>
+		<font color="#FFFFFF">
+		<a href="${config.docRoot}/help/content.html">
+		<img src="${config.docRoot}/img/help.gif" border="0" align="absmiddle"></a>
+		</font></B>
+	</td>
+	<td colspan="4" >
+		<input type="text" size="40" name="place" value="${data.place}">
+	</td>
+</tr>
+<tr>
+	<td align="right" valign="top" bgcolor="#AAAAAA">
+		<font color="#ffffff"><B>author:</B></font>
+		<font color="#ffffff">
+		<a href="${config.docRoot}/help/content.html">
+		<img src="${config.docRoot}/img/help.gif" border="0" align="absmiddle"></a></font>
+	</td>
+	<td colspan="4" >
+		<input type="text" size="40" name="creator" value="${data.creator}"><br>
+	</td>
+</tr>
+
+<tr>
+	<td align="right" valign="top" bgcolor="#AAAAAA">
+		<font color="#ffffff"><B>Email/Web:</B></font>
+		<font color="#ffffff">
+		<a href="${config.docRoot}/help/content.html">
+		<img src="${config.docRoot}/img/help.gif" border="0" align="absmiddle"></a></font>
+	</td>
+	<td colspan="4" >
+		<input type="text" size="20" name="creator_email" value="${data.creator_email}">
+		<input type="text" size="20" name="creator_main_url" value="${data.creator_main_url}">
+	</td>
+</tr>
+<tr>
+	<td align="right" valign="top" bgcolor="#AAAAAA">
+		<font color="#ffffff"><B>Address/Phone:</B></font>
+		<font color="#ffffff">
+		<a href="${config.docRoot}/help/content.html">
+		<img src="${config.docRoot}/img/help.gif" border="0" align="absmiddle"></a></font>
+	</td>
+	<td colspan="4" >
+		<input type="text" size="20" name="creator_address" value="${data.creator_address}">
+		<input type="text" size="20" name="creator_phone" value="${data.creator_phone}">
+	</td>
+</tr>
+<tr>
+  <td align="right" valign="top" bgcolor="#AAAAAA">
+		<B><font color="#ffffff">abstract:</font></B>
+		<a href="${config.docRoot}/help/content.html">
+		<img src="${config.docRoot}/img/help.gif" border="0" align="absmiddle"></a>
+	</td>
+	<td colspan="4">
+		<textarea cols="50" rows="4" name="description" wrap=virtual>${data.description}</textarea>
+	</td>
+</tr>
+
+<tr>
+    <td align="right" valign="top" bgcolor="#AAAAAA">
+		<B><font color="#ffffff">Content:
+		<a href="${config.docRoot}/help/content.html">
+		<img src="${config.docRoot}/img/help.gif" border="0" align="absmiddle"></a>
+		HTML?</font> <input type="checkbox" name="data.is_html" value="1"<if
+		data.is_html=="1"> checked</if>>&nbsp;
+		<a href="${config.docRoot}/help/content.html">
+		<img src="${config.docRoot}/img/help.gif" border="0" align="absmiddle"></a>
+	</font></b></td>
+	<td colspan="4">
+	<textarea cols="50" rows="15" name="content_data" wrap=virtual>${data.content_data}</textarea></td>
+</tr>
+
+<tr>
+	<td align="right" valign="top" bgcolor="#aaaaaa">
+		<B><font color="#ffffff">comment:</B><br>
+		<i>(internal)</i></font>
+	</td>
+	<td colspan="4">
+		<textarea cols="50" rows="6" name="comment" wrap=virtual>${data.comment}</textarea>
+	</td>
+</tr>
+
+<tr>
+	<td>&nbsp;</td>
+	<td>&nbsp;</td>
+	<td>&nbsp;</td>
+	<td colspan="2" align="right" valign="top">
+		published <a href="${config.docRoot}/help/content.html"><img src="${config.docRoot}/img/help.gif" border="0" align="absmiddle"></a>:
+		<input type="checkbox" name="is_published" value="1"<if data.is_published!="0" && data.is_published!=""> checked</if>>
+		<if new>
+		<input type="submit" name="save" value="insert">
+		<else>
+		<input type="submit" name="save" value="save">
+		</if>
+	</td>
+</tr>
+
+<tr><td bgcolor="Pink" colspan="5">Attachments</td></tr>
+
+<!-- image stuff -->
+
+<list data.to_media as m>
 <tr>
 	<td align=right valign=top bgcolor="#aaaaaa">
   		<B><font color="#ffffff">Images:</B><br></td>
 	<td colspan="4" align="left" valign="top">
-		<a href="${actionRoot}?module=Images&do=edit&id=${m["id"]}"><img src="${actionRoot}?module=Images&do=showicon&id=${m["id"]}" alt="edit image" border="0"></a>
-  		<a href="${actionRoot}?module=Content&do=dettach&cid=${id}&mid=${m["id"]}">delete</a>
+		<a href="${config.actionRoot}?module=Images&do=edit&id=${m["id"]}">
+		<img src="${config.actionRoot}?module=Images&do=showicon&id=${m["id"]}" alt="edit image" border="0"></a>
+  	<a href="${config.actionRoot}?module=Content&do=dettach&cid=${id}&mid=${m["id"]}">delete</a>
 	</td>
 </tr>
 </list>
+
 <tr>
 	<td align=right valign=top bgcolor="#aaaaaa">
-  		<B><font color="#ffffff">Medien:</B><br></td>
+  		<B><font color="#ffffff">Media:</B><br></td>
 	<td colspan="4" align="left" valign="top">
-  		<a href="${actionRoot}?module=Images&do=list&cid=${id}">add image</a>
+  		<a href="${config.actionRoot}?module=Images&do=list&cid=${data.id}">add image</a>
 	</td>
 </tr>
-
-</table>
-</form>
-<include "foot.template">
-</body>
-</html>
+
+</table>
+</form>
+<include "foot.template">
+</body>
+</html>
diff --git a/templates-dist/en/contentlist.template b/templates-dist/en/contentlist.template
index d960babc..5fb8424b 100755
--- a/templates-dist/en/contentlist.template
+++ b/templates-dist/en/contentlist.template
@@ -1,46 +1,46 @@
-<html>
-<head>
-	<title>indymedia.de | contentlist</title>
-</head>
-
-<body bgcolor="#FFFFFF">
-<include "head.template">
-<if data.contentlist>
-	<table border="0" width="100%" cellspacing="0" cellpadding="2">
-	  <tr bgcolor="#006600">
-	    <td><font face="Verdana, Arial, Helvetica, sans-serif" size="-1" color="#ffffff">
-			date<br>
-			last change<br>
-			Status</font></td>
-	    <td><font face="Verdana, Arial, Helvetica, sans-serif" size="-1" color="#ffffff">
-			articletype / location: title<br>
-			author</font></td>
-	    <td ><font face="Verdana, Arial, Helvetica, sans-serif" size="-1" color="#ffffff">topic<br>Feature</font></td>
-	    <td width="25%"><font face="Verdana, Arial, Helvetica, sans-serif" size="-1" color="#ffffff">
-			internal comment</font></td>
-		<td bgcolor="#FFFFFF">&nbsp;</td>
-	  </tr>
-
-	<list data.contentlist as entry>
-	  <tr <if grey=="1"><assign grey="0">bgcolor="#dddddd" <else><assign grey="1"></if>>
-	    <td><font face="Verdana, Arial, Helvetica, sans-serif" size="-2">
-			${entry.webdb_create_formatted}<br>
-			<if entry.webdb_lastchange_formatted>${entry.webdb_lastchange_formatted}<else>-</if><br>
-			<if entry.is_published!="0">F<else>-</if>
-			<if entry.is_html!="0">H<else>-</if>
-			</font></td>
-	    <td><font face="Verdana, Arial, Helvetica, sans-serif" size="-1"><b>
-			<font size="-2">${articletypeHash[entry.to_article_type]["name"]} -- </font><if entry.place>${entry.place}: </if>${entry.title}</b><br>
-			${entry.creator}&nbsp;
-			<a href="${actionRoot}?module=Content&do=edit&id=${entry.id}&where=${where_encoded}&order=${order_encoded}&offset=${offset}">edit</a>
-			<if entry.to_article_type=="0">&nbsp;|&nbsp;<a href="${actionRoot}?module=Content&do=newswire&id=${entry.id}&where=${where_encoded}&order=${order_encoded}&offset=${offset}">newswire</a></if></font></td>
-	    <td><font face="Verdana, Arial, Helvetica, sans-serif" size="-1">
-			<if entry.thema_id!="0">${themenHashData[entry.thema_id]["name"]}</if>&nbsp;<br>
-			<if entry.to_feature!="0">${schwerpunktHashData[entry.to_feature]["title"]}</if>&nbsp;</font></td>
-	    <td width="20%" <if grey=="1">bgcolor="Pink"<else>bgcolor="Yellow"</if> valign="top"><font face="Verdana, Arial, Helvetica, sans-serif" size="-2">
-			${entry.comment}&nbsp;</font></td>
-	    <td bgcolor="#888888"><font size="1">
-  	      <a href="${actionRoot}?module=Content&do=delete&id=${entry.id}&where=${where_encoded}&order=${order_encoded}&offset=${offset}">delete</a>
+<html>
+<head>
+	<title>indymedia.de | contentlist</title>
+</head>
+
+<body bgcolor="#FFFFFF">
+<include "head.template">
+<if data.contentlist>
+	<table border="0" width="100%" cellspacing="0" cellpadding="2">
+	  <tr bgcolor="#006600">
+	    <td><font face="Verdana, Arial, Helvetica, sans-serif" size="-1" color="#ffffff">
+			date<br>
+			last change<br>
+			Status</font></td>
+	    <td><font face="Verdana, Arial, Helvetica, sans-serif" size="-1" color="#ffffff">
+			articletype / location: title<br>
+			author</font></td>
+	    <td ><font face="Verdana, Arial, Helvetica, sans-serif" size="-1" color="#ffffff">topic<br>Feature</font></td>
+	    <td width="25%"><font face="Verdana, Arial, Helvetica, sans-serif" size="-1" color="#ffffff">
+			internal comment</font></td>
+		<td bgcolor="#FFFFFF">&nbsp;</td>
+	  </tr>
+
+	<list data.contentlist as entry>
+	  <tr <if grey=="1"><assign grey="0">bgcolor="#dddddd" <else><assign grey="1"></if>>
+	    <td><font face="Verdana, Arial, Helvetica, sans-serif" size="-2">
+			${entry.webdb_create_formatted}<br>
+			<if entry.webdb_lastchange_formatted>${entry.webdb_lastchange_formatted}<else>-</if><br>
+			<if entry.is_published!="0">F<else>-</if>
+			<if entry.is_html!="0">H<else>-</if>
+			</font></td>
+	    <td><font face="Verdana, Arial, Helvetica, sans-serif" size="-1"><b>
+			<font size="-2">${articletypeHash[entry.to_article_type]["name"]} -- </font><if entry.place>${entry.place}: </if>${entry.title}</b><br>
+			${entry.creator}&nbsp;
+			<a href="${config.actionRoot}?module=Content&do=edit&id=${entry.id}&where=${where_encoded}&order=${order_encoded}&offset=${offset}">edit</a>
+			<if entry.to_article_type=="0">&nbsp;|&nbsp;<a href="${config.actionRoot}?module=Content&do=newswire&id=${entry.id}&where=${where_encoded}&order=${order_encoded}&offset=${offset}">newswire</a></if></font></td>
+	    <td><font face="Verdana, Arial, Helvetica, sans-serif" size="-1">
+			<if entry.thema_id!="0">${themenHashData[entry.thema_id]["name"]}</if>&nbsp;<br>
+			<if entry.to_feature!="0">${schwerpunktHashData[entry.to_feature]["title"]}</if>&nbsp;</font></td>
+	    <td width="20%" <if grey=="1">bgcolor="Pink"<else>bgcolor="Yellow"</if> valign="top"><font face="Verdana, Arial, Helvetica, sans-serif" size="-2">
+			${entry.comment}&nbsp;</font></td>
+	    <td bgcolor="#888888"><font size="1">
+  	      <a href="${config.actionRoot}?module=Content&do=delete&id=${entry.id}&where=${where_encoded}&order=${order_encoded}&offset=${offset}">delete</a>
 	      </font></td>
 	</tr>
 	</list>
diff --git a/templates-dist/en/languagelist.template b/templates-dist/en/languagelist.template
index 12665729..3a7230f9 100755
--- a/templates-dist/en/languagelist.template
+++ b/templates-dist/en/languagelist.template
@@ -17,8 +17,8 @@
        <if grey=="1"><assign grey="0">bgcolor="#dddddd" <else><assign grey="1"> </if>
   >
   <td>${entry.name}&nbsp;</td>
-  <td><font size="1">&nbsp;<a href="${actionRoot}?module=Language&do=delete&id=${entry.id}">delete</a>
-    | <a href="${actionRoot}?module=Language&do=edit&id=${entry.id}">edit</a></font></td>
+  <td><font size="1">&nbsp;<a href="${config.actionRoot}?module=Language&do=delete&id=${entry.id}">delete</a>
+    | <a href="${config.actionRoot}?module=Language&do=edit&id=${entry.id}">edit</a></font></td>
   </tr>
   </list>
   <tr>
@@ -31,15 +31,15 @@
       <P>
 <if prev>
 	<a
-href="${actionRoot}?module=Language&do=list&where=${where}&prevoffset=${prev}&prev=zur&uuml;ck">previous</a>&nbsp;
+href="${config.actionRoot}?module=Language&do=list&where=${where}&prevoffset=${prev}&prev=zur&uuml;ck">previous</a>&nbsp;
 </if>
 <if next>
 <a
-href="${actionRoot}?module=Language&do=list&where=${where}&nextoffset=${next}&next=weiter">next</a>
+href="${config.actionRoot}?module=Language&do=list&where=${where}&nextoffset=${next}&next=weiter">next</a>
 </if>
 
 <else>
-  <P align="center"> Keine passenden Eintr&auml;ge gefunden!</p>
+  <P align="center">No matching entries!</p>
 </if>
 <include "foot.template">
 </body>
diff --git a/templates-dist/en/mediafolder.template b/templates-dist/en/mediafolder.template
index f90aa947..e745eb78 100755
--- a/templates-dist/en/mediafolder.template
+++ b/templates-dist/en/mediafolder.template
@@ -1,52 +1,52 @@
-<html>
-<head>
-<title>
-indymedia.de | mediafolder
-</title>
-<head>
-
-<body bgcolor="#FFFFFF">
-<include "head.template">
-<form method="post" action="${actionRoot}">
-	<input type=hidden name=module value=Mediafolder>
-	<input type="hidden" name="id" value="${id}">
-	<if new> <input type="hidden" name="do" value="insert">
-	<else>	 <input type="hidden" name="do" value="update"></if>
-
-<table border="0">
-
-  <tr> 
-    <td align="right" bgcolor="#006600"><font color="#ffffff"><B>date:</B></font></td>
-    <td><input type="text" size="8" maxsize="8" name="date" value="${date}"></td>
-  </tr>
-
-  <tr> 
-    <td align="right" bgcolor="#006600"><font color="#ffffff"><B>name:</B></font></td>
-    <td><input type="text" size="40" name="name" value="${name}"></td>
-  </tr>
-
-  <tr> 
-    <td align="right" bgcolor="#006600"><font color="#ffffff"><B>ort:</B></font></td>
-    <td><input type="text" size="40" name="place" value="${place}"></td>
-  </tr>
-
-  <tr> 
-    <td align="right" bgcolor="#006600"><font color="#ffffff"><B>comment:</B></font></td>
-    <td><textarea cols="40" rows="5" name="comment">${comment}</textarea></td>
-  </tr>
-
-  <tr> 
-    <td align="right" bgcolor="#006600"><font color="#ffffff"><B>keywords:</B></font></td>
-    <td><textarea cols="40" rows="4" name="keywords">${keywords}</textarea></td>
-  </tr>
-
-  <tr> 
-    <td colspan="4" align="right"> <font color="#ffffff">
-		<if new> <input type="submit" name="save" value="einfügen">
-    	<else>   <input type="submit" name="save" value="speichern"></if>
-		</font></form></font>
-    </td>
-</table>
-<include "foot.template">
-</body>
-</html>
+<html>
+<head>
+<title>
+indymedia.de | mediafolder
+</title>
+<head>
+
+<body bgcolor="#FFFFFF">
+<include "head.template">
+<form method="post" action="${config.actionRoot}">
+	<input type=hidden name=module value=Mediafolder>
+	<input type="hidden" name="id" value="${data.id}">
+	<if new> <input type="hidden" name="do" value="insert">
+	<else>	 <input type="hidden" name="do" value="update"></if>
+
+<table border="0">
+
+  <tr>
+    <td align="right" bgcolor="#006600"><font color="#ffffff"><B>date:</B></font></td>
+    <td><input type="text" size="8" maxsize="8" name="date" value="${data.date}"></td>
+  </tr>
+
+  <tr>
+    <td align="right" bgcolor="#006600"><font color="#ffffff"><B>name:</B></font></td>
+    <td><input type="text" size="40" name="name" value="${data.name}"></td>
+  </tr>
+
+  <tr>
+    <td align="right" bgcolor="#006600"><font color="#ffffff"><B>ort:</B></font></td>
+    <td><input type="text" size="40" name="place" value="${data.place}"></td>
+  </tr>
+
+  <tr>
+    <td align="right" bgcolor="#006600"><font color="#ffffff"><B>comment:</B></font></td>
+    <td><textarea cols="40" rows="5" name="comment">${data.comment}</textarea></td>
+  </tr>
+
+  <tr>
+    <td align="right" bgcolor="#006600"><font color="#ffffff"><B>keywords:</B></font></td>
+    <td><textarea cols="40" rows="4" name="keywords">${data.keywords}</textarea></td>
+  </tr>
+
+  <tr>
+    <td colspan="4" align="right"> <font color="#ffffff">
+		<if new> <input type="submit" name="save" value="insert">
+    	<else>   <input type="submit" name="save" value="save"></if>
+		</font></form></font>
+    </td>
+</table>
+<include "foot.template">
+</body>
+</html>
diff --git a/templates-dist/en/mediafolderlist.template b/templates-dist/en/mediafolderlist.template
index bcc3c5c4..c3ca1960 100755
--- a/templates-dist/en/mediafolderlist.template
+++ b/templates-dist/en/mediafolderlist.template
@@ -1,49 +1,50 @@
-<html>
+<html>
 <head>
 	<title>indymedia.de | mediafolderlist</title>
 </head>
-
-<body bgcolor="#FFFFFF">
-<include "head.template">
-<if contentlist>
-	<table border="0">
-  		<tr bgcolor="#006600">
-    		<td><font color="#ffffff"><b>date</b></font></td>
-		    <td><font color="#ffffff"><b>name</b></font></td>
-    		<td><font color="#ffffff"><b>ort</b></font></td>
-			<td><font color="#ffffff"><b>comment</b></font></td>
-			<td><font color="#ffffff"><b>keyword</b></font></td>
- 		 </tr>
-	  <list contentlist as entry>
-		  <tr <if grey=="1"><assign grey="0">bgcolor="#dddddd" <else><assign grey="1"> </if> >
-			<td>${entry.date}&nbsp;</td>
-  			<td><b>${entry.name}</b>&nbsp;</td>
-  			<td>${entry.place}&nbsp;</td>
-  			<td>${entry.comment}&nbsp;</td>
-  			<td>${entry.keywords}&nbsp;</td>
-  			<td><font size="1"><a href="${actionRoot}?module=Mediafolder&do=delete&id=${entry.id}">delete</a>
-    			| <a href="${actionRoot}?module=Mediafolder&do=edit&id=${entry.id}">edit</a>
-				| <a href="${actionRoot}?module=Images&do=list&query_media_folder=${entry.id}">browse</a></font></td>
- 		  </tr>
-  	  </list>
-  		<tr>
-    	<td colspan="5" bgcolor="#006600"><font color="#ffffff">${count} entries
-      	/ show from ${from} to ${to}</font></td>
-    	<td>&nbsp;</td>
-  		</tr>
-	</table>
-      <P>
-	<if prev>
-	<a href="${actionRoot}?module=Mediafolder&do=list&where=${where}&prevoffset=${prev}&prev=zur&uuml;ck">back</a>&nbsp;
-	</if>
-	<if next>
-	<a href="${actionRoot}?module=Mediafolder&do=list&where=${where}&nextoffset=${next}&next=weiter">go on</a>
-	</if>
-<else>
-  <P align="center"> No matching entries!</p>
-</if>
-<include "foot.template">
-</body>
-</html>
-
-
+
+<body bgcolor="#FFFFFF">
+<include "head.template">
+
+<if contentlist>
+	<table border="0">
+  		<tr bgcolor="#006600">
+    		<td><font color="#ffffff"><b>date</b></font></td>
+		    <td><font color="#ffffff"><b>name</b></font></td>
+    		<td><font color="#ffffff"><b>ort</b></font></td>
+			<td><font color="#ffffff"><b>comment</b></font></td>
+			<td><font color="#ffffff"><b>keyword</b></font></td>
+ 		 </tr>
+	  <list contentlist as entry>
+		  <tr <if grey=="1"><assign grey="0">bgcolor="#dddddd" <else><assign grey="1"> </if> >
+			<td>${entry.date}&nbsp;</td>
+  			<td><b>${entry.name}</b>&nbsp;</td>
+  			<td>${entry.place}&nbsp;</td>
+  			<td>${entry.comment}&nbsp;</td>
+  			<td>${entry.keywords}&nbsp;</td>
+  			<td><font size="1"><a href="${config.actionRoot}?module=Mediafolder&do=delete&id=${entry.id}">delete</a>
+    			| <a href="${config.actionRoot}?module=Mediafolder&do=edit&id=${entry.id}">edit</a>
+				| <a href="${config.actionRoot}?module=Images&do=list&query_media_folder=${entry.id}">browse</a></font></td>
+ 		  </tr>
+  	  </list>
+  		<tr>
+    	<td colspan="5" bgcolor="#006600"><font color="#ffffff">${count} entries
+      	/ show from ${from} to ${to}</font></td>
+    	<td>&nbsp;</td>
+  		</tr>
+	</table>
+      <P>
+	<if prev>
+	<a href="${config.actionRoot}?module=Mediafolder&do=list&where=${where}&prevoffset=${prev}&prev=zur&uuml;ck">back</a>&nbsp;
+	</if>
+	<if next>
+	<a href="${config.actionRoot}?module=Mediafolder&do=list&where=${where}&nextoffset=${next}&next=weiter">go on</a>
+	</if>
+<else>
+  <P align="center"> No matching entries!</p>
+</if>
+<include "foot.template">
+</body>
+</html>
+
+
diff --git a/templates-dist/en/message.template b/templates-dist/en/message.template
index dc40a57b..e12b008e 100755
--- a/templates-dist/en/message.template
+++ b/templates-dist/en/message.template
@@ -1,58 +1,57 @@
-<html>
-<head>
-<title>
-indymedia.de | breaking
-</title>
-<head>
-
-<body bgcolor="#FFFFFF">
-<include "head.template">
-<form action="${actionRoot}" method="post">
-	<input type="hidden" name="module" value="Message">
-	<input type="hidden" name="id" value="${id}">
-	<if new><input type="hidden" name="do" value="insert">
-	<else><input type="hidden" name="do" value="update"></if>
-<table border="0">
-  <tr>
-    <td align="right" bgcolor="#006600"><font color="#ffffff" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
-	<B>date:</B></font></td>
-    <td>
-      ${date}
-    </td>
-  </tr>
-
-  <tr> 
-    <td align="right" bgcolor="#006600"><font color="#ffffff" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
-	<B>title:</B></td>
-    <td>
-	 <input type=text name="title" maxlength=40 value="${title}">
-    </td>
-  </tr>
-
-  <tr> 
-    <td align="right" bgcolor="#006600"><font color="#ffffff" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
-	<B>author:</B></td>
-    <td>
-	 <input type=text name="creator" maxlength=40 value="${creator}">
-    </td>
-  </tr>
-
-  <tr> 
-    <td align="right" bgcolor="#006600"><font color="#ffffff" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
-	<B>text:</B> (max. 5 lines / 250 characters)</font></td>
-    <td>
-	 <textarea cols="50" rows="3" name="description" wrap=virtual>${description}</textarea>
-    </td>
-  </tr>
-
-  <tr> 
-    <td colspan="2" align="right"> <font color="#ffffff"><if new> 
-      <input type="submit" name="save" value="insert">
-    <else> 
-    <input type="submit" name="save" value="save">
-    </if> </font></form></font>
-    </td>
-</table>
-<include "foot.template">
-</body>
-</html>
+<html>
+<head>
+<title>
+indymedia.de | breaking
+</title>
+<head>
+
+<body bgcolor="#FFFFFF">
+<include "head.template">
+<form action="${config.actionRoot}" method="post">
+	<input type="hidden" name="module" value="Message">
+	<input type="hidden" name="id" value="${data.id}">
+	<if new><input type="hidden" name="do" value="insert">
+	<else><input type="hidden" name="do" value="update"></if>
+<table border="0">
+  <tr>
+    <td align="right" bgcolor="#006600"><font color="#ffffff" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
+	<B>date:</B></font></td>
+    <td>
+      ${data.date}
+    </td>
+  </tr>
+
+  <tr>
+    <td align="right" bgcolor="#006600"><font color="#ffffff" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
+			<B>title:</B></td>
+    <td><input type=text name="title" maxlength=40 value="${data.title}">
+    </td>
+  </tr>
+
+  <tr>
+    <td align="right" bgcolor="#006600"><font color="#ffffff" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
+	<B>author:</B></td>
+    <td>
+	 <input type=text name="creator" maxlength=40 value="${data.creator}">
+    </td>
+  </tr>
+
+  <tr>
+    <td align="right" bgcolor="#006600"><font color="#ffffff" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
+	<B>text:</B> (max. 5 lines / 250 characters)</font></td>
+    <td>
+	 <textarea cols="50" rows="3" name="description" wrap=virtual>${data.description}</textarea>
+    </td>
+  </tr>
+
+  <tr>
+    <td colspan="2" align="right"> <font color="#ffffff"><if new>
+      <input type="submit" name="save" value="insert">
+    <else>
+    <input type="submit" name="save" value="save">
+    </if> </font></form></font>
+    </td>
+</table>
+<include "foot.template">
+</body>
+</html>
diff --git a/templates-dist/en/messagelist.template b/templates-dist/en/messagelist.template
index 96c74afa..c7e03cb4 100755
--- a/templates-dist/en/messagelist.template
+++ b/templates-dist/en/messagelist.template
@@ -1,48 +1,47 @@
-<html>
-<head>
-	<title>indymedia.de |  message list</title>
-</head>
-
-<body bgcolor="#FFFFFF">
-<include "head.template">
-<if contentlist>
-<table border="0" cellpadding="2" cellspacing="1">
-  <tr bgcolor="#006600">
-    <td><font color="#FFFFFF" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
-		<b>date</b></font></td>
-    <td><font color="#FFFFFF" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
-	 	<b>title<br>author</b></font></td>
-    <td><font color="#FFFFFF" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
-		<b>text</b></font></td>
-  </tr>
-
-  <list contentlist as entry>
-  <tr
-       <if grey=="1"><assign grey="0">bgcolor="#dddddd" <else><assign grey="1"> </if>
-  >
-  <td>${entry.webdb_create}&nbsp;</td>
-  <td><b>${entry.title}</b><br>
-      <i>${entry.creator}</i></td>
-  <td bgcolor="Pink">${entry.description}&nbsp;</td>
-  <td><font size="1">&nbsp;<a href="${actionRoot}?module=Message&do=delete&id=${entry.id}">delete</a>
-    | <a href="${actionRoot}?module=Message&do=edit&id=${entry.id}">edit</a></font></td>
-  </tr>
-  </list>
-  <tr>
-    <td colspan="3" bgcolor="#006600"><font color="#ffffff">${count} entries
-      / showing from ${from} to ${to}</font></td>
-    <td>&nbsp;</td>
-  </tr>
-</table>
-
-      <P>
-<if prev>
-	<a href="${actionRoot}?module=Users&do=list&where=${where}&prevoffset=${prev}&prev=zur&uuml;ck">zurueck</a>&nbsp;
-</if>
-<if next>
-<a href="${actionRoot}?module=Users&do=list&where=${where}&nextoffset=${next}&next=weiter">weiter</a>
-</if>
-
+<html>
+<head>
+	<title>indymedia.de |  message list</title>
+</head>
+
+<body bgcolor="#FFFFFF">
+<include "head.template">
+
+<if contentlist>
+<table border="0" cellpadding="2" cellspacing="1">
+  <tr bgcolor="#006600">
+    <td><font color="#FFFFFF" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
+		<b>date</b></font></td>
+    <td><font color="#FFFFFF" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
+	 	<b>title<br>author</b></font></td>
+    <td><font color="#FFFFFF" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
+		<b>text</b></font></td>
+  </tr>
+
+  <list contentlist as entry>
+  <tr <if grey=="1"><assign grey="0">bgcolor="#dddddd"<else><assign grey="1"></if> >
+  <td>${entry.webdb_create}&nbsp;</td>
+  <td><b>${entry.title}</b><br>
+      <i>${entry.creator}</i></td>
+  <td bgcolor="Pink">${entry.description}&nbsp;</td>
+  <td><font size="1">&nbsp;<a href="${config.actionRoot}?module=Message&do=delete&id=${entry.id}">delete</a>
+    | <a href="${config.actionRoot}?module=Message&do=edit&id=${entry.id}">edit</a></font></td>
+  </tr>
+  </list>
+  <tr>
+    <td colspan="3" bgcolor="#006600"><font color="#ffffff">${count} entries
+      / showing from ${from} to ${to}</font></td>
+    <td>&nbsp;</td>
+  </tr>
+</table>
+
+      <P>
+<if prev>
+	<a href="${config.actionRoot}?module=Users&do=list&where=${where}&prevoffset=${prev}&prev=zur&uuml;ck">zurueck</a>&nbsp;
+</if>
+<if next>
+<a href="${config.actionRoot}?module=Users&do=list&where=${where}&nextoffset=${next}&next=weiter">weiter</a>
+</if>
+
 <else>
   <P align="center"> No matching entries!</p>
 </if>
diff --git a/templates-dist/en/open/comment.template b/templates-dist/en/open/comment.template
index ce55ab3e..4d8e79d0 100755
--- a/templates-dist/en/open/comment.template
+++ b/templates-dist/en/open/comment.template
@@ -1,119 +1,119 @@
-<html>
+<html>
 <head><title>indymedia.de | comment.commit</title></head>
 <body bgcolor="white" text="black" link="#006600" vlink="#009900" alink="red">
-			
-<form action="${openAction}" method=post>
-<input type="hidden" name="do" value="inscomment">
-			
-<table width="100%" border="0" cellspacing="0" cellpadding="4" bgcolor="silver">
-	<tr>
-		<td bgcolor="#663399" colspan="3">
-			<font color="White"><b>Adding a coment to an article</b></font>
-		</td>
-	</tr>	
-	<tr>
-		<td bgcolor="#003300" colspan="3">
-			<p>
-				<font color="white">
-				Just some hints (introduction)on how to write  comments for
-				Indymedia. here 	
-				</font>
-			</p>
-
-		</td>
-	</tr>
-	<tr>
-		<td bgcolor="#663399" colspan="3">
-			<font face="Helvetica, Arial" color="white" size=+2><b>Comment-form</b></font>
-		</td>
-	</tr>
-	<tr>
- 		<td>
-			<b>titel of comment</b>
-		</td>
-		<td colspan="2">
-			<input type="text" name="title" size="45" maxlength="45"> <font size="-1" color="#663399">(has to be filled out)</font>
-		</td>
-	</tr>
-	<tr>
- 		<td>
-			<b>your name:</b>
-		</td>
-		<td colspan="2">
-			<input type="text" name="creator" size="20" maxlength="45"> <font size="-1" color="#663399">(muss ausgef&uuml;llt werden)</font>
-		</td>
-	</tr>
-	<tr>
- 		<td>
-			 your eMail
-		</td>
-		<td colspan="2">
-			<input type="text" name="email" size="30" maxlength="80"> <font size="-1">(<i>optional</i>)</font>
-		</td>
-	</tr>
-	<tr>
- 		<td>
-			your Web Adress:
-		</td>
-		<td colspan="2">
-			<input type="text" name="main_url" size="40" maxlength="160" value="http://"> <font size="-1">(<i>optional</i>)</font>
-		</td>
-	</tr>
-	<tr>
- 		<td>
-			your Telefon-Nr.:
-		</td>
-		<td colspan="2">
-			<input type="text" name="phone" size="30" maxlength="80"> <font size="-1">(<i>optional</i>)</font>
-		</td>
-	</tr>
-	<tr>
- 		<td>
-			your Adress:
-		</td>
-		<td colspan="2">
-			<input type="text" name="address" size="40" maxlength="160"><font size="-1"> <i>(optional)</i></font>
-		</td>
-	</tr>
-	<tr>
- 		<td>
-			language of your comment
-		</td>
-		<td colspan="2">
-			<select name="to_language">
-				<option value="0">de</option>
-				<option value="1">en</option>
-			</select> 
-			<font size="-1"><i>(optional)</i></font>
-		</td>
-	</tr>
-	<tr>
-		<td valign="top">
-			<b>your comment</b>
-		</td>
-		<td bgcolor="#003300" colspan="2">
-			&nbsp;<textarea name="description" rows="20" cols="60" wrap=virtual></textarea>
-			<br><br>
-		</td>
-	</tr>
-	<tr>
-		<td>&nbsp;
-		</td>
-		<td bgcolor="#663399" valign="top" align="center">
-			<br>
-			&nbsp;<input type="submit" value="Kommentar abschicken"><br>
-
-		</td>
-		<td bgcolor="#003300" valign="top" align="center">
-			<br>
-			&nbsp;<input type="reset" value="Formular l&ouml;schen"><br>
-			<input type="hidden" name="to_media" value="${aid}">
-			<br>
-		</td>
-	</tr>
-</table>
-	
-</form>
-
-</body>
-</html>
+
+<form action="${config.openAction}" method=post>
+<input type="hidden" name="do" value="inscomment">
+
+<table width="100%" border="0" cellspacing="0" cellpadding="4" bgcolor="silver">
+	<tr>
+		<td bgcolor="#663399" colspan="3">
+			<font color="White"><b>Adding a coment to an article</b></font>
+		</td>
+	</tr>
+	<tr>
+		<td bgcolor="#003300" colspan="3">
+			<p>
+				<font color="white">
+				Just some hints (introduction)on how to write  comments for
+				Indymedia. here
+				</font>
+			</p>
+
+		</td>
+	</tr>
+	<tr>
+		<td bgcolor="#663399" colspan="3">
+			<font face="Helvetica, Arial" color="white" size=+2><b>Comment-form</b></font>
+		</td>
+	</tr>
+	<tr>
+ 		<td>
+			<b>titel of comment</b>
+		</td>
+		<td colspan="2">
+			<input type="text" name="title" size="45" maxlength="45"> <font size="-1" color="#663399">(has to be filled out)</font>
+		</td>
+	</tr>
+	<tr>
+ 		<td>
+			<b>your name:</b>
+		</td>
+		<td colspan="2">
+			<input type="text" name="creator" size="20" maxlength="45"> <font size="-1" color="#663399">(muss ausgef&uuml;llt werden)</font>
+		</td>
+	</tr>
+	<tr>
+ 		<td>
+			 your eMail
+		</td>
+		<td colspan="2">
+			<input type="text" name="email" size="30" maxlength="80"> <font size="-1">(<i>optional</i>)</font>
+		</td>
+	</tr>
+	<tr>
+ 		<td>
+			your Web Adress:
+		</td>
+		<td colspan="2">
+			<input type="text" name="main_url" size="40" maxlength="160" value="http://"> <font size="-1">(<i>optional</i>)</font>
+		</td>
+	</tr>
+	<tr>
+ 		<td>
+			your Telefon-Nr.:
+		</td>
+		<td colspan="2">
+			<input type="text" name="phone" size="30" maxlength="80"> <font size="-1">(<i>optional</i>)</font>
+		</td>
+	</tr>
+	<tr>
+ 		<td>
+			your Adress:
+		</td>
+		<td colspan="2">
+			<input type="text" name="address" size="40" maxlength="160"><font size="-1"> <i>(optional)</i></font>
+		</td>
+	</tr>
+	<tr>
+ 		<td>
+			language of your comment
+		</td>
+		<td colspan="2">
+			<select name="to_language">
+				<option value="0">de</option>
+				<option value="1">en</option>
+			</select>
+			<font size="-1"><i>(optional)</i></font>
+		</td>
+	</tr>
+	<tr>
+		<td valign="top">
+			<b>your comment</b>
+		</td>
+		<td bgcolor="#003300" colspan="2">
+			&nbsp;<textarea name="description" rows="20" cols="60" wrap=virtual></textarea>
+			<br><br>
+		</td>
+	</tr>
+	<tr>
+		<td>&nbsp;
+		</td>
+		<td bgcolor="#663399" valign="top" align="center">
+			<br>
+			&nbsp;<input type="submit" value="Kommentar abschicken"><br>
+
+		</td>
+		<td bgcolor="#003300" valign="top" align="center">
+			<br>
+			&nbsp;<input type="reset" value="Formular l&ouml;schen"><br>
+			<input type="hidden" name="to_media" value="${aid}">
+			<br>
+		</td>
+	</tr>
+</table>
+
+</form>
+
+</body>
+</html>
diff --git a/templates-dist/en/open/comment.template.en b/templates-dist/en/open/comment.template.en
index 31dbc140..99eae4e9 100755
--- a/templates-dist/en/open/comment.template.en
+++ b/templates-dist/en/open/comment.template.en
@@ -20,7 +20,7 @@ Please keep it on topic and concise.
 <br><br> * = required field
 <p>
 
-<form action="${openAction}" method=post>
+<form action="${config.openAction}" method=post>
 <input type="hidden" name="do" value="inscomment">
 <blockquote>
 	<table border=1 cellspacing=0 width="100%">
@@ -84,4 +84,4 @@ the language of the submission<BR></font>
 </td>
 </tr></table>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/templates-dist/en/open/comment_done.template b/templates-dist/en/open/comment_done.template
index 1dfc6ed3..fc0a7a14 100755
--- a/templates-dist/en/open/comment_done.template
+++ b/templates-dist/en/open/comment_done.template
@@ -10,9 +10,9 @@
 <table width="100%" border="0" cellspacing="0" cellpadding="10">
 	<tr>
 		<td valign="top" align="center" bgcolor="#663399">
-			<font color="White"><b>Dein Kommentar ist jetzt auf dem Weg zur WebSite!</b></font
+			<font color="White"><b>Your comment is on the way to the Website!</b></font
 		</td>
-	</tr> 
+	</tr>
 	<tr>
 		<td bgcolor="003300">
 			<font color="White">
diff --git a/templates-dist/en/open/minimal_posting.template b/templates-dist/en/open/minimal_posting.template
index fd798d4c..3e3333ca 100755
--- a/templates-dist/en/open/minimal_posting.template
+++ b/templates-dist/en/open/minimal_posting.template
@@ -28,8 +28,8 @@ maxlength="45" value="">
 <!-- set topic to selected -->
 Topic: 
 <select name="to_topic" size="3" multiple> 
-  <list themenPopupData as t>
-     <option value="${t.key}" 
+  <list data.themenPopupData as t>
+     <option value="${t.key}"
          <list to_topic as to>
             <if (t.key == to)>selected</if>
 	 </list>
@@ -44,7 +44,7 @@ Summary:  <textarea name="description" rows="6" cols="45" wrap=virtual></textare
 Your Email: <input type="text" name="creator_email" size="45"
 maxlength="80" value="">
 <p>
-Your Web Address: 
+Your Web Address:
 <input type="text" name="creator_main_url" size="45" maxlength="160" value="http://">
 <p>
 Address: <input type="text" name="creator_address" size="45" maxlength="160" value="">
@@ -52,9 +52,9 @@ Address: <input type="text" name="creator_address" size="45" maxlength="160" val
 Phone #: <input type="text" name="creator_phone" size="20" maxlength="20" value="">
 <p>
 <!-- generate list of known languages -->
-Language: 
+Language:
 <select name="to_language">
-  <list languagePopUpData as l>
+  <list data.languagePopUpData as l>
     <option value="${l.key}">${l.value}</option>
   </list>
 </select>
@@ -65,8 +65,8 @@ Your Article:
 <!-- generate N fields for uploading files -->
 <!-- where N is medianum -->
 Media Uploads:
-<list mediafields as m>
-    File ${m} 
+<list data.mediafields as m>
+    File ${m}
     <INPUT TYPE="file" NAME="media${m}">
     <br>
      Title ${m}: <input type="text" name="media_title${m}" size="40" maxlength="80" value="">
@@ -74,4 +74,4 @@ Media Uploads:
 <p>
 <input type="submit" value="Post"><br>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/templates-dist/en/open/posting.template b/templates-dist/en/open/posting.template
index 17f7b2b3..09ba18f5 100755
--- a/templates-dist/en/open/posting.template
+++ b/templates-dist/en/open/posting.template
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//DE">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//DE">
 <html>
 <head>
 	<title>indymedia.de | open posting</title>
@@ -9,197 +9,197 @@
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8559-1">
 	<meta name="robots" content="index">
 	<meta name="robots" content="follow">
-	<link rel=stylesheet type="text/css" href="${productionHost}/style/formate.css">
-</head>
-
-<body bgcolor="White" text="Black" link="white" vlink="white" alink="Red">
-
-
-<table width="99%" border="0" cellspacing="0" cellpadding="8" bgcolor="silver">
-	<tr>
-		<td align="center" bgcolor="#663399" colspan="3">
-			<font face="Helvetica, Arial"><a href="#form">Jump dirctly to the form.</a></font>
-		<br>
-		</td>
-	</tr>
-	<tr>
-		<td align="center" colspan="3">
-			<br>
-			<font size="+2" face="Helvetica, Arial">Publish your article !</font><br><br>
-		</td>
-	</tr>
-	<tr>
-		<td colspan="3" bgcolor="white">
-			<h3>Short introduction to open-posting in germany.indymedia</h3>
-
-			<p><b>Short text about IMC and the idea of open-publishing</b> too lazy to translate all of this ;-) ----Das Independent Media Center ist ein kollektiv gef&uuml;hrtes Mediennetzwerk zur Produktion von radikalen, passionierten und durchaus auch subjektiven,  pers&ouml;nlichen Stellungnahmen verschiedenster Menschen 'auf der Strasse', z.B. vor, w&auml;hrend oder nach Kampagnen,  polit. Ereignissen oder aus der allt&auml;glichen Lebenswelt.  Wir arbeiten aus Liebe und aus Respekt gegen&uuml;ber Menschen, die sich f&uuml;r eine bessere, lebenswertere Welt engagieren, und deren Arbeit von den Medienkonzernen nicht oder nur verzerrt dargestellt wird.</p>
-
-			<p>Indymedia ist ein demokratischer Nachrichtenkanal. Wir <b>wollen</b> Beitr&auml;ge, Artikel, Meinungen und Infos aus der ganzen Welt ver&ouml;ffentlichen. Alle Beitr&auml;ge werden sofort unzensiert ver&ouml;ffentlicht, sofern sie nicht in die im <b>Mission Statement</b> genannten Kategorien fallen. Allerdings erscheinen sie dann nicht gleich auf der Startseite, sondern auf einer eigenen Open-Posting-Seite. Dort werden sie von wechselnden Moderationsteams gegengelesen und
-			anschliessend auf den newswire der Starttseite weitergeleitet.<br>
-			Um diesen Ausschlussprozess so transparent wie m&ouml;glich zu gestalten, k&ouml;nnen alle nicht ver&ouml;ffentlichten Beitr&auml;ge  per e-mail angefordert weren.</p>
-
-			<p>Bitte benutze dieses Formular nur, um <b>neue</b> Beitr&auml;ge und Ideen beizusteuern. Kommentare geh&ouml;ren zu dem jeweils diskutierten Beitrag. Wenn Du etwas zu einem Beitrag zu sagen hast, dann benutze daf&uuml;r bitte die <b>Kommentar-Funktion</b> am Ende jedes Beitrags.</p>
-
-			<p>Unser Auffassung nach sollten Beitr&auml;ge, die an diese Site geschickt werden, frei zur nicht-kommerziellen Wiederverwertung sein. Wenn Du nicht m&ouml;chtest, dass das f&uuml;r Deinen Beitrag zutrifft, dann nenne Deine Konditionen in der Zusammenfassung.</p>
-
-			<p>Du kannst dieses Formular benutzen, um Deinen Artikel, Deinen Audio-Beitrag, Deinen Video-Beitrag oder Deine Fotos zu ver&ouml;ffentlichen. Bitte beschr&auml;nke Dich auf  Beitr&auml;ge zu politischem oder sozialem Aktivismus. Wir (die Menschen, die diese Site organisieren) behalten uns vor, die Pr&auml;sentation der zugeschickten Beitr&auml;ge zu ver&auml;ndern. Weitere Informationen findest Du im <b>Mission Statement</b>.</p>
-
-			<p>Nach dem Beitr&auml;ge ver&ouml;ffentlicht wurden, k&ouml;nnen sie vom Kollektiv, das diese Site betreut, editiert, verlinkt oder sogar gel&ouml;scht werden.</p>
-			<br>
-
-			<p><b>Zur Erinnerung:</b><p>
-
-			<ul>
-				<li>Bitte schicke <b>nur News-Artikel</b> und benutze zum Kommentieren von Artikeln das <b>Kommentierformular</b>, das Du unter jedem Artikel findest.
-				<li>Bitte schicke <b>nur eine Kopie</b> Deines Artikels - Bitte dr&uuml;cke den Verschicken-Knopf nur einmal</b>.
-        <li><b>Ver&ouml;ffentliche nur selbst erstellte Beitr&auml;ge. (Keine Agenturmeldungen, Zeitungsartikel oder &auml;hnliches!)</b>.
-			</ul>
-		</td>
-	</tr>
-<form action="${openAction}?do=addposting" method="post">
-	<tr>
-		<td>Number of Media Items</td>
-		<td colspan="2"><input type="text" name="medianum" value="${medianum}">&nbsp;<input type="submit">
-	</tr>
-</form>
-
-<a name="form"></a>
-<form enctype="multipart/form-data" action="${openAction}?do=insposting" method="post">
-
-	<tr>
-		<td bgcolor="#663399" colspan="3">
-			<center><font size="+2" face="Helvetica, Arial" color="white"><b>Publishing Form</b></font></center>
-		</td>
-	</tr>
-	<tr>
- 		<td valign="top">
-			 <b>titel</b> of your article:
-		</td>
-		<td colspan="2" bgcolor="#003300">
-			<input type="text" name="title" size="45" maxlength="45" value=""> <font size="-1" color="white"><br>(has to be filled out)</font>
-		</td>
-	</tr>
-	<tr>
- 		<td valign="top">
-			<b>author</b> of this article:
-		</td>
-		<td colspan="2" bgcolor="#003300">
-			<input type="text" name="creator" size="45" maxlength="45"> <font size="-1" color="white"><br>(has to be filled out)</font>
-		</td>
-	</tr>
-	<tr>
- 		<td valign="top">
-			A short <b>abstract</b> of your article:</b>
-		</td>
-		<td colspan="2" bgcolor="#003300">
-			<textarea name="description" rows="6" cols="45" wrap=virtual></textarea>
-			<font size="-1" color="white"><br>(not more than <b>5 lines</b>)</font>
-		</td>
-	</tr>
-	<tr>
-		<td colspan="3">
-		<font face="Helvetica, Arial" size=-1 color="#663399">
-		Contact information is optional but enables other people to get in touch with you.
-    	</font>
-		</td>
-	</tr>
-
-	<tr>
- 		<td>
-			your eMail-Adress:
-		</td>
-		<td colspan="2">
-			<input type="text" name="creator_email" size="45" maxlength="80" value=""> <font size="-1">(<i>optional</i>)</font>
-		</td>
-	</tr>
-	<tr>
- 		<td>
-			your Web Adress:
-		</td>
-		<td colspan="2">
-		<input type="text" name="creator_main_url" size="45" maxlength="160" value="http://">
-		 <font size="-1">(<i>optional</i>)</font>
-		</td>
-	</tr>
-	<tr>
- 		<td>
-			your Adress:
-		</td>
-		<td colspan="2">
-			<input type="text" name="creator_address" size="45" maxlength="160" value=""> <font size="-1"> <i>(optional)</i></font>
-		</td>
-	</tr>
-	<tr>
- 		<td>
-			your Telefon-Nr.:
-		</td>
-		<td colspan="2">
-			<input type="text" name="creator_phone" size="20" maxlength="20" value=""> <font size="-1">(<i>optional</i>)</font>
-		</td>
-	</tr>
-	<tr>
- 		<td>
-			language of your article:
-		</td>
-		<td colspan="2">
-			<select name="to_language">
-				<list languagePopUpData as l>
-				<option value="${l.key}">${l.value}</option>	
-				</list>
-			</select>
-			<font size="-1"><i>(optional)</i></font>
-		</td>
-	</tr>
-	<tr>
-		<td valign="top">
-			your <b>article</b>:<br>
-			fill in the text of your article here
-		</td>
-		<td bgcolor="#003300" colspan="2">
-			&nbsp; <textarea name="content_data" rows="20" cols="45" wrap="soft"></textarea>
-			<br><br>
-		</td>
-	</tr>
-	
-	<tr>
- 		<td>
-			media:
-		</td>
-		<td colspan="2">
-			upload media-files (so far only jpg|gif|mp3|avi|qt|mpeg)<br>
-		</td>
-	</tr>
-<list mediafields as m>
-	<tr>	
-		<td>Media Item ${m}</td>
-		<td colspan="2"> 	
-			<INPUT TYPE="file" NAME="media${m}"> <font size="-1">(<i>optional</i>)</font>
-		</td>
-	</tr>
-	<tr>
- 		<td>
-			media sub-title ${m}:
-		</td>
-		<td colspan="2">
-			<input type="text" name="media_title${m}" size="40" maxlength="80" value=""> <font size="-1">(<i>optional</i>)</font>
-		</td>
-	</tr>
-</list>	
-	
-	<tr>
-		<td><b		</td>
-		<td bgcolor="#663399" valign="top" align="center"><br>
-	&nbsp;<input type="submit" value="Submit (patience is a virtue!!)"><br>
-
-		</td>
-		<td bgcolor="#003300" valign="top" ge-aln="center">
-			<br>
-			&nbsp;<input type="reset" value="Form Reset"><br>
-		</td>
-	</tr>
-</table>
-
-
-
-</body>
-</html>
+	<link rel=stylesheet type="text/css" href="${config.productionHost}/style/formate.css">
+</head>
+
+<body bgcolor="White" text="Black" link="white" vlink="white" alink="Red">
+
+
+<table width="99%" border="0" cellspacing="0" cellpadding="8" bgcolor="silver">
+	<tr>
+		<td align="center" bgcolor="#663399" colspan="3">
+			<font face="Helvetica, Arial"><a href="#form">Jump dirctly to the form.</a></font>
+		<br>
+		</td>
+	</tr>
+	<tr>
+		<td align="center" colspan="3">
+			<br>
+			<font size="+2" face="Helvetica, Arial">Publish your article !</font><br><br>
+		</td>
+	</tr>
+	<tr>
+		<td colspan="3" bgcolor="white">
+			<h3>Short introduction to open-posting in germany.indymedia</h3>
+
+			<p><b>Short text about IMC and the idea of open-publishing</b> too lazy to translate all of this ;-) ----Das Independent Media Center ist ein kollektiv gef&uuml;hrtes Mediennetzwerk zur Produktion von radikalen, passionierten und durchaus auch subjektiven,  pers&ouml;nlichen Stellungnahmen verschiedenster Menschen 'auf der Strasse', z.B. vor, w&auml;hrend oder nach Kampagnen,  polit. Ereignissen oder aus der allt&auml;glichen Lebenswelt.  Wir arbeiten aus Liebe und aus Respekt gegen&uuml;ber Menschen, die sich f&uuml;r eine bessere, lebenswertere Welt engagieren, und deren Arbeit von den Medienkonzernen nicht oder nur verzerrt dargestellt wird.</p>
+
+			<p>Indymedia ist ein demokratischer Nachrichtenkanal. Wir <b>wollen</b> Beitr&auml;ge, Artikel, Meinungen und Infos aus der ganzen Welt ver&ouml;ffentlichen. Alle Beitr&auml;ge werden sofort unzensiert ver&ouml;ffentlicht, sofern sie nicht in die im <b>Mission Statement</b> genannten Kategorien fallen. Allerdings erscheinen sie dann nicht gleich auf der Startseite, sondern auf einer eigenen Open-Posting-Seite. Dort werden sie von wechselnden Moderationsteams gegengelesen und
+			anschliessend auf den newswire der Starttseite weitergeleitet.<br>
+			Um diesen Ausschlussprozess so transparent wie m&ouml;glich zu gestalten, k&ouml;nnen alle nicht ver&ouml;ffentlichten Beitr&auml;ge  per e-mail angefordert weren.</p>
+
+			<p>Bitte benutze dieses Formular nur, um <b>neue</b> Beitr&auml;ge und Ideen beizusteuern. Kommentare geh&ouml;ren zu dem jeweils diskutierten Beitrag. Wenn Du etwas zu einem Beitrag zu sagen hast, dann benutze daf&uuml;r bitte die <b>Kommentar-Funktion</b> am Ende jedes Beitrags.</p>
+
+			<p>Unser Auffassung nach sollten Beitr&auml;ge, die an diese Site geschickt werden, frei zur nicht-kommerziellen Wiederverwertung sein. Wenn Du nicht m&ouml;chtest, dass das f&uuml;r Deinen Beitrag zutrifft, dann nenne Deine Konditionen in der Zusammenfassung.</p>
+
+			<p>Du kannst dieses Formular benutzen, um Deinen Artikel, Deinen Audio-Beitrag, Deinen Video-Beitrag oder Deine Fotos zu ver&ouml;ffentlichen. Bitte beschr&auml;nke Dich auf  Beitr&auml;ge zu politischem oder sozialem Aktivismus. Wir (die Menschen, die diese Site organisieren) behalten uns vor, die Pr&auml;sentation der zugeschickten Beitr&auml;ge zu ver&auml;ndern. Weitere Informationen findest Du im <b>Mission Statement</b>.</p>
+
+			<p>Nach dem Beitr&auml;ge ver&ouml;ffentlicht wurden, k&ouml;nnen sie vom Kollektiv, das diese Site betreut, editiert, verlinkt oder sogar gel&ouml;scht werden.</p>
+			<br>
+
+			<p><b>Zur Erinnerung:</b><p>
+
+			<ul>
+				<li>Bitte schicke <b>nur News-Artikel</b> und benutze zum Kommentieren von Artikeln das <b>Kommentierformular</b>, das Du unter jedem Artikel findest.
+				<li>Bitte schicke <b>nur eine Kopie</b> Deines Artikels - Bitte dr&uuml;cke den Verschicken-Knopf nur einmal</b>.
+        <li><b>Ver&ouml;ffentliche nur selbst erstellte Beitr&auml;ge. (Keine Agenturmeldungen, Zeitungsartikel oder &auml;hnliches!)</b>.
+			</ul>
+		</td>
+	</tr>
+<form action="${config.openAction}?do=addposting" method="post">
+	<tr>
+		<td>Number of Media Items</td>
+		<td colspan="2"><input type="text" name="medianum" value="${medianum}">&nbsp;<input type="submit">
+	</tr>
+</form>
+
+<a name="form"></a>
+<form enctype="multipart/form-data" action="${config.openAction}?do=insposting" method="post">
+
+	<tr>
+		<td bgcolor="#663399" colspan="3">
+			<center><font size="+2" face="Helvetica, Arial" color="white"><b>Publishing Form</b></font></center>
+		</td>
+	</tr>
+	<tr>
+ 		<td valign="top">
+			 <b>titel</b> of your article:
+		</td>
+		<td colspan="2" bgcolor="#003300">
+			<input type="text" name="title" size="45" maxlength="45" value=""> <font size="-1" color="white"><br>(has to be filled out)</font>
+		</td>
+	</tr>
+	<tr>
+ 		<td valign="top">
+			<b>author</b> of this article:
+		</td>
+		<td colspan="2" bgcolor="#003300">
+			<input type="text" name="creator" size="45" maxlength="45"> <font size="-1" color="white"><br>(has to be filled out)</font>
+		</td>
+	</tr>
+	<tr>
+ 		<td valign="top">
+			A short <b>abstract</b> of your article:</b>
+		</td>
+		<td colspan="2" bgcolor="#003300">
+			<textarea name="description" rows="6" cols="45" wrap=virtual></textarea>
+			<font size="-1" color="white"><br>(not more than <b>5 lines</b>)</font>
+		</td>
+	</tr>
+	<tr>
+		<td colspan="3">
+		<font face="Helvetica, Arial" size=-1 color="#663399">
+		Contact information is optional but enables other people to get in touch with you.
+    	</font>
+		</td>
+	</tr>
+
+	<tr>
+ 		<td>
+			your eMail-Adress:
+		</td>
+		<td colspan="2">
+			<input type="text" name="creator_email" size="45" maxlength="80" value=""> <font size="-1">(<i>optional</i>)</font>
+		</td>
+	</tr>
+	<tr>
+ 		<td>
+			your Web Adress:
+		</td>
+		<td colspan="2">
+		<input type="text" name="creator_main_url" size="45" maxlength="160" value="http://">
+		 <font size="-1">(<i>optional</i>)</font>
+		</td>
+	</tr>
+	<tr>
+ 		<td>
+			your Adress:
+		</td>
+		<td colspan="2">
+			<input type="text" name="creator_address" size="45" maxlength="160" value=""> <font size="-1"> <i>(optional)</i></font>
+		</td>
+	</tr>
+	<tr>
+ 		<td>
+			your Telefon-Nr.:
+		</td>
+		<td colspan="2">
+			<input type="text" name="creator_phone" size="20" maxlength="20" value=""> <font size="-1">(<i>optional</i>)</font>
+		</td>
+	</tr>
+	<tr>
+ 		<td>
+			language of your article:
+		</td>
+		<td colspan="2">
+			<select name="to_language">
+				<list languagePopUpData as l>
+				<option value="${l.key}">${l.value}</option>
+				</list>
+			</select>
+			<font size="-1"><i>(optional)</i></font>
+		</td>
+	</tr>
+	<tr>
+		<td valign="top">
+			your <b>article</b>:<br>
+			fill in the text of your article here
+		</td>
+		<td bgcolor="#003300" colspan="2">
+			&nbsp; <textarea name="content_data" rows="20" cols="45" wrap="soft"></textarea>
+			<br><br>
+		</td>
+	</tr>
+
+	<tr>
+ 		<td>
+			media:
+		</td>
+		<td colspan="2">
+			upload media-files (so far only jpg|gif|mp3|avi|qt|mpeg)<br>
+		</td>
+	</tr>
+<list mediafields as m>
+	<tr>
+		<td>Media Item ${m}</td>
+		<td colspan="2">
+			<INPUT TYPE="file" NAME="media${m}"> <font size="-1">(<i>optional</i>)</font>
+		</td>
+	</tr>
+	<tr>
+ 		<td>
+			media sub-title ${m}:
+		</td>
+		<td colspan="2">
+			<input type="text" name="media_title${m}" size="40" maxlength="80" value=""> <font size="-1">(<i>optional</i>)</font>
+		</td>
+	</tr>
+</list>
+
+	<tr>
+		<td><b		</td>
+		<td bgcolor="#663399" valign="top" align="center"><br>
+	&nbsp;<input type="submit" value="Submit (patience is a virtue!!)"><br>
+
+		</td>
+		<td bgcolor="#003300" valign="top" ge-aln="center">
+			<br>
+			&nbsp;<input type="reset" value="Form Reset"><br>
+		</td>
+	</tr>
+</table>
+
+
+
+</body>
+</html>
diff --git a/templates-dist/en/schwerpunkt.template b/templates-dist/en/schwerpunkt.template
index 3a444bc7..1d3e1826 100755
--- a/templates-dist/en/schwerpunkt.template
+++ b/templates-dist/en/schwerpunkt.template
@@ -1,65 +1,65 @@
-<html>
-<head>
-<title>
-indymedia.de | feature
-</title>
-<head>
-
-<body bgcolor="#FFFFFF">
-<include "head.template">
-
-<table border="0">
-  <form method="post" action="${actionRoot}">
-    <input type="hidden" name="module" value="Schwerpunkt">
-    <input type="hidden" name="where" value="${where}">
-    <input type="hidden" name="offset" value="${offset}">
-    <input type="hidden" name="order" value="${order}">
-    <if new>
-    <input type="hidden" name="do" value="insert">
-    <else>
-    <input type="hidden" name="do" value="update">
-    </if>
-    <input type="hidden" name="id" value="${id}">
-    <tr>
-      <td align="right" valign="top" bgcolor="#006600"><font color="#ffffff"><B>title:</B></font></td>
-      <td>
-        <input type="text" size="40" name="title" value="${title}">
-        <select name="is_published">
-			<option value="1"<if is_published!="0">selected</if>>published</option>
-			<option value="0" <if is_published=="0">selected</if>>not published.</option>
-        </select>
-      </td>
-    </tr>
-
-    <tr>
-      <td align="right" valign="top" bgcolor="#006600"><font color="#ffffff"><B>Filename:</B></font></td>
-      <td>
-         <input type="text" size="20" name="filename" value="${filename}">
-      </td>
-    </tr>
-
-    <tr>
-      <td align="right" valign="top" bgcolor="#006600"><font color="#ffffff"><B>description:</B></font></td>
-      <td>
-        <textarea cols="40" rows="3" name="description">${description}</textarea>
-      </td>
-    </tr>
-
-    <tr>
-      <td align="right" valign="top" bgcolor="#006600"><font color="#ffffff"><B>Link:</B></font></td>
-      <td>
-        <input type="text" size="40" name="main_url" value="${main_url}">
-      </td>
-    </tr>
-    <tr>
-      <td colspan="2" align="right" valign="top" bgcolor="#ffffff"> <font color="#ffffff"><if new>
-        <input type="submit" name="save" value="insert">
-        <else>
-        <input type="submit" name="save" value="save">
-        </if></font></td>
-    </tr>
-  </form>
-</table>
-<include "foot.template">
-</body>
-</html>
+<html>
+<head>
+<title>
+indymedia.de | feature
+</title>
+<head>
+
+<body bgcolor="#FFFFFF">
+<include "head.template">
+
+<table border="0">
+  <form method="post" action="${config.actionRoot}">
+    <input type="hidden" name="module" value="Schwerpunkt">
+    <input type="hidden" name="where" value="${data.where}">
+    <input type="hidden" name="offset" value="${data.offset}">
+    <input type="hidden" name="order" value="${data.order}">
+    <if new>
+    <input type="hidden" name="do" value="insert">
+    <else>
+    <input type="hidden" name="do" value="update">
+    </if>
+    <input type="hidden" name="id" value="${data.id}">
+    <tr>
+      <td align="right" valign="top" bgcolor="#006600"><font color="#ffffff"><B>title:</B></font></td>
+      <td>
+        <input type="text" size="40" name="title" value="${data.title}">
+        <select name="data.is_published">
+			<option value="1"<if data.is_published!="0">selected</if>>published</option>
+			<option value="0" <if data.is_published=="0">selected</if>>not published.</option>
+        </select>
+      </td>
+    </tr>
+
+    <tr>
+      <td align="right" valign="top" bgcolor="#006600"><font color="#ffffff"><B>Filename:</B></font></td>
+      <td>
+         <input type="text" size="20" name="filename" value="${data.filename}">
+      </td>
+    </tr>
+
+    <tr>
+      <td align="right" valign="top" bgcolor="#006600"><font color="#ffffff"><B>description:</B></font></td>
+      <td>
+        <textarea cols="40" rows="3" name="description">${data.description}</textarea>
+      </td>
+    </tr>
+
+    <tr>
+      <td align="right" valign="top" bgcolor="#006600"><font color="#ffffff"><B>Link:</B></font></td>
+      <td>
+        <input type="text" size="40" name="main_url" value="${data.main_url}">
+      </td>
+    </tr>
+    <tr>
+      <td colspan="2" align="right" valign="top" bgcolor="#ffffff"> <font color="#ffffff"><if new>
+        <input type="submit" name="save" value="insert">
+        <else>
+        <input type="submit" name="save" value="save">
+        </if></font></td>
+    </tr>
+  </form>
+</table>
+<include "foot.template">
+</body>
+</html>
diff --git a/templates-dist/en/schwerpunktlist.template b/templates-dist/en/schwerpunktlist.template
index c3b58125..ad7b79c0 100755
--- a/templates-dist/en/schwerpunktlist.template
+++ b/templates-dist/en/schwerpunktlist.template
@@ -1,64 +1,56 @@
-<html>
-<head>
-	<title>indymedia.de | featurelist</title>
-</head>
-
-<body bgcolor="#FFFFFF">
-<include "head.template">
-
-
-<if contentlist>
-<table border="0">
-  <tr bgcolor="#006600">
-    <td><font color="#ffffff">publish</font></td>
-    <td><font color="#ffffff">title</font></td>
-   <td><font color="#ffffff">Filename</font></td>
-    <td><font color="#ffffff">Link</font></td>
-    <td><font color="#ffffff">abstract</font></td>
-  </tr>
-  <list contentlist as entry>
-  <tr
-  <if grey=="1"><assign grey="0">bgcolor="#dddddd" <else><assign grey="1"> </if>
-  >
-  <td align="center"><if entry.is_published!="0">X<else>&nbsp;</if></td>
-  <td>${entry.title}&nbsp;</td>
-  <td>${entry.filename}&nbsp;</td>
-  <td>${entry.main_url}&nbsp;</td>
-  <td>${entry.description}&nbsp;</td>
-  <td><font size="1"> <a href="${actionRoot}?module=Schwerpunkt&do=delete&id=${entry.id}">delete</a> | <a href="${actionRoot}?module=Schwerpunkt&do=edit&id=${entry.id}">edit</a></font></td>
-  </tr>
-  </list>
-
-  <tr>
-    <td align="center" colspan="5" bgcolor="#006600">
-      <div align="left"><font color="#ffffff">${count} entries / showing
-        from ${from} to ${to}</font></div>
-    </td>
-    <td><a href="${docRoot}"><font size="1">&nbsp;back</font></a></td>
-  </tr>
-</table>
-
-      <P>
-<if (prev || next)>
- <form method="post" action="${actionRoot}">
- <input type="hidden" name="module" value="Schwerpunkt">
- <input type="hidden" name="where" value="${where}">
-<if prev>
- <input type="hidden" name="prevoffset" value="${prev}">
- <input type="submit" name="prev" value="back">
-</if>
-<if next>
- <input type="hidden" name="nextoffset" value="${next}">
- <input type="submit" name="next" value="next">
-</if>
- </form>
-</if>
-
-
-<else>
-
-  <P align="center"> Found no matching entries!</p>
-
+<html>
+<head>
+	<title>indymedia.de | featurelist</title>
+</head>
+
+<body bgcolor="#FFFFFF">
+<include "head.template">
+
+
+<if contentlist>
+<table border="0">
+  <tr bgcolor="#006600">
+    <td><font color="#ffffff">publish</font></td>
+    <td><font color="#ffffff">title</font></td>
+   <td><font color="#ffffff">Filename</font></td>
+    <td><font color="#ffffff">Link</font></td>
+    <td><font color="#ffffff">abstract</font></td>
+  </tr>
+  <list contentlist as entry>
+  <tr
+  <if grey=="1"><assign grey="0">bgcolor="#dddddd" <else><assign grey="1"> </if>
+  >
+  <td align="center"><if entry.is_published!="0">X<else>&nbsp;</if></td>
+  <td>${entry.title}&nbsp;</td>
+  <td>${entry.filename}&nbsp;</td>
+  <td>${entry.main_url}&nbsp;</td>
+  <td>${entry.description}&nbsp;</td>
+  <td><font size="1"> <a href="${config.actionRoot}?module=Schwerpunkt&do=delete&id=${entry.id}">delete</a> | <a href="${actionRoot}?module=Schwerpunkt&do=edit&id=${entry.id}">edit</a></font></td>
+  </tr>
+  </list>
+
+  <tr>
+    <td align="center" colspan="5" bgcolor="#006600">
+      <div align="left"><font color="#ffffff">${count} entries / showing
+        from ${from} to ${to}</font></div>
+    </td>
+    <td><a href="${docRoot}"><font size="1">&nbsp;back</font></a></td>
+  </tr>
+</table>
+
+<if prev>
+	<a href="${config.actionRoot}?module=Schwerpunkt&do=list&where=${where}&prevoffset=${prev}&prev=zur&uuml;ck">zurueck</a>&nbsp;
+</if>
+<if next>
+<a href="${config.actionRoot}?module=Schwerpunkt&do=list&where=${where}&nextoffset=${next}&next=weiter">weiter</a>
+</if>
+
+
+
+<else>
+
+  <P align="center"> Found no matching entries!</p>
+
 </if>
 
 <include "foot.template">
diff --git a/templates-dist/en/start_admin.template b/templates-dist/en/start_admin.template
index e62f5396..2da88fcb 100755
--- a/templates-dist/en/start_admin.template
+++ b/templates-dist/en/start_admin.template
@@ -1,233 +1,234 @@
-<html>
-  <head>
-    <title>indymedia.de | admin</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-  </head>
-
-<body bgcolor="#FFFFFF" link="#666666" vlink="#990000" alink="#990000">
-	<include "head_nonavi.template">
-  <table border="0" width="100%">
-	<tr>
-		<td valign="top" width="40%" bgcolor="c0c0c0">
-
-
-		<font face="Verdana, Arial, Helvetica, sans-serif" size="2" color="#663399">
-		<b>OPENPOSTINGS</b></font>
-
-	 <p>
-	 	<a href="${actionRoot}?module=Content&do=listop&order=webdb_create+desc">
-		<img src="${docRoot}/img/pointgris.gif" border=0>edit</a>
-
-		<p>
-			<font face="Verdana, Arial, Helvetica, sans-serif" size="2" color="#663399">
-			<b>COMMENTS</b></font>
-		<p>
-			<a href="${actionRoot}?module=Comment&do=list">
-			<img src="${docRoot}/img/pointgris.gif" border=0>edit</a>
-	    <p>
-			<font face="Verdana, Arial, Helvetica, sans-serif" size="2" color="#663399">
-			<b>BREAKING NEWS</b></font>
-		<p>
-			<img src="${docRoot}/img/pointgris.gif" border=0>
-			<a href="${actionRoot}?module=Breaking&do=list">edit</a>
-	    	<img src="${docRoot}/img/pointgris.gif" border=0>
-			<a href="${actionRoot}?module=Breaking&do=add">add news</a>
-
-			<table width="100%" border="0">
-		<tr><td bgcolor="white">&nbsp;</td></tr>
-		</table>
-
-	    <font face="Verdana, Arial, Helvetica, sans-serif" size="2" color="#663399">
-			<b>ARTICLES</b></font>
-
-  		<p>
-			<img src="${docRoot}/img/pointgris.gif" border=0>
-			<a href="${actionRoot}?module=Content&do=add&where=aktuell">new article</a>
-	    <p>
-			<b>show:</b><br>
-			<img src="${docRoot}/img/pointgris.gif" border=0>
-	  		<a href="${actionRoot}?module=Content&do=list&where=newswire">newswire</a><br>
-			<img src="${docRoot}/img/pointgris.gif" border=0>
-	  		<a href="${actionRoot}?module=Content&do=list&where=feature">feature</a><br>
-			<img src="${docRoot}/img/pointgris.gif" border=0>
-	  		<a href="${actionRoot}?module=Content&do=list&where=themenspecial">topic-specials</a><br>
-			<img src="${docRoot}/img/pointgris.gif" border=0>
-	  		<a href="${actionRoot}?module=Content&do=list&where=special">startpage-specials</a><br>
-			<br>
-	    	<img src="${docRoot}/img/pointgris.gif" border=0>
-			<a href="${actionRoot}?module=Content&do=list&where=nfrei" >not (yet)published articles</a><br>
-			<img src="${docRoot}/img/pointgris.gif" border=0>
-			<a href="${actionRoot}?module=Content&do=list&where=media">with  media</a><br>
-			<img src="${docRoot}/img/pointgris.gif" border=0>
-			<a href="${actionRoot}?module=Content&do=list&where=lastchange">latest changes</a><br>
-			<img src="${docRoot}/img/pointgris.gif" border=0>
-			<a href="${actionRoot}?module=Content&do=list&where=comments">with internal comments</a><br>
-
-
-     <form action="${actionRoot}" method="post">
-	     <input type="hidden" name="module" value="Content">
-       <input type="hidden" name="do" value="search">
-       <input type="hidden" name="order" value="date desc">
-		    search: <font size="-1">
-       <input type="text" name="fieldvalue" size="15">
-       <select name="field">
-       	<option value="title">title</option>
-        <option value="creator">author</option>
-        <option value="place">place</option>
-        <option value="description">abstract</option>
-				<option value="comment">Int. comment</option>
-        <option value="content_data">content</option>
-       </select></font>
-      </form>
-
-		<table width="100%" border="0">
-		<tr><td bgcolor="white">&nbsp;</td></tr>
-		</table>
-
-
-			<font  face="Verdana, Arial, Helvetica, sans-serif" size="2" color="#663399">
-			<b>GENERATE MANUALLY</b></font>
-
-			<div align="left">
-				<br>
-				all areas:
-				<br>
-		 		<img src="${docRoot}/img/pointgris.gif" border=0>
-		 		<a href="${actionRoot}?module=Producer&task=All">all new (standard, update to www > 5min.)</a> &nbsp;|&nbsp;
-        <!--
-	<br>
-        <a href="${actionRoot}?module=Producer&task=All&forced=1">alles (!)(forced, update auf www > 5min.)</a>
-        &nbsp;|&nbsp;
-        <br>
-        <a href="${actionRoot}?module=Producer&task=All&forced=1&sync=1">alles (!)(www sofort, nur im Notfall)</a>
-        &nbsp;|&nbsp;
-        <br>
-	-->
-		 		<br>specific parts of the site:
-		 		<br>
-     			<img src="${docRoot}/img/pointgris.gif" border=0>
-		 		<a href="${actionRoot}?module=Producer&task=StartPage">new startpage</a>
-				&nbsp;|&nbsp;
-		 		<a href="${actionRoot}?module=Producer&task=StartPage&forced=1">all (forced)</a>
-		 		&nbsp;|&nbsp;
-		 		<a href="${actionRoot}?module=Producer&task=StartPage&forced=1&sync=1">all (forced + sync)</a>
-		 		<br>
-				<img src="${docRoot}/img/pointgris.gif" border=0>
-     			<a href="${actionRoot}?module=Producer&task=Content">new content</a>
-				&nbsp;|&nbsp;
-				<a href="${actionRoot}?module=Producer&task=Content&forced=1">all (forced)</a>
-		 		<br>
-      			<img src="${docRoot}/img/pointgris.gif" border=0>
-				<a href="${actionRoot}?module=Producer&task=Topics">new topic-pages</a>
-				&nbsp;|&nbsp;
-		 		<a href="${actionRoot}?module=Producer&task=Topics&forced=1">all (forced)</a>
-				<br>
-				<a href="${actionRoot}?module=Producer&task=OpenPosting">
-		  	<img src="${docRoot}/img/pointgris.gif" border=0>new openpostings</a>
-				&nbsp;|&nbsp;
-		 		<a href="${actionRoot}?module=Producer&task=OpenPosting&forced=1">all (forced)</a>
-				<br>
-				<a href="${actionRoot}?module=Producer&task=Images">
-		  	<img src="${docRoot}/img/pointgris.gif" border=0>new pictures</a>
-				&nbsp;|&nbsp;
-		 		<a href="${actionRoot}?module=Producer&task=Images&forced=1">all (forced)</a>
-
-				<br>
-				<a href="${actionRoot}?module=Producer&task=Wap">
-		  	<img src="${docRoot}/img/pointgris.gif" border=0>new wap</a>
-				&nbsp;|&nbsp;
-		 		<a href="${actionRoot}?module=Producer&task=Wap&forced=1">all (forced)</a>
-				<br>
-        <a href="${actionRoot}?module=Producer&task=Navigation">
-		  	<img src="${docRoot}/img/pointgris.gif" border=0>navigation</a>
-				<br>
-
-
-	</td>
-
-
-			<td bgcolor="white" width="5%">&nbsp;
-			</td>
-			<td valign="top" width="30%" bgcolor="c0c0c0">
-
-  	<font face="Verdana, Arial, Helvetica, sans-serif" size="2" color="#663399">
-		<b>FEATURE</b></font>
-
-		<P>
-			<a href="${actionRoot}?module=Schwerpunkt&do=list" >
-      <img src="${docRoot}/img/pointgris.gif" border=0> edit</a><br>
-      <a href="${actionRoot}?module=Schwerpunkt&do=add" >
-		  <img src="${docRoot}/img/pointgris.gif" border=0> add</a>
-
-    <p>
-			<font face="Verdana, Arial, Helvetica, sans-serif" size="2" color="#663399">
-			<b>TOPICS</b></font>
-
-		<p>
-			<a href="${actionRoot}?module=Topics&do=list">
-      <img src="${docRoot}/img/pointgris.gif" border=0> edit</a><br>
-      <a href="${actionRoot}?module=Topics&do=add" >
-			<img src="${docRoot}/img/pointgris.gif" border=0> add</a>
-
-		<p>
-			<font face="Verdana, Arial, Helvetica, sans-serif" size="2" color="#663399">
-		  <b>PICTURES</b></font>
-
-    <p>
-			<a href="${actionRoot}?module=Images&do=list">
-      <img src="${docRoot}/img/pointgris.gif" border=0> edit</a><br>
-      <a href="${actionRoot}?module=Images&do=add" >
-			<img src="${docRoot}/img/pointgris.gif" border=0> add</a>
-
-		<p>
-			<font face="Verdana, Arial, Helvetica, sans-serif" size="2" color="#663399">
-		  <b>MEDIAFOLDER</b></font>
-
-		<p>
-			<a href="${actionRoot}?module=Mediafolder&do=list">
-      <img src="${docRoot}/img/pointgris.gif" border=0> edit</a><br>
-      <a href="${actionRoot}?module=Mediafolder&do=add" >
-			<img src="${docRoot}/img/pointgris.gif" border=0> add</a>
-
-
-    <p>
-			<font face="Verdana, Arial, Helvetica, sans-serif" size="2" color="#663399">
-		  <b>LANGUAGES</b></font>
-
-		<p>
-			<a href="${actionRoot}?module=Language&do=list">
-      <img src="${docRoot}/img/pointgris.gif" border=0> edit</a><br>
-      <a href="${actionRoot}?module=Language&do=add" >
-			<img src="${docRoot}/img/pointgris.gif" border=0> add</a>
-      </td>
-
-			<td bgcolor="white" width="5%">&nbsp;
-			</td>
-			<td valign="top" width="20%" bgcolor="pink">
-
-	<!-- internal messageboard -->
-
-		<font  face="Verdana, Arial, Helvetica, sans-serif" size="2" color="#663399">
-		<b>Internal Messageboard</b>
-		<font size="-1"><br><a href="${actionRoot}?module=Message&do=add">add</a></font>
-		<if messages>
-			<list messages as m>
-				<p>
-				<if m.title><b>${m.title}</b><br></if>
-				${m.description}<br>
-				<font size="-2">
-				<if m.creator><i>von: ${m.creator}</i> / </if>${m.webdb_create}<br>
-				</font>
-			</list>
-		<else>
-			<p><i>no messages</i>
-		</if></font>
-	</td>
-
- 	</tr>
-	</table>
-
-	<include "foot.template">
-
-	</body>
-</html>
+<html>
+  <head>
+    <title>indymedia.de | admin</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+  </head>
+
+<body bgcolor="#FFFFFF" link="#666666" vlink="#990000" alink="#990000">
+	<include "head_nonavi.template">
+
+  <table border="0" width="100%">
+	<tr>
+		<td valign="top" width="40%" bgcolor="c0c0c0">
+
+
+		<font face="Verdana, Arial, Helvetica, sans-serif" size="2" color="#663399">
+		<b>OPENPOSTINGS</b></font>
+
+	 <p>
+	 	<a href="${config.actionRoot}?module=Content&do=listop&order=webdb_create+desc">
+		<img src="${config.docRoot}/img/pointgris.gif" border=0>edit</a>
+
+		<p>
+			<font face="Verdana, Arial, Helvetica, sans-serif" size="2" color="#663399">
+			<b>COMMENTS</b></font>
+		<p>
+			<a href="${config.actionRoot}?module=Comment&do=list">
+			<img src="${config.docRoot}/img/pointgris.gif" border=0>edit</a>
+	    <p>
+			<font face="Verdana, Arial, Helvetica, sans-serif" size="2" color="#663399">
+			<b>BREAKING NEWS</b></font>
+		<p>
+			<img src="${config.docRoot}/img/pointgris.gif" border=0>
+			<a href="${config.actionRoot}?module=Breaking&do=list">edit</a>
+	    	<img src="${config.docRoot}/img/pointgris.gif" border=0>
+			<a href="${config.actionRoot}?module=Breaking&do=add">add news</a>
+
+			<table width="100%" border="0">
+		<tr><td bgcolor="white">&nbsp;</td></tr>
+		</table>
+
+	    <font face="Verdana, Arial, Helvetica, sans-serif" size="2" color="#663399">
+			<b>ARTICLES</b></font>
+
+  		<p>
+			<img src="${config.docRoot}/img/pointgris.gif" border=0>
+			<a href="${config.actionRoot}?module=Content&do=add&where=aktuell">new article</a>
+	    <p>
+			<b>show:</b><br>
+			<img src="${config.docRoot}/img/pointgris.gif" border=0>
+	  		<a href="${config.actionRoot}?module=Content&do=list&where=newswire">newswire</a><br>
+			<img src="${config.docRoot}/img/pointgris.gif" border=0>
+	  		<a href="${config.actionRoot}?module=Content&do=list&where=feature">feature</a><br>
+			<img src="${config.docRoot}/img/pointgris.gif" border=0>
+	  		<a href="${config.actionRoot}?module=Content&do=list&where=themenspecial">topic-specials</a><br>
+			<img src="${config.docRoot}/img/pointgris.gif" border=0>
+	  		<a href="${config.actionRoot}?module=Content&do=list&where=special">startpage-specials</a><br>
+			<br>
+	    	<img src="${config.docRoot}/img/pointgris.gif" border=0>
+			<a href="${config.actionRoot}?module=Content&do=list&where=nfrei" >not (yet)published articles</a><br>
+			<img src="${config.docRoot}/img/pointgris.gif" border=0>
+			<a href="${config.actionRoot}?module=Content&do=list&where=media">with  media</a><br>
+			<img src="${config.docRoot}/img/pointgris.gif" border=0>
+			<a href="${config.actionRoot}?module=Content&do=list&where=lastchange">latest changes</a><br>
+			<img src="${config.docRoot}/img/pointgris.gif" border=0>
+			<a href="${config.actionRoot}?module=Content&do=list&where=comments">with internal comments</a><br>
+
+
+     <form action="${config.actionRoot}" method="post">
+	     <input type="hidden" name="module" value="Content">
+       <input type="hidden" name="do" value="search">
+       <input type="hidden" name="order" value="date desc">
+		    search: <font size="-1">
+       <input type="text" name="fieldvalue" size="15">
+       <select name="field">
+       	<option value="title">title</option>
+        <option value="creator">author</option>
+        <option value="place">place</option>
+        <option value="description">abstract</option>
+				<option value="comment">Int. comment</option>
+        <option value="content_data">content</option>
+       </select></font>
+      </form>
+
+		<table width="100%" border="0">
+		<tr><td bgcolor="white">&nbsp;</td></tr>
+		</table>
+
+
+			<font  face="Verdana, Arial, Helvetica, sans-serif" size="2" color="#663399">
+			<b>GENERATE MANUALLY</b></font>
+
+			<div align="left">
+				<br>
+				all areas:
+				<br>
+		 		<img src="${config.docRoot}/img/pointgris.gif" border=0>
+		 		<a href="${config.actionRoot}?module=Producer&task=All">all new (standard, update to www > 5min.)</a> &nbsp;|&nbsp;
+        <!--
+	<br>
+        <a href="${config.actionRoot}?module=Producer&task=All&forced=1">alles (!)(forced, update auf www > 5min.)</a>
+        &nbsp;|&nbsp;
+        <br>
+        <a href="${config.actionRoot}?module=Producer&task=All&forced=1&sync=1">alles (!)(www sofort, nur im Notfall)</a>
+        &nbsp;|&nbsp;
+        <br>
+	-->
+		 		<br>specific parts of the site:
+		 		<br>
+     			<img src="${config.docRoot}/img/pointgris.gif" border=0>
+		 		<a href="${config.actionRoot}?module=Producer&task=StartPage">new startpage</a>
+				&nbsp;|&nbsp;
+		 		<a href="${config.actionRoot}?module=Producer&task=StartPage&forced=1">all (forced)</a>
+		 		&nbsp;|&nbsp;
+		 		<a href="${config.actionRoot}?module=Producer&task=StartPage&forced=1&sync=1">all (forced + sync)</a>
+		 		<br>
+				<img src="${config.docRoot}/img/pointgris.gif" border=0>
+     			<a href="${config.actionRoot}?module=Producer&task=Content">new content</a>
+				&nbsp;|&nbsp;
+				<a href="${config.actionRoot}?module=Producer&task=Content&forced=1">all (forced)</a>
+		 		<br>
+      			<img src="${config.docRoot}/img/pointgris.gif" border=0>
+				<a href="${config.actionRoot}?module=Producer&task=Topics">new topic-pages</a>
+				&nbsp;|&nbsp;
+		 		<a href="${config.actionRoot}?module=Producer&task=Topics&forced=1">all (forced)</a>
+				<br>
+				<a href="${config.actionRoot}?module=Producer&task=OpenPosting">
+		  	<img src="${config.docRoot}/img/pointgris.gif" border=0>new openpostings</a>
+				&nbsp;|&nbsp;
+		 		<a href="${config.actionRoot}?module=Producer&task=OpenPosting&forced=1">all (forced)</a>
+				<br>
+				<a href="${config.actionRoot}?module=Producer&task=Images">
+		  	<img src="${config.docRoot}/img/pointgris.gif" border=0>new pictures</a>
+				&nbsp;|&nbsp;
+		 		<a href="${config.actionRoot}?module=Producer&task=Images&forced=1">all (forced)</a>
+
+				<br>
+				<a href="${config.actionRoot}?module=Producer&task=Wap">
+		  	<img src="${config.docRoot}/img/pointgris.gif" border=0>new wap</a>
+				&nbsp;|&nbsp;
+		 		<a href="${config.actionRoot}?module=Producer&task=Wap&forced=1">all (forced)</a>
+				<br>
+        <a href="${config.actionRoot}?module=Producer&task=Navigation">
+		  	<img src="${config.docRoot}/img/pointgris.gif" border=0>navigation</a>
+				<br>
+
+
+	</td>
+
+
+			<td bgcolor="white" width="5%">&nbsp;
+			</td>
+			<td valign="top" width="30%" bgcolor="c0c0c0">
+
+  	<font face="Verdana, Arial, Helvetica, sans-serif" size="2" color="#663399">
+		<b>FEATURE</b></font>
+
+		<P>
+			<a href="${config.actionRoot}?module=Schwerpunkt&do=list" >
+      <img src="${config.docRoot}/img/pointgris.gif" border=0> edit</a><br>
+      <a href="${config.actionRoot}?module=Schwerpunkt&do=add" >
+		  <img src="${config.docRoot}/img/pointgris.gif" border=0> add</a>
+
+    <p>
+			<font face="Verdana, Arial, Helvetica, sans-serif" size="2" color="#663399">
+			<b>TOPICS</b></font>
+
+		<p>
+			<a href="${config.actionRoot}?module=Topics&do=list">
+      <img src="${config.docRoot}/img/pointgris.gif" border=0> edit</a><br>
+      <a href="${config.actionRoot}?module=Topics&do=add" >
+			<img src="${config.docRoot}/img/pointgris.gif" border=0> add</a>
+
+		<p>
+			<font face="Verdana, Arial, Helvetica, sans-serif" size="2" color="#663399">
+		  <b>PICTURES</b></font>
+
+    <p>
+			<a href="${config.actionRoot}?module=Images&do=list">
+      <img src="${config.docRoot}/img/pointgris.gif" border=0> edit</a><br>
+      <a href="${config.actionRoot}?module=Images&do=add" >
+			<img src="${config.docRoot}/img/pointgris.gif" border=0> add</a>
+
+		<p>
+			<font face="Verdana, Arial, Helvetica, sans-serif" size="2" color="#663399">
+		  <b>MEDIAFOLDER</b></font>
+
+		<p>
+			<a href="${config.actionRoot}?module=Mediafolder&do=list">
+      <img src="${config.docRoot}/img/pointgris.gif" border=0> edit</a><br>
+      <a href="${config.actionRoot}?module=Mediafolder&do=add" >
+			<img src="${config.docRoot}/img/pointgris.gif" border=0> add</a>
+
+
+    <p>
+			<font face="Verdana, Arial, Helvetica, sans-serif" size="2" color="#663399">
+		  <b>LANGUAGES</b></font>
+
+		<p>
+			<a href="${config.actionRoot}?module=Language&do=list">
+      <img src="${config.docRoot}/img/pointgris.gif" border=0> edit</a><br>
+      <a href="${config.actionRoot}?module=Language&do=add" >
+			<img src="${config.docRoot}/img/pointgris.gif" border=0> add</a>
+      </td>
+
+			<td bgcolor="white" width="5%">&nbsp;
+			</td>
+			<td valign="top" width="20%" bgcolor="pink">
+
+	<!-- internal messageboard -->
+
+		<font  face="Verdana, Arial, Helvetica, sans-serif" size="2" color="#663399">
+		<b>Internal Messageboard</b>
+		<font size="-1"><br><a href="${actionRoot}?module=Message&do=add">add</a></font>
+		<if messages>
+			<list messages as m>
+				<p>
+				<if m.title><b>${m.title}</b><br></if>
+				${m.description}<br>
+				<font size="-2">
+				<if m.creator><i>von: ${m.creator}</i> / </if>${m.webdb_create}<br>
+				</font>
+			</list>
+		<else>
+			<p><i>no messages</i>
+		</if></font>
+	</td>
+
+ 	</tr>
+	</table>
+
+	<include "foot.template">
+
+	</body>
+</html>
diff --git a/templates-dist/en/themen.template b/templates-dist/en/themen.template
index f1405306..703d5ed2 100755
--- a/templates-dist/en/themen.template
+++ b/templates-dist/en/themen.template
@@ -1,58 +1,58 @@
-<html>
-<head>
-<title>
-indymedia.de | topic
-</title>
-<head>
-
-<body bgcolor="#FFFFFF">
-<include "head.template">
-<form action="${actionRoot}" method="post">
-	<input type=hidden name=module value=Topics>
-	<input type="hidden" name="id" value="${id}">
-	<if new><input type="hidden" name="do" value="insert">
-	<else><input type="hidden" name="do" value="update"></if>
-<table border="0">
-  <tr>
-    <td align="right" bgcolor="#006600"><font face="Verdana, Arial, Helvetica, sans-serif" size="-1" color="#ffffff">
-		<B>name:</B></font></td>
-    <td>
-      <input type="text" size="40" name="title" value="${title}">
-    </td>
-  </tr>
-    <tr>
-      <td align="right" valign="top" bgcolor="#006600"><font color="#ffffff"><B>description:</B></font></td>
-      <td>
-        <textarea cols="40" rows="3" name="description">${description}</textarea>
-      </td>
-  </tr>
-  <tr>
-    <td align="right" bgcolor="#006600"><font color="#ffffff"><B>Fileame:</B></font></td>
-    <td>
-      <input type="text" size="20" name="filename" value="${filename}">
-    </td>
-  </tr>
-  <tr>
-    <td align="right" bgcolor="#006600"><font color="#ffffff"><B>main infopage
-      </B></font></td>
-    <td>
-      <input type="text" size="40" name="main_url" value="${main_url}">
-    </td>
-  </tr>
-  <tr>
-    <td align="right" bgcolor="#006600"><font color="#ffffff"><B>Archiv url:</B></font></td>
-    <td>
-      <input type="text" size="40" name="archiv_url" value="${archiv_url}">
-    </td>
-  </tr>
-  <tr>
-    <td colspan="2" align="right"> <font color="#ffffff"><if new>
-      <input type="submit" name="save" value="add">
-    <else>
-    <input type="submit" name="save" value="save">
-    </if> </font></form></font>
-    </td>
-</table>
-<include "foot.template">
-</body>
-</html>
+<html>
+<head>
+<title>
+indymedia.de | topic
+</title>
+<head>
+
+<body bgcolor="#FFFFFF">
+<include "head.template">
+<form action="${config.actionRoot}" method="post">
+	<input type=hidden name=module value=Topics>
+	<input type="hidden" name="id" value="${data.id}">
+	<if new><input type="hidden" name="do" value="insert">
+	<else><input type="hidden" name="do" value="update"></if>
+<table border="0">
+  <tr>
+    <td align="right" bgcolor="#006600"><font face="Verdana, Arial, Helvetica, sans-serif" size="-1" color="#ffffff">
+		<B>name:</B></font></td>
+    <td>
+      <input type="text" size="40" name="title" value="${data.title}">
+    </td>
+  </tr>
+    <tr>
+      <td align="right" valign="top" bgcolor="#006600"><font color="#ffffff"><B>description:</B></font></td>
+      <td>
+        <textarea cols="40" rows="3" name="description">${data.description}</textarea>
+      </td>
+  </tr>
+  <tr>
+    <td align="right" bgcolor="#006600"><font color="#ffffff"><B>Fileame:</B></font></td>
+    <td>
+      <input type="text" size="20" name="filename" value="${data.filename}">
+    </td>
+  </tr>
+  <tr>
+    <td align="right" bgcolor="#006600"><font color="#ffffff"><B>main infopage
+      </B></font></td>
+    <td>
+      <input type="text" size="40" name="main_url" value="${data.main_url}">
+    </td>
+  </tr>
+  <tr>
+    <td align="right" bgcolor="#006600"><font color="#ffffff"><B>Archiv url:</B></font></td>
+    <td>
+      <input type="text" size="40" name="archiv_url" value="${data.archiv_url}">
+    </td>
+  </tr>
+  <tr>
+    <td colspan="2" align="right"> <font color="#ffffff"><if new>
+      <input type="submit" name="save" value="add">
+    <else>
+    <input type="submit" name="save" value="save">
+    </if> </font></form></font>
+    </td>
+</table>
+<include "foot.template">
+</body>
+</html>
diff --git a/templates-dist/en/themenlist.template b/templates-dist/en/themenlist.template
index 56fdbfd9..070f9a5b 100755
--- a/templates-dist/en/themenlist.template
+++ b/templates-dist/en/themenlist.template
@@ -1,58 +1,59 @@
-<html>
-<head>
-	<title>indymedia.de | topiclist</title>
-</head>
-<body bgcolor="#FFFFFF">
-<include "head.template">
-<if contentlist>
-<table border="0">
-  <tr bgcolor="#006600">
-    <td><font face="Verdana, Arial, Helvetica, sans-serif" size="-1" color="#ffffff">
-		<b>title</b></font></td>
-    <td><font face="Verdana, Arial, Helvetica, sans-serif" size="-1" color="#ffffff">
-		<b>desciption</b></font></td>
-    <td><font face="Verdana, Arial, Helvetica, sans-serif" size="-1" color="#ffffff">
-		<b>Main-Url<br>Archiv-Url</b></font></td>
-	<td>&nbsp;</td>
-  </tr>
-  <list contentlist as entry>
-  <tr <if grey=="1"><assign grey="0">bgcolor="#dddddd" <else><assign grey="1"> </if>>
-  <td><font face="Verdana, Arial, Helvetica, sans-serif" size="-1">${entry.title}&nbsp;</font></td>
-  <td><font face="Verdana, Arial, Helvetica, sans-serif" size="-1">${entry.description}&nbsp;</font></td>
-  <td><font face="Verdana, Arial, Helvetica, sans-serif" size="-1">
-  	${entry.main_url}<br>
-  	${entry.archiv_url}</font></td>
-  <td><font size="1">&nbsp;<a href="${actionRoot}?module=Topics&do=delete&id=${entry.id}">delete</a>
-    | <a href="${actionRoot}?module=Topics&do=edit&id=${entry.id}">edit</a></font></td>
-  </tr>
-  </list>
-  <tr>
-  <td colspan="4" bgcolor="#006600"><font face="Verdana, Arial, Helvetica, sans-serif" size="-1" color="#ffffff">
-  	${count} entries / showing from ${from} to ${to}</font></td>
-  <td>&nbsp;</td>
-  </tr>
-</table>
-<P>
-<if (prev || next)>
- <form method="post" action="${actionRoot}">
- <input type="hidden" name="module" value="Topics">
- <input type="hidden" name="where" value="${where}">
-<if prev>
- <input type="hidden" name="prevoffset" value="${prev}">
- <input type="submit" name="prev" value="back">
-</if>
-<if next>
- <input type="hidden" name="nextoffset" value="${next}">
- <input type="submit" name="next" value="next">
-</if>
- </form>
-</if>
-
-<else>
-  <P align="center"> Found no matching entries!</p>
-</if>
-<include "foot.template">
-</body>
-</html>
-
-
+<html>
+<head>
+	<title>indymedia.de | topiclist</title>
+</head>
+<body bgcolor="#FFFFFF">
+<include "head.template">
+
+<if contentlist>
+<table border="0">
+  <tr bgcolor="#006600">
+    <td><font face="Verdana, Arial, Helvetica, sans-serif" size="-1" color="#ffffff">
+		<b>title</b></font></td>
+    <td><font face="Verdana, Arial, Helvetica, sans-serif" size="-1" color="#ffffff">
+		<b>desciption</b></font></td>
+    <td><font face="Verdana, Arial, Helvetica, sans-serif" size="-1" color="#ffffff">
+		<b>Main-Url<br>Archiv-Url</b></font></td>
+	<td>&nbsp;</td>
+  </tr>
+  <list contentlist as entry>
+  <tr <if grey=="1"><assign grey="0">bgcolor="#dddddd" <else><assign grey="1"> </if>>
+  <td><font face="Verdana, Arial, Helvetica, sans-serif" size="-1">${entry.title}&nbsp;</font></td>
+  <td><font face="Verdana, Arial, Helvetica, sans-serif" size="-1">${entry.description}&nbsp;</font></td>
+  <td><font face="Verdana, Arial, Helvetica, sans-serif" size="-1">
+  	${entry.main_url}<br>
+  	${entry.archiv_url}</font></td>
+  <td><font size="1">&nbsp;<a href="${config.actionRoot}?module=Topics&do=delete&id=${entry.id}">delete</a>
+    | <a href="${config.actionRoot}?module=Topics&do=edit&id=${entry.id}">edit</a></font></td>
+  </tr>
+  </list>
+  <tr>
+  <td colspan="4" bgcolor="#006600"><font face="Verdana, Arial, Helvetica, sans-serif" size="-1" color="#ffffff">
+  	${count} entries / showing from ${from} to ${to}</font></td>
+  <td>&nbsp;</td>
+  </tr>
+</table>
+<P>
+<if (prev || next)>
+ <form method="post" action="${config.actionRoot}">
+ <input type="hidden" name="module" value="Topics">
+ <input type="hidden" name="where" value="${where}">
+<if prev>
+ <input type="hidden" name="prevoffset" value="${prev}">
+ <input type="submit" name="prev" value="back">
+</if>
+<if next>
+ <input type="hidden" name="nextoffset" value="${next}">
+ <input type="submit" name="next" value="next">
+</if>
+ </form>
+</if>
+
+<else>
+  <P align="center"> Found no matching entries!</p>
+</if>
+<include "foot.template">
+</body>
+</html>
+
+
-- 
2.11.0