From 386e5efa787066632dabe1965c7272146ac72b63 Mon Sep 17 00:00:00 2001
From: zapata <zapata>
Date: Tue, 29 Apr 2003 02:36:50 +0000
Subject: [PATCH] Gif icons for the External image handler dramatically
 improved

---
 source/mir/media/MirMedia.java                     |  28 +-
 source/mircoders/media/ImageProcessor.java         |  93 +++-
 source/mircoders/media/MediaHandlerAudio.java      |  25 +-
 source/mircoders/media/MediaHandlerGeneric.java    |  31 +-
 .../mircoders/media/MediaHandlerImagesExtern.java  |  46 +-
 source/mircoders/media/MediaHandlerImagesJpeg.java |  22 +-
 source/mircoders/media/MediaHandlerImagesPng.java  |  24 +-
 .../mircoders/servlet/ServletModuleOpenIndy.java   | 556 ++++++++++-----------
 .../servlet/ServletModuleUploadedMedia.java        |  12 +-
 templates/admin/FUNCTIONS.template                 | 428 ++++++++--------
 templates/admin/FUNCTIONS_media.template           | 214 ++++----
 templates/admin/abuse.filters.template             |  40 +-
 templates/admin/abuse.log.template                 |  18 +-
 templates/admin/abuse.template                     |  54 +-
 templates/admin/articletype.template               |  54 +-
 templates/admin/articletypelist.template           |  28 +-
 templates/admin/audio.template                     | 148 +++---
 templates/admin/audiolist.template                 |   2 +-
 templates/admin/breaking.template                  |  26 +-
 templates/admin/breakinglist.template              |  48 +-
 templates/admin/comment.template                   | 112 ++---
 templates/admin/commentlist.template               | 352 ++++++-------
 templates/admin/commentstatus.template             |  22 +-
 templates/admin/commentstatuslist.template         |  38 +-
 templates/admin/confirm.template                   |  10 +-
 templates/admin/content.template                   | 296 +++++------
 templates/admin/contentlist.template               | 180 +++----
 templates/admin/fileedit.template                  |  30 +-
 templates/admin/fileeditlist.template              |  72 +--
 templates/admin/foot.template                      |  32 +-
 templates/admin/head.template                      |  26 +-
 templates/admin/head_nonavi.template               |  26 +-
 templates/admin/hiddenlist.template                | 144 +++---
 templates/admin/image.template                     | 204 ++++----
 templates/admin/imagelist.template                 |   4 -
 templates/admin/infomessage.template               |  26 +-
 templates/admin/language.template                  |  18 +-
 templates/admin/languagelist.template              |  36 +-
 templates/admin/linksimcs.template                 |  54 +-
 templates/admin/linksimcslist.template             | 126 ++---
 templates/admin/login.template                     |  78 +--
 templates/admin/media.template                     | 184 +++----
 templates/admin/mediafolder.template               |  16 +-
 templates/admin/mediafolderlist.template           |  68 +--
 templates/admin/medialist.template                 |   2 +-
 templates/admin/message.template                   |  34 +-
 templates/admin/messagelist.template               |  34 +-
 templates/admin/producerqueue.template             | 136 ++---
 templates/admin/start_admin.template               | 278 +++++------
 templates/admin/superusermenu.template             |  26 +-
 templates/admin/topic.template                     |  18 +-
 templates/admin/topiclist.template                 |  36 +-
 templates/admin/user.template                      |  80 +--
 templates/admin/usererror.template                 |  50 +-
 templates/admin/userlist.template                  |  42 +-
 templates/admin/video.template                     | 176 +++----
 templates/admin/videolist.template                 |   2 +-
 57 files changed, 2512 insertions(+), 2453 deletions(-)

diff --git a/source/mir/media/MirMedia.java b/source/mir/media/MirMedia.java
index 9f0caf14..298809e8 100755
--- a/source/mir/media/MirMedia.java
+++ b/source/mir/media/MirMedia.java
@@ -18,13 +18,13 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * In addition, as a special exception, The Mir-coders gives permission to link
- * the code of this program with  any library licensed under the Apache Software License, 
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library 
- * (or with modified versions of the above that use the same license as the above), 
- * and distribute linked combinations including the two.  You must obey the 
- * GNU General Public License in all respects for all of the code used other than 
- * the above mentioned libraries.  If you modify this file, you may extend this 
- * exception to your version of the file, but you are not obligated to do so.  
+ * the code of this program with  any library licensed under the Apache Software License,
+ * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
+ * (or with modified versions of the above that use the same license as the above),
+ * and distribute linked combinations including the two.  You must obey the
+ * GNU General Public License in all respects for all of the code used other than
+ * the above mentioned libraries.  If you modify this file, you may extend this
+ * exception to your version of the file, but you are not obligated to do so.
  * If you do not wish to do so, delete this exception statement from your version.
  */
 package  mir.media;
@@ -79,7 +79,7 @@ import freemarker.template.SimpleList;
  * ) and just override the things that need to be specific. see MediaHandlerAudio
  *
  * @author <mh@nadir.org>, the Mir-coders group
- * @version $Id: MirMedia.java,v 1.17 2003/04/21 12:42:46 idfx Exp $
+ * @version $Id: MirMedia.java,v 1.18 2003/04/29 02:36:50 zapata Exp $
  */
 
 public interface  MirMedia{
@@ -121,7 +121,17 @@ public interface  MirMedia{
    */
   public abstract InputStream getIcon (Entity ent) throws MediaExc, MediaFailure;
 
-        /**
+
+  /**
+   *
+   * @param ent
+   * @return
+   * @throws MediaExc
+   * @throws MediaFailure
+   */
+  public abstract String getIconMimeType (Entity aMediaEntity, Entity aMediaType) throws MediaExc, MediaFailure;
+
+  /**
    * gets the final content representation for the media
    * in the form of a URL (String) that allows someone to
    * download, look at or listen to the media. (HREF, img src
diff --git a/source/mircoders/media/ImageProcessor.java b/source/mircoders/media/ImageProcessor.java
index 1d953736..0b152a75 100755
--- a/source/mircoders/media/ImageProcessor.java
+++ b/source/mircoders/media/ImageProcessor.java
@@ -18,13 +18,13 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * In addition, as a special exception, The Mir-coders gives permission to link
- * the code of this program with  any library licensed under the Apache Software License, 
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library 
- * (or with modified versions of the above that use the same license as the above), 
- * and distribute linked combinations including the two.  You must obey the 
- * GNU General Public License in all respects for all of the code used other than 
- * the above mentioned libraries.  If you modify this file, you may extend this 
- * exception to your version of the file, but you are not obligated to do so.  
+ * the code of this program with  any library licensed under the Apache Software License,
+ * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
+ * (or with modified versions of the above that use the same license as the above),
+ * and distribute linked combinations including the two.  You must obey the
+ * GNU General Public License in all respects for all of the code used other than
+ * the above mentioned libraries.  If you modify this file, you may extend this
+ * exception to your version of the file, but you are not obligated to do so.
  * If you do not wish to do so, delete this exception statement from your version.
  */
 
@@ -36,11 +36,14 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 
-import javax.media.jai.InterpolationBilinear;
-import javax.media.jai.JAI;
+import javax.media.jai.InterpolationBicubic;
+import javax.media.jai.*;
 import javax.media.jai.ParameterBlockJAI;
 import javax.media.jai.PlanarImage;
 
+import java.awt.image.*;
+import java.awt.*;
+
 import mir.log.LoggerWrapper;
 
 import com.sun.media.jai.codec.ByteArraySeekableStream;
@@ -66,22 +69,38 @@ public class ImageProcessor {
   private byte[] imageData;
   private int iconWidth;
   private int iconHeight;
-  private String imageType;
 
-//  public ImageScaler(
+  public ImageProcessor(SeekableStream anImageStream) throws IOException {
+    PlanarImage tempImage = JAI.create("stream", anImageStream);
+
+
+    ParameterBlockJAI params = new ParameterBlockJAI("format");
+    params.addSource(tempImage);
+    params.setParameter("dataType", DataBuffer.TYPE_BYTE);
+
+    ImageLayout layout = new ImageLayout();
+    layout.setColorModel(ColorModel.getRGBdefault());
+    layout.setSampleModel(
+        new PixelInterleavedSampleModel(DataBuffer.TYPE_BYTE,
+        layout.getSampleModel(tempImage).getWidth(),
+        layout.getSampleModel(tempImage).getHeight(),
+        3,
+        3*layout.getSampleModel(tempImage).getWidth(),
+        new int[] {2,1,0}));
+
+    RenderingHints hints = new RenderingHints(JAI.KEY_IMAGE_LAYOUT, layout);
+
+    image = JAI.create("format", params, hints);
 
-  public ImageProcessor(SeekableStream anImageStream, String anImageType) throws IOException {
-    image = JAI.create("stream", anImageStream);
     scaledImage = image;
-    imageType = anImageType;
   }
 
-  public ImageProcessor(File aFile, String anImageType) throws IOException {
-    this(new FileSeekableStream(aFile), anImageType);
+  public ImageProcessor(File aFile) throws IOException {
+    this(new FileSeekableStream(aFile));
   }
 
-  public ImageProcessor(byte[] anImageData, String anImageType) throws IOException {
-    this(new ByteArraySeekableStream(anImageData), anImageType);
+  public ImageProcessor(byte[] anImageData) throws IOException {
+    this(new ByteArraySeekableStream(anImageData));
   }
 
   public void descaleImage(int aMaxSize) throws java.io.IOException {
@@ -163,17 +182,43 @@ public class ImageProcessor {
     return scaledImage.getHeight();
   }
 
-  public void writeScaledData(OutputStream aStream) {
-    JAI.create("encode", scaledImage, aStream, imageType, null);
+  public void writeScaledData(OutputStream aStream, String anImageType) {
+
+//    ParameterBlockJAI params = new ParameterBlockJAI("BandSelect");
+//    params.addSource(scaledImage);
+//    params.setParameter("bandIndices", new int[] {0,1,2});
+//    PlanarImage tempImage = JAI.create("BandSelect", params);
+
+    JAI.create("encode", scaledImage, aStream, anImageType, null);
   }
 
-  public byte[] getScaledData() {
+  public byte[] getScaledData(String anImageType) {
     ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-    writeScaledData(outputStream);
+    writeScaledData(outputStream, anImageType);
     return outputStream.toByteArray();
   }
 
-  public void writeScaledData(File aFile) throws IOException {
-    writeScaledData(new FileOutputStream(aFile));
+  public void writeScaledData(File aFile, String anImageType) throws IOException {
+    writeScaledData(new FileOutputStream(aFile), anImageType);
   }
 }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/source/mircoders/media/MediaHandlerAudio.java b/source/mircoders/media/MediaHandlerAudio.java
index a3201655..05a9c8da 100755
--- a/source/mircoders/media/MediaHandlerAudio.java
+++ b/source/mircoders/media/MediaHandlerAudio.java
@@ -18,19 +18,20 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * In addition, as a special exception, The Mir-coders gives permission to link
- * the code of this program with  any library licensed under the Apache Software License, 
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library 
- * (or with modified versions of the above that use the same license as the above), 
- * and distribute linked combinations including the two.  You must obey the 
- * GNU General Public License in all respects for all of the code used other than 
- * the above mentioned libraries.  If you modify this file, you may extend this 
- * exception to your version of the file, but you are not obligated to do so.  
+ * the code of this program with  any library licensed under the Apache Software License,
+ * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
+ * (or with modified versions of the above that use the same license as the above),
+ * and distribute linked combinations including the two.  You must obey the
+ * GNU General Public License in all respects for all of the code used other than
+ * the above mentioned libraries.  If you modify this file, you may extend this
+ * exception to your version of the file, but you are not obligated to do so.
  * If you do not wish to do so, delete this exception statement from your version.
  */
 
 package  mircoders.media;
 
-import mir.media.MirMedia;
+import mir.media.*;
+import mir.entity.*;
 
 /**
  * Handles audio media, like mp3 and maybe it could also handle some other.
@@ -39,7 +40,7 @@ import mir.media.MirMedia;
  * @see mir.media.MediaHandlerGeneric
  * @see mir.media.MirMedia
  * @author mh <mh@nadir.org>
- * @version $Id: MediaHandlerAudio.java,v 1.8 2003/04/21 12:42:48 idfx Exp $
+ * @version $Id: MediaHandlerAudio.java,v 1.9 2003/04/29 02:36:50 zapata Exp $
  */
 
 public class MediaHandlerAudio extends MediaHandlerGeneric implements MirMedia
@@ -47,11 +48,11 @@ public class MediaHandlerAudio extends MediaHandlerGeneric implements MirMedia
 
   private static String tinyIcon;
   private static String bigIcon;
-  	
-	static {
+
+  static {
     tinyIcon = configuration.getString("Producer.Icon.TinyAudio");
     bigIcon = configuration.getString("Producer.Icon.BigAudio");
-	}
+  }
 
   public String getTinyIcon()
   {
diff --git a/source/mircoders/media/MediaHandlerGeneric.java b/source/mircoders/media/MediaHandlerGeneric.java
index bb0ad5d8..c8cb1945 100755
--- a/source/mircoders/media/MediaHandlerGeneric.java
+++ b/source/mircoders/media/MediaHandlerGeneric.java
@@ -18,13 +18,13 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * In addition, as a special exception, The Mir-coders gives permission to link
- * the code of this program with  any library licensed under the Apache Software License, 
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library 
- * (or with modified versions of the above that use the same license as the above), 
- * and distribute linked combinations including the two.  You must obey the 
- * GNU General Public License in all respects for all of the code used other than 
- * the above mentioned libraries.  If you modify this file, you may extend this 
- * exception to your version of the file, but you are not obligated to do so.  
+ * the code of this program with  any library licensed under the Apache Software License,
+ * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
+ * (or with modified versions of the above that use the same license as the above),
+ * and distribute linked combinations including the two.  You must obey the
+ * GNU General Public License in all respects for all of the code used other than
+ * the above mentioned libraries.  If you modify this file, you may extend this
+ * exception to your version of the file, but you are not obligated to do so.
  * If you do not wish to do so, delete this exception statement from your version.
  */
 package  mircoders.media;
@@ -32,9 +32,12 @@ package  mircoders.media;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.InputStream;
+import javax.servlet.ServletContext;
+
+import freemarker.template.SimpleList;
 
 import mir.config.MirPropertiesConfiguration;
-import mir.config.MirPropertiesConfiguration.PropertiesConfigExc;
+import mir.config.MirPropertiesConfiguration$PropertiesConfigExc;
 import mir.entity.Entity;
 import mir.log.LoggerWrapper;
 import mir.media.MediaExc;
@@ -42,7 +45,6 @@ import mir.media.MediaFailure;
 import mir.media.MirMedia;
 import mir.misc.FileUtil;
 import mir.misc.StringUtil;
-import freemarker.template.SimpleList;
 
 
 /**
@@ -62,7 +64,7 @@ import freemarker.template.SimpleList;
  *
  * @see mir.media.MirMedia
  * @author mh <mh@nadir.org>
- * @version $Id: MediaHandlerGeneric.java,v 1.19 2003/04/21 12:42:48 idfx Exp $
+ * @version $Id: MediaHandlerGeneric.java,v 1.20 2003/04/29 02:36:50 zapata Exp $
  */
 
 public class MediaHandlerGeneric implements MirMedia
@@ -136,9 +138,16 @@ public class MediaHandlerGeneric implements MirMedia
     }
 
     public InputStream getIcon (Entity ent) throws MediaExc, MediaFailure {
-        return null;
+      return null;
     }
 
+    public String getIconMimeType (Entity aMediaEntity, Entity aMediaType) throws MediaExc, MediaFailure {
+      ServletContext servletContext = MirPropertiesConfiguration.getContext();
+      String fileName = aMediaEntity.getId()+"."+aMediaType.getValue("name");
+
+      return servletContext.getMimeType(fileName);
+    };
+
     public String getStoragePath()
     {
         return configuration.getString("Producer.Media.Path");
diff --git a/source/mircoders/media/MediaHandlerImagesExtern.java b/source/mircoders/media/MediaHandlerImagesExtern.java
index e9eb66a6..e8b623ae 100755
--- a/source/mircoders/media/MediaHandlerImagesExtern.java
+++ b/source/mircoders/media/MediaHandlerImagesExtern.java
@@ -18,13 +18,13 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * In addition, as a special exception, The Mir-coders gives permission to link
- * the code of this program with  any library licensed under the Apache Software License, 
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library 
- * (or with modified versions of the above that use the same license as the above), 
- * and distribute linked combinations including the two.  You must obey the 
- * GNU General Public License in all respects for all of the code used other than 
- * the above mentioned libraries.  If you modify this file, you may extend this 
- * exception to your version of the file, but you are not obligated to do so.  
+ * the code of this program with  any library licensed under the Apache Software License,
+ * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
+ * (or with modified versions of the above that use the same license as the above),
+ * and distribute linked combinations including the two.  You must obey the
+ * GNU General Public License in all respects for all of the code used other than
+ * the above mentioned libraries.  If you modify this file, you may extend this
+ * exception to your version of the file, but you are not obligated to do so.
  * If you do not wish to do so, delete this exception statement from your version.
  */
 package mircoders.media;
@@ -78,27 +78,27 @@ public class MediaHandlerImagesExtern extends MediaHandlerGeneric
       String date = anImageEntity.getValue("date");
       String datePath = StringUtil.webdbDate2path(date);
       String ext = "." + mediaTypeEnt.getValue("name");
-      String filePath = datePath + anImageEntity.getId() + ext;
-      String iconFilePath = MirPropertiesConfiguration.instance().getString("Producer.StorageRoot") + getIconStoragePath() + filePath;
+      String fileBasePath = datePath + anImageEntity.getId();
+      String filePath = fileBasePath + ext;
+      String iconPath = getIconStoragePath() + fileBasePath + ".jpg";
+      String iconStoragePath = configuration.getString("Producer.StorageRoot") + iconPath;
       String imageFilePath = getStoragePath() + File.separator + filePath;
 
       File imageFile = new File(imageFilePath);
-      File iconFile = new File(iconFilePath);
+      File iconFile = new File(iconStoragePath);
 
       if (!imageFile.exists()) {
         throw new MediaExc("error in MediaHandlerImagesExtern.produce(): " + filePath + " does not exist!");
       }
       else {
-        ImageProcessor processor = new ImageProcessor(imageFile, "JPEG");
+        ImageProcessor processor = new ImageProcessor(imageFile);
 
         processor.descaleImage(maxIconSize, minDescaleRatio, minDescaleReduction);
         File dir = new File(iconFile.getParent());
           if (dir!=null && !dir.exists()){
             dir.mkdirs();
         }
-        processor.writeScaledData(iconFile);
-
-        logger.info(processor.getWidth()+"x"+processor.getHeight());
+        processor.writeScaledData(iconFile, "JPEG");
 
         anImageEntity.setValueForProperty("img_height", new Integer(processor.getHeight()).toString());
         anImageEntity.setValueForProperty("img_width", new Integer(processor.getWidth()).toString());
@@ -106,7 +106,7 @@ public class MediaHandlerImagesExtern extends MediaHandlerGeneric
         anImageEntity.setValueForProperty("icon_height", new Integer(processor.getScaledHeight()).toString());
         anImageEntity.setValueForProperty("icon_width", new Integer(processor.getScaledWidth()).toString());
 
-        anImageEntity.setValueForProperty("icon_path", getIconStoragePath()+filePath);
+        anImageEntity.setValueForProperty("icon_path", iconPath);
         anImageEntity.setValueForProperty("publish_path", filePath);
 
         anImageEntity.update();
@@ -122,22 +122,22 @@ public class MediaHandlerImagesExtern extends MediaHandlerGeneric
 
   public InputStream getIcon(Entity anImageEntity) throws MediaExc, MediaFailure {
     try {
-      Entity mediaType = DatabaseUploadedMedia.getInstance().getMediaType(
-          anImageEntity);
+      String filePath =
+          configuration.getString("Producer.StorageRoot") + anImageEntity.getValue("icon_path");
 
-      String date = anImageEntity.getValue("date");
-      String datePath = StringUtil.webdbDate2path(date);
-      String ext = "." + mediaType.getValue("name");
-      String filePath = MirPropertiesConfiguration.instance().getString("Producer.StorageRoot") +
-          getIconStoragePath() + datePath + anImageEntity.getId() + ext;
+      logger.info(filePath);
 
       return new FileInputStream(new File(filePath));
     }
     catch (Throwable t) {
-      throw new MediaFailure(t);
+      return null;
     }
   }
 
+  public String getIconMimeType(Entity anImageEntity, Entity aMediaType) {
+    return "image/jpeg";
+  }
+
   public String getStoragePath()
   {
     return configuration.getString("Producer.Image.Path");
diff --git a/source/mircoders/media/MediaHandlerImagesJpeg.java b/source/mircoders/media/MediaHandlerImagesJpeg.java
index 76c46644..751b6e13 100755
--- a/source/mircoders/media/MediaHandlerImagesJpeg.java
+++ b/source/mircoders/media/MediaHandlerImagesJpeg.java
@@ -18,13 +18,13 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * In addition, as a special exception, The Mir-coders gives permission to link
- * the code of this program with  any library licensed under the Apache Software License, 
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library 
- * (or with modified versions of the above that use the same license as the above), 
- * and distribute linked combinations including the two.  You must obey the 
- * GNU General Public License in all respects for all of the code used other than 
- * the above mentioned libraries.  If you modify this file, you may extend this 
- * exception to your version of the file, but you are not obligated to do so.  
+ * the code of this program with  any library licensed under the Apache Software License,
+ * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
+ * (or with modified versions of the above that use the same license as the above),
+ * and distribute linked combinations including the two.  You must obey the
+ * GNU General Public License in all respects for all of the code used other than
+ * the above mentioned libraries.  If you modify this file, you may extend this
+ * exception to your version of the file, but you are not obligated to do so.
  * If you do not wish to do so, delete this exception statement from your version.
  */
 package mircoders.media;
@@ -42,7 +42,7 @@ import mir.media.MirMedia;
  * @see mir.media.MirMedia
  * @see mircoders.media.MediaHandlerImages
  * @author mh, mir-coders group
- * @version $Id: MediaHandlerImagesJpeg.java,v 1.5 2003/04/21 12:42:48 idfx Exp $
+ * @version $Id: MediaHandlerImagesJpeg.java,v 1.6 2003/04/29 02:36:50 zapata Exp $
  */
 
 
@@ -52,9 +52,11 @@ public class MediaHandlerImagesJpeg extends MediaHandlerImages implements MirMed
     return JPEG;
   }
 
-  public String getDescr(Entity mediaType)
-  {
+  public String getDescr(Entity mediaType) {
       return "image/jpeg";
   }
 
+  public String getIconMimeType(Entity aMedia, Entity aMediaType) {
+    return "image/jpeg";
+  }
 }
diff --git a/source/mircoders/media/MediaHandlerImagesPng.java b/source/mircoders/media/MediaHandlerImagesPng.java
index bf281fd0..cbc9d0a4 100755
--- a/source/mircoders/media/MediaHandlerImagesPng.java
+++ b/source/mircoders/media/MediaHandlerImagesPng.java
@@ -18,13 +18,13 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * In addition, as a special exception, The Mir-coders gives permission to link
- * the code of this program with  any library licensed under the Apache Software License, 
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library 
- * (or with modified versions of the above that use the same license as the above), 
- * and distribute linked combinations including the two.  You must obey the 
- * GNU General Public License in all respects for all of the code used other than 
- * the above mentioned libraries.  If you modify this file, you may extend this 
- * exception to your version of the file, but you are not obligated to do so.  
+ * the code of this program with  any library licensed under the Apache Software License,
+ * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
+ * (or with modified versions of the above that use the same license as the above),
+ * and distribute linked combinations including the two.  You must obey the
+ * GNU General Public License in all respects for all of the code used other than
+ * the above mentioned libraries.  If you modify this file, you may extend this
+ * exception to your version of the file, but you are not obligated to do so.
  * If you do not wish to do so, delete this exception statement from your version.
  */
 package mircoders.media;
@@ -42,7 +42,7 @@ import mir.media.MirMedia;
  * @see mir.media.MirMedia
  * @see mircoders.media.MediaHandlerImages
  * @author mh ,mir-coders
- * @version $Id: MediaHandlerImagesPng.java,v 1.6 2003/04/21 12:42:48 idfx Exp $
+ * @version $Id: MediaHandlerImagesPng.java,v 1.7 2003/04/29 02:36:50 zapata Exp $
  */
 
 
@@ -52,9 +52,11 @@ public class MediaHandlerImagesPng extends MediaHandlerImages implements MirMedi
     return PNG;
   }
 
-  public String getDescr(Entity mediaType)
-  {
-      return "image/png";
+  public String getDescr(Entity mediaType) {
+    return "image/png";
   }
 
+  public String getIconMimeType(Entity aMedia, Entity aMediaType) {
+    return "image/png";
+  }
 }
diff --git a/source/mircoders/servlet/ServletModuleOpenIndy.java b/source/mircoders/servlet/ServletModuleOpenIndy.java
index 2e9a56af..9e7f5be4 100755
--- a/source/mircoders/servlet/ServletModuleOpenIndy.java
+++ b/source/mircoders/servlet/ServletModuleOpenIndy.java
@@ -122,7 +122,7 @@ import mircoders.storage.DatabaseTopics;
  *    open-postings to the newswire
  *
  * @author mir-coders group
- * @version $Id: ServletModuleOpenIndy.java,v 1.83 2003/04/26 15:42:17 zapata Exp $
+ * @version $Id: ServletModuleOpenIndy.java,v 1.84 2003/04/29 02:36:50 zapata Exp $
  *
  */
 
@@ -702,350 +702,345 @@ public class ServletModuleOpenIndy extends ServletModule
 
 
 
+  /**
+   * Method for querying a lucene index
+   *
+   * @param req
+   * @param res
+   * @throws ServletModuleExc
+   * @throws ServletModuleUserExc
+   * @throws ServletModuleFailure
+   */
 
-    /**
-     * Method for querying a lucene index
-     *
-     * @param req
-     * @param res
-     * @throws ServletModuleExc
-     * @throws ServletModuleUserExc
-     * @throws ServletModuleFailure
-     */
-
-    public void search(HttpServletRequest req, HttpServletResponse res)
-        throws ServletModuleExc, ServletModuleUserExc, ServletModuleFailure {
-      try {
-        final String[] search_variables = { "search_content", "search_boolean", "search_creator",
-            "search_topic", "search_hasImages", "search_hasAudio", "search_hasVideo", "search_sort",
-            "search_submit", "search_back", "search_forward" };
-        HTTPRequestParser requestParser = new HTTPRequestParser(req);
-
-        int increment=10;
+  public void search(HttpServletRequest req, HttpServletResponse res) throws ServletModuleExc, ServletModuleUserExc, ServletModuleFailure {
+    try {
+      final String[] search_variables = {
+          "search_content", "search_boolean", "search_creator",
+          "search_topic", "search_hasImages", "search_hasAudio", "search_hasVideo", "search_sort",
+          "search_submit", "search_back", "search_forward"};
+      HTTPRequestParser requestParser = new HTTPRequestParser(req);
 
-        HttpSession session = req.getSession(false);
+      int increment = 10;
 
-        String queryString="";
+      HttpSession session = req.getSession(false);
 
-        Map mergeData = new HashMap();
+      String queryString = "";
 
-        KeywordSearchTerm dateTerm = new KeywordSearchTerm("date_formatted","search_date","webdb_create_formatted","webdb_create_formatted","webdb_create_formatted");
-        UnIndexedSearchTerm whereTerm = new UnIndexedSearchTerm("","","","where","where");
-        TextSearchTerm creatorTerm = new TextSearchTerm("creator","search_creator","creator","creator","creator");
-        TextSearchTerm titleTerm = new TextSearchTerm("title","search_content","title","title","title");
-        TextSearchTerm descriptionTerm =  new TextSearchTerm("description","search_content","description","description","description");
-        ContentSearchTerm contentTerm = new ContentSearchTerm("content_data","search_content","content","","");
-        TopicSearchTerm topicTerm = new TopicSearchTerm();
-        ImagesSearchTerm imagesTerm = new ImagesSearchTerm();
-        AudioSearchTerm audioTerm = new AudioSearchTerm();
-        VideoSearchTerm videoTerm = new VideoSearchTerm();
+      Map mergeData = new HashMap();
 
-        //make the query available to subsequent iterations
+      KeywordSearchTerm dateTerm = new KeywordSearchTerm("date_formatted", "search_date", "webdb_create_formatted", "webdb_create_formatted", "webdb_create_formatted");
+      UnIndexedSearchTerm whereTerm = new UnIndexedSearchTerm("", "", "", "where", "where");
+      TextSearchTerm creatorTerm = new TextSearchTerm("creator", "search_creator", "creator", "creator", "creator");
+      TextSearchTerm titleTerm = new TextSearchTerm("title", "search_content", "title", "title", "title");
+      TextSearchTerm descriptionTerm = new TextSearchTerm("description", "search_content", "description", "description", "description");
+      ContentSearchTerm contentTerm = new ContentSearchTerm("content_data", "search_content", "content", "", "");
+      TopicSearchTerm topicTerm = new TopicSearchTerm();
+      ImagesSearchTerm imagesTerm = new ImagesSearchTerm();
+      AudioSearchTerm audioTerm = new AudioSearchTerm();
+      VideoSearchTerm videoTerm = new VideoSearchTerm();
 
-        Iterator j = Arrays.asList(search_variables).iterator();
-        while (j.hasNext()) {
-          String variable = (String) j.next();
+      //make the query available to subsequent iterations
 
-          mergeData.put(variable, requestParser.getParameter(variable));
-        }
+      Iterator j = Arrays.asList(search_variables).iterator();
+      while (j.hasNext()) {
+        String variable = (String) j.next();
 
-        try{
-          mergeData.put("topics", topicsModule.getTopicsAsSimpleList());
-        }
-        catch(Throwable e) {
-          logger.debug("Can't get topics: " + e.toString());
-        }
+        mergeData.put(variable, requestParser.getParameter(variable));
+      }
 
-        String searchBackValue = req.getParameter("search_back");
-        String searchForwardValue = req.getParameter("search_forward");
+      try {
+        mergeData.put("topics", topicsModule.getTopicsAsSimpleList());
+      }
+      catch (Throwable e) {
+        logger.debug("Can't get topics: " + e.toString());
+      }
 
-        if (searchBackValue != null){
-          int totalHits = ((Integer) session.getAttribute("numberOfHits")).intValue();
-          int newPosition=((Integer)session.getAttribute("positionInResults")).intValue()-increment;
-          if (newPosition<0)
-            newPosition=0;
+      String searchBackValue = req.getParameter("search_back");
+      String searchForwardValue = req.getParameter("search_forward");
+
+      if (searchBackValue != null) {
+        int totalHits = ( (Integer) session.getAttribute("numberOfHits")).intValue();
+        int newPosition = ( (Integer) session.getAttribute("positionInResults")).intValue() - increment;
+        if (newPosition < 0)
+          newPosition = 0;
+        if (newPosition >= totalHits)
+          newPosition = totalHits - 1;
+        session.setAttribute("positionInResults", new Integer(newPosition));
+      }
+      else {
+        if (searchForwardValue != null) {
+          int totalHits = ( (Integer) session.getAttribute("numberOfHits")).intValue();
+          int newPosition = ( (Integer) session.getAttribute("positionInResults")).intValue() + increment;
+          if (newPosition < 0)
+            newPosition = 0;
           if (newPosition >= totalHits)
-            newPosition=totalHits-1;
-          session.setAttribute("positionInResults",new Integer(newPosition));
+            newPosition = totalHits - 1;
+
+          session.setAttribute("positionInResults", new Integer(newPosition));
         }
         else {
-          if (searchForwardValue != null){
-            int totalHits = ((Integer) session.getAttribute("numberOfHits")).intValue();
-            int newPosition=((Integer)session.getAttribute("positionInResults")).intValue()+increment;
-            if (newPosition<0)
-              newPosition=0;
-            if (newPosition >= totalHits)
-              newPosition=totalHits-1;
-
-            session.setAttribute("positionInResults",new Integer(newPosition));
-          }
-          else {
-            String indexPath=configuration.getString("IndexPath");
+          String indexPath = configuration.getString("IndexPath");
 
+          String creatorFragment = creatorTerm.makeTerm(req);
+          if (creatorFragment != null) {
+            queryString = queryString + " +" + creatorFragment;
+          }
 
-            String creatorFragment = creatorTerm.makeTerm(req);
-            if (creatorFragment != null){
-              queryString = queryString + " +" + creatorFragment;
-            }
-
-            // search title, description, and content for something
-            // the contentTerm uses param "search_boolean" to combine its terms
-            String contentFragment = contentTerm.makeTerm(req);
-            if (contentFragment != null){
-              logger.debug("contentFragment: " + contentFragment);
-              queryString = queryString + " +" + contentFragment;
-            }
+          // search title, description, and content for something
+          // the contentTerm uses param "search_boolean" to combine its terms
+          String contentFragment = contentTerm.makeTerm(req);
+          if (contentFragment != null) {
+            logger.debug("contentFragment: " + contentFragment);
+            queryString = queryString + " +" + contentFragment;
+          }
 
-            String topicFragment = topicTerm.makeTerm(req);
-            if (topicFragment != null){
-              queryString = queryString + " +" + topicFragment;
-            }
+          String topicFragment = topicTerm.makeTerm(req);
+          if (topicFragment != null) {
+            queryString = queryString + " +" + topicFragment;
+          }
 
-            String imagesFragment = imagesTerm.makeTerm(req);
-            if (imagesFragment != null){
-              queryString = queryString + " +" + imagesFragment;
-            }
+          String imagesFragment = imagesTerm.makeTerm(req);
+          if (imagesFragment != null) {
+            queryString = queryString + " +" + imagesFragment;
+          }
 
-            String audioFragment = audioTerm.makeTerm(req);
-            if (audioFragment != null){
-              queryString = queryString + " +" + audioFragment;
-            }
+          String audioFragment = audioTerm.makeTerm(req);
+          if (audioFragment != null) {
+            queryString = queryString + " +" + audioFragment;
+          }
 
-            String videoFragment = videoTerm.makeTerm(req);
-            if (videoFragment != null){
-              queryString = queryString + " +" + videoFragment;
-            }
+          String videoFragment = videoTerm.makeTerm(req);
+          if (videoFragment != null) {
+            queryString = queryString + " +" + videoFragment;
+          }
 
-            if (queryString == null || queryString == ""){
-              queryString = "";
-            }
-            else{
-              try{
-                Searcher searcher = null;
-                try {
-                  searcher = new IndexSearcher(indexPath);
-                }
-                catch(IOException e) {
-                  logger.debug("Can't open indexPath: " + indexPath);
-                  throw new ServletModuleExc("Problem with Search Index! : "+ e.toString());
-                }
+          if (queryString == null || queryString == "") {
+            queryString = "";
+          }
+          else {
+            try {
+              Searcher searcher = null;
+              try {
+                searcher = new IndexSearcher(indexPath);
+              }
+              catch (IOException e) {
+                logger.debug("Can't open indexPath: " + indexPath);
+                throw new ServletModuleExc("Problem with Search Index! : " + e.toString());
+              }
 
-                Query query = null;
-                try {
-                  query = QueryParser.parse(queryString, "content", new StandardAnalyzer());
-                }
-                catch(Exception e) {
-                  searcher.close();
-                  logger.debug("Query don't parse: " + queryString);
-                  throw new ServletModuleExc("Problem with Query String! (was '"+queryString+"')");
-                }
+              Query query = null;
+              try {
+                query = QueryParser.parse(queryString, "content", new StandardAnalyzer());
+              }
+              catch (Exception e) {
+                searcher.close();
+                logger.debug("Query don't parse: " + queryString);
+                throw new ServletModuleExc("Problem with Query String! (was '" + queryString + "')");
+              }
 
-                Hits hits = null;
-                try {
-                  hits = searcher.search(query);
-                }
-                catch(IOException e) {
-                  searcher.close();
-                  logger.debug("Can't get hits: " + e.toString());
-                  throw new ServletModuleExc("Problem getting hits!");
-                }
+              Hits hits = null;
+              try {
+                hits = searcher.search(query);
+              }
+              catch (IOException e) {
+                searcher.close();
+                logger.debug("Can't get hits: " + e.toString());
+                throw new ServletModuleExc("Problem getting hits!");
+              }
 
-                int start = 0;
-                int end = hits.length();
+              int start = 0;
+              int end = hits.length();
 
-                String sortBy=req.getParameter("search_sort");
-                if (sortBy == null || sortBy.equals("")){
-                  throw new ServletModuleExc("Please let me sort by something!(missing search_sort)");
-                }
+              String sortBy = req.getParameter("search_sort");
+              if (sortBy == null || sortBy.equals("")) {
+                throw new ServletModuleExc("Please let me sort by something!(missing search_sort)");
+              }
 
-                // here is where the documents will go for storage across sessions
-                ArrayList theDocumentsSorted = new ArrayList();
+              // here is where the documents will go for storage across sessions
+              ArrayList theDocumentsSorted = new ArrayList();
 
-                if (sortBy.equals("score")){
-                  for(int i = start; i < end; i++) {
-                    theDocumentsSorted.add(hits.doc(i));
-                  }
+              if (sortBy.equals("score")) {
+                for (int i = start; i < end; i++) {
+                  theDocumentsSorted.add(hits.doc(i));
                 }
-                else{
-                  // then we'll sort by date!
-                  Map dateToPosition = new HashMap(end,1.0F); //we know how big it will be
-                  for(int i = start; i < end; i++) {
-                    String creationDate=(hits.doc(i)).get("creationDate");
-                    // do a little dance in case two contents created at the same second!
-                    if (dateToPosition.containsKey(creationDate)){
-                      ((ArrayList) (dateToPosition.get(creationDate))).add(new Integer(i));
-                    }
-                    else{
-                      ArrayList thePositions = new ArrayList();
-                      thePositions.add(new Integer(i));
-                      dateToPosition.put(creationDate,thePositions);
-                    }
-                  }
-                  Set keys = dateToPosition.keySet();
-                  ArrayList keyList= new ArrayList(keys);
-                  Collections.sort(keyList);
-                  if (sortBy.equals("date_desc")){
-                    Collections.reverse(keyList);
-                  }
-                  else{
-                    if (!sortBy.equals("date_asc")){
-                      throw new ServletModuleExc("don't know how to sort by: "+ sortBy);
-                    }
+              }
+              else {
+                // then we'll sort by date!
+                Map dateToPosition = new HashMap(end, 1.0F); //we know how big it will be
+                for (int i = start; i < end; i++) {
+                  String creationDate = (hits.doc(i)).get("creationDate");
+                  // do a little dance in case two contents created at the same second!
+                  if (dateToPosition.containsKey(creationDate)) {
+                    ( (ArrayList) (dateToPosition.get(creationDate))).add(new Integer(i));
                   }
-                  ListIterator keyTraverser = keyList.listIterator();
-                  while (keyTraverser.hasNext()){
-                    ArrayList positions = (ArrayList)dateToPosition.get((keyTraverser.next()));
-                    ListIterator positionsTraverser=positions.listIterator();
-                    while (positionsTraverser.hasNext()){
-                      theDocumentsSorted.add(hits.doc(((Integer)(positionsTraverser.next())).intValue()));
-                    }
+                  else {
+                    ArrayList thePositions = new ArrayList();
+                    thePositions.add(new Integer(i));
+                    dateToPosition.put(creationDate, thePositions);
                   }
                 }
-
-                try{
-                  searcher.close();
+                Set keys = dateToPosition.keySet();
+                ArrayList keyList = new ArrayList(keys);
+                Collections.sort(keyList);
+                if (sortBy.equals("date_desc")) {
+                  Collections.reverse(keyList);
                 }
-                catch (IOException e){
-                  logger.debug("Can't close searcher: " + e.toString());
-                  throw new ServletModuleFailure("Problem closing searcher(normal):" + e.getMessage(), e);
+                else {
+                  if (!sortBy.equals("date_asc")) {
+                    throw new ServletModuleExc("don't know how to sort by: " + sortBy);
+                  }
                 }
+                ListIterator keyTraverser = keyList.listIterator();
+                while (keyTraverser.hasNext()) {
+                  ArrayList positions = (ArrayList) dateToPosition.get( (keyTraverser.next()));
+                  ListIterator positionsTraverser = positions.listIterator();
+                  while (positionsTraverser.hasNext()) {
+                    theDocumentsSorted.add(hits.doc( ( (Integer) (positionsTraverser.next())).intValue()));
+                  }
+                }
+              }
 
-
-                session.removeAttribute("numberOfHits");
-                session.removeAttribute("theDocumentsSorted");
-                session.removeAttribute("positionInResults");
-
-                session.setAttribute("numberOfHits",new Integer(end));
-                session.setAttribute("theDocumentsSorted",theDocumentsSorted);
-                session.setAttribute("positionInResults",new Integer(0));
-
+              try {
+                searcher.close();
               }
-              catch (IOException e){
+              catch (IOException e) {
                 logger.debug("Can't close searcher: " + e.toString());
-                throw new ServletModuleFailure("Problem closing searcher: " + e.getMessage(), e);
+                throw new ServletModuleFailure("Problem closing searcher(normal):" + e.getMessage(), e);
               }
-            }
-          }
-        }
-
-        try {
-          ArrayList theDocs = (ArrayList)session.getAttribute("theDocumentsSorted");
-          if (theDocs != null){
 
-            mergeData.put("numberOfHits", ((Integer)session.getAttribute("numberOfHits")).toString());
-            List theHits = new Vector();
-            int pIR=((Integer)session.getAttribute("positionInResults")).intValue();
-            int terminus;
-            int numHits=((Integer)session.getAttribute("numberOfHits")).intValue();
+              session.removeAttribute("numberOfHits");
+              session.removeAttribute("theDocumentsSorted");
+              session.removeAttribute("positionInResults");
 
-            if (!(pIR+increment>=numHits)){
-              mergeData.put("hasNext","y");
-            }
-            else {
-              mergeData.put("hasNext", null);
-            }
-            if (pIR>0){
-              mergeData.put("hasPrevious","y");
-            }
-            else {
-              mergeData.put("hasPrevious", null);
-            }
+              session.setAttribute("numberOfHits", new Integer(end));
+              session.setAttribute("theDocumentsSorted", theDocumentsSorted);
+              session.setAttribute("positionInResults", new Integer(0));
 
-            if ((pIR+increment)>numHits){
-              terminus=numHits;
-            }
-            else {
-              terminus=pIR+increment;
             }
-            for(int i = pIR; i < terminus; i++) {
-              Map h = new HashMap();
-              Document theHit = (Document)theDocs.get(i);
-              whereTerm.returnMeta(h,theHit);
-              creatorTerm.returnMeta(h,theHit);
-              titleTerm.returnMeta(h,theHit);
-              descriptionTerm.returnMeta(h,theHit);
-              dateTerm.returnMeta(h,theHit);
-              imagesTerm.returnMeta(h,theHit);
-              audioTerm.returnMeta(h,theHit);
-              videoTerm.returnMeta(h,theHit);
-              theHits.add(h);
+            catch (IOException e) {
+              logger.debug("Can't close searcher: " + e.toString());
+              throw new ServletModuleFailure("Problem closing searcher: " + e.getMessage(), e);
             }
-            mergeData.put("hits",theHits);
           }
         }
-        catch (Throwable e) {
-          logger.error("Can't iterate over hits: " + e.toString());
+      }
 
-          throw new ServletModuleFailure("Problem getting hits: " + e.getMessage(), e);
-        }
+      try {
+        ArrayList theDocs = (ArrayList) session.getAttribute("theDocumentsSorted");
+        if (theDocs != null) {
 
-        mergeData.put("queryString",queryString);
+          mergeData.put("numberOfHits", ( (Integer) session.getAttribute("numberOfHits")).toString());
+          List theHits = new Vector();
+          int pIR = ( (Integer) session.getAttribute("positionInResults")).intValue();
+          int terminus;
+          int numHits = ( (Integer) session.getAttribute("numberOfHits")).intValue();
 
-        deliver(req, res, mergeData, null, searchResultsTemplate);
+          if (! (pIR + increment >= numHits)) {
+            mergeData.put("hasNext", "y");
+          }
+          else {
+            mergeData.put("hasNext", null);
+          }
+          if (pIR > 0) {
+            mergeData.put("hasPrevious", "y");
+          }
+          else {
+            mergeData.put("hasPrevious", null);
+          }
+
+          if ( (pIR + increment) > numHits) {
+            terminus = numHits;
+          }
+          else {
+            terminus = pIR + increment;
+          }
+          for (int i = pIR; i < terminus; i++) {
+            Map h = new HashMap();
+            Document theHit = (Document) theDocs.get(i);
+            whereTerm.returnMeta(h, theHit);
+            creatorTerm.returnMeta(h, theHit);
+            titleTerm.returnMeta(h, theHit);
+            descriptionTerm.returnMeta(h, theHit);
+            dateTerm.returnMeta(h, theHit);
+            imagesTerm.returnMeta(h, theHit);
+            audioTerm.returnMeta(h, theHit);
+            videoTerm.returnMeta(h, theHit);
+            theHits.add(h);
+          }
+          mergeData.put("hits", theHits);
+        }
       }
-      catch (NullPointerException n){
-        throw new ServletModuleFailure("Null Pointer: "+n.toString(), n);
+      catch (Throwable e) {
+        logger.error("Can't iterate over hits: " + e.toString());
+
+        throw new ServletModuleFailure("Problem getting hits: " + e.getMessage(), e);
       }
-    }
 
-    /*
-     * Method for dynamically generating a pdf using iText
-     */
+      mergeData.put("queryString", queryString);
 
+      deliver(req, res, mergeData, null, searchResultsTemplate);
+    }
+    catch (NullPointerException n) {
+      throw new ServletModuleFailure("Null Pointer: " + n.toString(), n);
+    }
+  }
 
-    public void getpdf(HttpServletRequest req, HttpServletResponse res)
-        throws ServletModuleExc, ServletModuleUserExc, ServletModuleFailure {
-      String ID_REQUEST_PARAM = "id";
-      try {
-          String idParam = req.getParameter(ID_REQUEST_PARAM);
-          if (idParam != null) {
-            ByteArrayOutputStream out = new ByteArrayOutputStream();
-            PDFGenerator pdfMaker = new PDFGenerator(out);
+  /*
+   * Method for dynamically generating a pdf using iText
+   */
 
-            RE re = new RE("[0-9]+");
+  public void getpdf(HttpServletRequest req, HttpServletResponse res) throws ServletModuleExc, ServletModuleUserExc, ServletModuleFailure {
+    String ID_REQUEST_PARAM = "id";
+    try {
+      String idParam = req.getParameter(ID_REQUEST_PARAM);
+      if (idParam != null) {
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        PDFGenerator pdfMaker = new PDFGenerator(out);
 
+        RE re = new RE("[0-9]+");
 
-            REMatch[] idMatches=re.getAllMatches(idParam);
+        REMatch[] idMatches = re.getAllMatches(idParam);
 
-            if (idMatches.length > 1){
-              pdfMaker.addLine();
-              for (int i = 0; i < idMatches.length; i++){
-                REMatch aMatch = idMatches[i];
-                String id=aMatch.toString();
-                EntityContent contentEnt = (EntityContent)contentModule.getById(id);
-                pdfMaker.addIndexItem(contentEnt);
+        if (idMatches.length > 1) {
+          pdfMaker.addLine();
+          for (int i = 0; i < idMatches.length; i++) {
+            REMatch aMatch = idMatches[i];
+            String id = aMatch.toString();
+            EntityContent contentEnt = (EntityContent) contentModule.getById(id);
+            pdfMaker.addIndexItem(contentEnt);
 
-              }
-            }
+          }
+        }
 
-            for (int i = 0; i < idMatches.length; i++){
-              REMatch aMatch = idMatches[i];
+        for (int i = 0; i < idMatches.length; i++) {
+          REMatch aMatch = idMatches[i];
 
-              String id=aMatch.toString();
+          String id = aMatch.toString();
 
-              EntityContent contentEnt = (EntityContent)contentModule.getById(id);
-              pdfMaker.add(contentEnt);
+          EntityContent contentEnt = (EntityContent) contentModule.getById(id);
+          pdfMaker.add(contentEnt);
 
-            }
+        }
 
-            pdfMaker.stop();
-            res.setContentType("application/pdf");
-            byte[] content = out.toByteArray();
-            res.setContentLength(content.length);
-            res.getOutputStream().write(content);
-            res.getOutputStream().flush();
+        pdfMaker.stop();
+        res.setContentType("application/pdf");
+        byte[] content = out.toByteArray();
+        res.setContentLength(content.length);
+        res.getOutputStream().write(content);
+        res.getOutputStream().flush();
 
-          }
-          else {
-            throw new ServletModuleExc("Missing id.");
-          }
       }
-      catch (Throwable t) {
-        logger.error(t.toString());
-        throw new ServletModuleFailure(t);
+      else {
+        throw new ServletModuleExc("Missing id.");
       }
-
     }
+    catch (Throwable t) {
+      logger.error(t.toString());
+      throw new ServletModuleFailure(t);
+    }
+
+  }
+
   public String generateOnetimePassword() {
     Random r = new Random();
     int random = r.nextInt();
@@ -1061,8 +1056,7 @@ public class ServletModuleOpenIndy extends ServletModule
     return returnString.substring(5);
   }
 
-  public void deliver(HttpServletRequest aRequest, HttpServletResponse aResponse, Map aData, Map anExtra, String aGenerator)
-      throws ServletModuleFailure {
+  public void deliver(HttpServletRequest aRequest, HttpServletResponse aResponse, Map aData, Map anExtra, String aGenerator) throws ServletModuleFailure {
     try {
       deliver(aResponse.getWriter(), aRequest, aResponse, aData, anExtra, aGenerator);
     }
diff --git a/source/mircoders/servlet/ServletModuleUploadedMedia.java b/source/mircoders/servlet/ServletModuleUploadedMedia.java
index 6349e424..ba34a639 100755
--- a/source/mircoders/servlet/ServletModuleUploadedMedia.java
+++ b/source/mircoders/servlet/ServletModuleUploadedMedia.java
@@ -76,7 +76,7 @@ import freemarker.template.SimpleList;
  *  ServletModuleBilder -
  *  liefert HTML fuer Bilder
  *
- * @version $Id: ServletModuleUploadedMedia.java,v 1.27 2003/04/26 00:42:22 zapata Exp $
+ * @version $Id: ServletModuleUploadedMedia.java,v 1.28 2003/04/29 02:36:51 zapata Exp $
  * @author RK, the mir-coders group
  */
 
@@ -391,17 +391,17 @@ public abstract class ServletModuleUploadedMedia
     String idParam = req.getParameter("id");
     if (idParam!=null && !idParam.equals("")) {
       try {
-        EntityUploadedMedia ent = (EntityUploadedMedia)mainModule.getById(idParam);
+        EntityUploadedMedia ent = (EntityUploadedMedia) mainModule.getById(idParam);
         Entity mediaType = ent.getMediaType();
         MirMedia mediaHandler;
 
-        ServletContext ctx = MirPropertiesConfiguration.getContext();
-        String fName = ent.getId()+"."+mediaType.getValue("name");
-
         mediaHandler = MediaHelper.getHandler(mediaType);
         InputStream in = mediaHandler.getIcon(ent);
 
-        res.setContentType(ctx.getMimeType(fName));
+        if (in==null)
+          throw new ServletModuleExc("no icon available");
+
+        res.setContentType(mediaHandler.getIconMimeType(ent, mediaType));
         //important that before calling this res.getWriter was not called first
         ServletOutputStream out = res.getOutputStream();
 
diff --git a/templates/admin/FUNCTIONS.template b/templates/admin/FUNCTIONS.template
index a7c207ab..b312836c 100755
--- a/templates/admin/FUNCTIONS.template
+++ b/templates/admin/FUNCTIONS.template
@@ -2,53 +2,53 @@
 <function ListTable(contentlist, data_keys, column_head_texts, column_head_CSS, listrow1CSS, listrow2CSS, footer_css, module_name)>
 
 <table cellspacing="2" border="0">
-	
-	<tr>
-		<list column_head_texts as indexVariable>
-			<td class="${column_head_CSS}">
-				<b>${indexVariable}</b>	
-			</td>
-		</list>
-			<td class="${column_head_CSS}">
-				&nbsp;
-			</td>	
-	</tr>
-
-	
+  
+  <tr>
+    <list column_head_texts as indexVariable>
+      <td class="${column_head_CSS}">
+        <b>${indexVariable}</b> 
+      </td>
+    </list>
+      <td class="${column_head_CSS}">
+        &nbsp;
+      </td> 
+  </tr>
+
+  
 <list contentlist as entry>
-	<if grey=="1">
-		<assign grey="0">
-		<tr class="${listrow1CSS}">
-	<else>
-		<assign grey="1"> 
-		<tr class="${listrow2CSS}">
-	</if>
-		
-	<list data_keys as indexVariable>		
-			<td>
-				${entry[indexVariable]}
-			</td>
-	</list>
-		<td>
-			<a class="listcommand" href="${config.actionRoot}?module=${module_name}&do=delete&id=${entry.id}">${lang("delete")}</a>
-			| <a class="listcommand" href="${config.actionRoot}?module=${module_name}&do=edit&id=${entry.id}">${lang("edit")}</a>
-		</td>
-	</tr>
+  <if grey=="1">
+    <assign grey="0">
+    <tr class="${listrow1CSS}">
+  <else>
+    <assign grey="1"> 
+    <tr class="${listrow2CSS}">
+  </if>
+    
+  <list data_keys as indexVariable>   
+      <td>
+        ${entry[indexVariable]}
+      </td>
+  </list>
+    <td>
+      <a class="listcommand" href="${config.actionRoot}?module=${module_name}&do=delete&id=${entry.id}">${lang("delete")}</a>
+      | <a class="listcommand" href="${config.actionRoot}?module=${module_name}&do=edit&id=${entry.id}">${lang("edit")}</a>
+    </td>
+  </tr>
 </list>
-	
-	
-	<tr>		
-		<td colspan="${column_nr}" class="table-foot">
-			${data.count} ${lang("records")} / ${lang("show_from_to", data.from, data.to)}
-		</td>
-	</tr>
+  
+  
+  <tr>    
+    <td colspan="${column_nr}" class="table-foot">
+      ${data.count} ${lang("records")} / ${lang("show_from_to", data.from, data.to)}
+    </td>
+  </tr>
 
 </table>
 </function>
 
 <comment>creates browse links, only called if necessary</comment>
 <function PrevNextPage(module_name)>
-	<p>
+  <p>
       <if (data.prev || data.next)>
         <form method="post" action="${config.actionRoot}">
           <input type="hidden" name="module" value="${module_name}">
@@ -65,7 +65,7 @@
           </if>
         </form>
       </if>
-	</p>
+  </p>
 </function>
 
 <comment>extra navigation</comment>
@@ -74,7 +74,7 @@
       <a class="link-box" href="${config.actionRoot}?module=${module_name}&do=add">[+] ${lang("add")}</a> &nbsp;
       <a class="link-box" href="${config.actionRoot}?module=${module_jumpback}&do=${do_jumpback}">[&lt;] ${lang("back")} </a> &nbsp;
       <a class="link-box" href="${config.actionRoot}">[&lt;&lt;&lt;] ${lang("head.start")}</a>
-	</p>
+  </p>
 </function>
 
 
@@ -98,72 +98,72 @@
 
 <comment>4 functions to create Table rows with input-fields</comment>
 <function TextInputTableRow (label, size, maxlength, fieldname, fieldcontent)>
-	<tr>
-		<td align="right" class="table-left">
-			<b>${label}:</b>
-		</td>
-		
-		<td class="listrow2">
-			<input type="text" size="${size}" maxlength="${maxlength}" name="${fieldname}" value="${utility.encodeHTML(fieldcontent)}">
-		</td>
-	</tr>
+  <tr>
+    <td align="right" class="table-left">
+      <b>${label}:</b>
+    </td>
+    
+    <td class="listrow2">
+      <input type="text" size="${size}" maxlength="${maxlength}" name="${fieldname}" value="${utility.encodeHTML(fieldcontent)}">
+    </td>
+  </tr>
 </function>
 
 <function TextInputTableRowLight (label, size, maxlength, fieldname, fieldcontent)>
-	<tr>
-		<td align="right" class="table-left-light">
-			<b>${label}:</b>
-		</td>
-		
-		<td class="listrow1">
-			<input type="text" size="${size}" maxlength="${maxlength}" name="${fieldname}" value="${utility.encodeHTML(fieldcontent)}">
-		</td>
-	</tr>
+  <tr>
+    <td align="right" class="table-left-light">
+      <b>${label}:</b>
+    </td>
+    
+    <td class="listrow1">
+      <input type="text" size="${size}" maxlength="${maxlength}" name="${fieldname}" value="${utility.encodeHTML(fieldcontent)}">
+    </td>
+  </tr>
 </function>
 
 <function CheckboxTableRow (label, fieldname, fieldcontent )>
-	<tr>
-		<td align="right" valign="top" class="table-left">
-			<b>${label}:</b>
-		</td>
-		
-		<td class="listrow2">
-			<input type="checkbox" name="${fieldname}" value="1"<if fieldcontent=="1"> checked</if>>&nbsp;&nbsp;
-		</td>
-	</tr>
-</function>	
+  <tr>
+    <td align="right" valign="top" class="table-left">
+      <b>${label}:</b>
+    </td>
+    
+    <td class="listrow2">
+      <input type="checkbox" name="${fieldname}" value="1"<if fieldcontent=="1"> checked</if>>&nbsp;&nbsp;
+    </td>
+  </tr>
+</function> 
 
 <function TextAreaTableRow (label, hint, cols, rows, fieldname, fieldcontent )>
-	<tr>
-		<td align="right" valign="top" class="table-left">
-			<b>${label}:</b>
-			<if hint>
+  <tr>
+    <td align="right" valign="top" class="table-left">
+      <b>${label}:</b>
+      <if hint>
         <br>
-        <span class="small">${hint}</span>			
+        <span class="small">${hint}</span>      
       </if>
-		</td>
-		
-		<td class="listrow2">
-			<textarea cols="${cols}" rows="${rows}" name="${fieldname}" wrap="virtual">${utility.encodeHTML(fieldcontent)}</textarea>
-		</td>
-	</tr>
+    </td>
+    
+    <td class="listrow2">
+      <textarea cols="${cols}" rows="${rows}" name="${fieldname}" wrap="virtual">${utility.encodeHTML(fieldcontent)}</textarea>
+    </td>
+  </tr>
 </function>
 
 
 <function TextAreaTableRowLight (label, hint, cols, rows, fieldname, fieldcontent )>
-	<tr>
-		<td align="right" valign="top" class="table-left-light">
-			<b>${label}:</b>
-			<if hint>
+  <tr>
+    <td align="right" valign="top" class="table-left-light">
+      <b>${label}:</b>
+      <if hint>
         <br>
-        <span class="small">${hint}</span>			
+        <span class="small">${hint}</span>      
       </if>
-		</td>
-		
-		<td class="listrow1">
-			<textarea cols="${cols}" rows="${rows}" name="${fieldname}" wrap="virtual">${utility.encodeHTML(fieldcontent)}</textarea>
-		</td>
-	</tr>
+    </td>
+    
+    <td class="listrow1">
+      <textarea cols="${cols}" rows="${rows}" name="${fieldname}" wrap="virtual">${utility.encodeHTML(fieldcontent)}</textarea>
+    </td>
+  </tr>
 </function>
 
 <comment>complete search-form for contenentries, not sure if it works from everywhere</comment>
@@ -181,12 +181,12 @@
             <td <if layout>class="table-head"<else>class="small bg-neutral"</if> valign="bottom"> ${lang("contentsearch.publishedstate")}</td>
             <td <if layout>class="table-head"<else>class="small bg-neutral"</if> valign="bottom"> ${lang("contentsearch.articletype")}</td>
             <td <if layout>class="table-head"<else>class="small bg-neutral"</if> valign="bottom"> ${lang("contentsearch.order")}</td>
-			<td <if layout>class="table_head"<else>class="small bg_neutral"</if> valign="bottom"> &nbsp;</td>
+      <td <if layout>class="table_head"<else>class="small bg_neutral"</if> valign="bottom"> &nbsp;</td>
           </tr>
           <tr>
             <td <if layout>class="listrow2"</if>><input type="text" size="10" maxlength="20" name="searchvalue" value="${searchvalue}"></td>
             <td <if layout>class="listrow2"</if>>
-        	      <select name="searchfield">
+                <select name="searchfield">
                   <option value="title"<if searchfield=="title"> selected</if>>${lang("contentsearch.field.title")}</option>
                   <option value="creator"<if searchfield=="creator"> selected</if>>${lang("contentsearch.field.creator")}</option>
                   <option value="contents"<if searchfield=="content"> selected</if>>${lang("contentsearch.field.contents")}</option>
@@ -226,44 +226,44 @@
 
 <comment>browse function, only called if necessary</comment>
 <function PrevNext (align)>
-	<if prevurl || nexturl>      
-		<p align="${align}">
-		<if prevurl>
-			<a class="link-box" href="${config.actionRoot}?${prevurl}"> [ &lt; ] ${lang("list.previous")}</a>&nbsp;&nbsp; 
-		</if>
-		<if nexturl>
-			<a  class="link-box" href="${config.actionRoot}?${nexturl}">   ${lang("list.next")} [ &gt; ]</a>
-		</if>
-		</p>
-	</if>
+  <if prevurl || nexturl>      
+    <p align="${align}">
+    <if prevurl>
+      <a class="link-box" href="${config.actionRoot}?${prevurl}"> [ &lt; ] ${lang("list.previous")}</a>&nbsp;&nbsp; 
+    </if>
+    <if nexturl>
+      <a  class="link-box" href="${config.actionRoot}?${nexturl}">   ${lang("list.next")} [ &gt; ]</a>
+    </if>
+    </p>
+  </if>
 </function>
 
 <comment>multifunctional help - popup or not - big or small designs</comment>
 <function Help (HelpUrl, popup, big )>
-	<if popup>
-		
-		<Script Language="JavaScript">
-			<!-- 
-			function openwindowlink() {
-			newwin = window.open("${HelpUrl}","windowname","height=320,width=320,top=200,left=300, scrollbars,resizable")
-			}
-			// end hiding -->
-		</Script>
-		
-		<a href="JavaScript: openwindowlink()">
-			<if big><span class="link-help"><else><span class="link-help-small"></if>
-				<if big> [ ? ] ${lang("help")}<else>[?]</if>
-			</span>
-		</a>		
-	
-	<else>
-		
-		<if big>
-			<a href="${HelpUrl}" target="_blank"><span class="link-help"> [ ? ] ${lang("help")}</span></a>
-		<else>
-			<a href="${HelpUrl}" target="_blank"><span class="link-help-small">[?]</span></a>		
-		</if>
-	</if>
+  <if popup>
+    
+    <Script Language="JavaScript">
+      <!-- 
+      function openwindowlink() {
+      newwin = window.open("${HelpUrl}","windowname","height=320,width=320,top=200,left=300, scrollbars,resizable")
+      }
+      // end hiding -->
+    </Script>
+    
+    <a href="JavaScript: openwindowlink()">
+      <if big><span class="link-help"><else><span class="link-help-small"></if>
+        <if big> [ ? ] ${lang("help")}<else>[?]</if>
+      </span>
+    </a>    
+  
+  <else>
+    
+    <if big>
+      <a href="${HelpUrl}" target="_blank"><span class="link-help"> [ ? ] ${lang("help")}</span></a>
+    <else>
+      <a href="${HelpUrl}" target="_blank"><span class="link-help-small">[?]</span></a>   
+    </if>
+  </if>
 </function>
 
 
@@ -287,93 +287,93 @@
   </if>
 
   <table cellspacing="2" cellpadding="2">
-		<tr>
-			<td class="table-head" colspan="2">
-				${lang("content.attachments")}
-			</td>
-		</tr>
-
-		<tr>
-			<td align=right valign=top class="table-left">
-				${lang("content.images")}: 
-			</td>
-			<td align="left" valign="top" class="listrow2">
-				<a href="${config.actionRoot}?module=Images&do=list&${objectKey}=${anObject.id}">[+] ${lang("content.addimage")}</a> |
-				<a href="${config.actionRoot}?module=Images&do=add&${objectKey}=${anObject.id}">${lang("content.uploadimage")}</a>
-			</td>
-		</tr>
-		<list anObject.to_all_media_images as m>
-			<tr>
-			<td align=right valign=top>
-				<a href="${config.actionRoot}?module=Images&do=edit&id=${m["id"]}"><img src="${config.actionRoot}?module=Images&do=getIcon&id=${m["id"]}" alt="edit" border="0"></a>&nbsp;
-			</td>
-			<td align="left" valign="top">
-				<a href="${config.actionRoot}?module=${objectModule}&do=dettach&${objectKey}=${anObject.id}&mid=${m["id"]}">[-] ${lang("delete")}</a>
-			</td>
-			</tr>
-		</list>
-		
-
-		<tr>
-			<td align=right valign=top class="table-left">
-			${lang("content.audio")}:
-			</td>
-			<td align="left" valign="top" class="listrow2">
-				<a href="${config.actionRoot}?module=Audio&do=list&${objectKey}=${anObject.id}">[+] ${lang("content.addaudio")}</a> |
-				<a href="${config.actionRoot}?module=Audio&do=add&${objectKey}=${anObject.id}">${lang("content.uploadaudio")}</a>
-			</td>
-		</tr>
-		<list anObject.to_all_media_audio as m>
-			<tr>
-			<td align=right valign=top>
-				<a href="${config.actionRoot}?module=Audio&do=edit&id=${m["id"]}"><img src="${config.docRoot}/img/${m["big_icon"]}" alt="edit" border="0"></a>&nbsp;
-			</td>
-			<td align="left" valign="top">
-				<a href="${config.actionRoot}?module=${objectModule}&do=dettach&${objectKey}=${anObject.id}&mid=${m["id"]}">[-] ${lang("delete")}</a>
-			</td>
-			</tr>
-		</list>
-		
-
-		<tr>
-			<td align=right valign=top class="table-left">
-				${lang("content.video")}:
-			</td>
-			<td  align="left" valign="top" class="listrow2">
-				<a href="${config.actionRoot}?module=Video&do=list&${objectKey}=${anObject.id}">[+] ${lang("content.addvideo")}</a> |
-				<a href="${config.actionRoot}?module=Video&do=add&${objectKey}=${anObject.id}">${lang("content.uploadvideo")}</a>
-			</td>
-		</tr>
-		<list anObject.to_all_media_video as m>
-			<tr>
-			<td align=right valign=top>
-				<a href="${config.actionRoot}?module=Video&do=edit&id=${m["id"]}"><img src="${config.docRoot}/img/${m["big_icon"]}" alt="edit" border="0"></a>&nbsp;				
-			</td>
-			<td align="left" valign="top">
-				<a href="${config.actionRoot}?module=${objectModule}&do=dettach&${objectKey}=${anObject.id}&mid=${m["id"]}">[-] ${lang("delete")}</a>
-			</td>
-			</tr>
-		</list>
-		
-		<tr>
-			<td align=right valign=top class="table-left">
-				${lang("content.other")}:
-			</td>
-			<td align="left" valign="top" class="listrow2">
-			<a href="${config.actionRoot}?module=OtherMedia&do=list&${objectKey}=${anObject.id}">[+] ${lang("content.addother")}</a> |
-			<a href="${config.actionRoot}?module=OtherMedia&do=add&${objectKey}=${anObject.id}">${lang("content.uploadother")}</a>
-			</td>
-		</tr>
-		<list anObject.to_all_media_other as m>
-			<tr>
-			<td align=right valign=top">
-			<a href="${config.actionRoot}?module=Video&do=edit&id=${m["id"]}"><img src="${config.docRoot}/img/${m["big_icon"]}" alt="edit" border="0"></a>&nbsp;	
-			</td>
-			<td align="left" valign="top">
-				<a href="${config.actionRoot}?module=${objectModule}&do=dettach&${objectKey}=${anObject.id}&mid=${m["id"]}">[-] ${lang("delete")}</a>
-			</td>
-			</tr>
-		</list>
+    <tr>
+      <td class="table-head" colspan="2">
+        ${lang("content.attachments")}
+      </td>
+    </tr>
+
+    <tr>
+      <td align=right valign=top class="table-left">
+        ${lang("content.images")}: 
+      </td>
+      <td align="left" valign="top" class="listrow2">
+        <a href="${config.actionRoot}?module=Images&do=list&${objectKey}=${anObject.id}">[+] ${lang("content.addimage")}</a> |
+        <a href="${config.actionRoot}?module=Images&do=add&${objectKey}=${anObject.id}">${lang("content.uploadimage")}</a>
+      </td>
+    </tr>
+    <list anObject.to_all_media_images as m>
+      <tr>
+      <td align=right valign=top>
+        <a href="${config.actionRoot}?module=Images&do=edit&id=${m["id"]}"><img src="${config.actionRoot}?module=Images&do=getIcon&id=${m["id"]}" alt="edit" border="0"></a>&nbsp;
+      </td>
+      <td align="left" valign="top">
+        <a href="${config.actionRoot}?module=${objectModule}&do=dettach&${objectKey}=${anObject.id}&mid=${m["id"]}">[-] ${lang("delete")}</a>
+      </td>
+      </tr>
+    </list>
+    
+
+    <tr>
+      <td align=right valign=top class="table-left">
+      ${lang("content.audio")}:
+      </td>
+      <td align="left" valign="top" class="listrow2">
+        <a href="${config.actionRoot}?module=Audio&do=list&${objectKey}=${anObject.id}">[+] ${lang("content.addaudio")}</a> |
+        <a href="${config.actionRoot}?module=Audio&do=add&${objectKey}=${anObject.id}">${lang("content.uploadaudio")}</a>
+      </td>
+    </tr>
+    <list anObject.to_all_media_audio as m>
+      <tr>
+      <td align=right valign=top>
+        <a href="${config.actionRoot}?module=Audio&do=edit&id=${m["id"]}"><img src="${config.docRoot}/img/${m["big_icon"]}" alt="edit" border="0"></a>&nbsp;
+      </td>
+      <td align="left" valign="top">
+        <a href="${config.actionRoot}?module=${objectModule}&do=dettach&${objectKey}=${anObject.id}&mid=${m["id"]}">[-] ${lang("delete")}</a>
+      </td>
+      </tr>
+    </list>
+    
+
+    <tr>
+      <td align=right valign=top class="table-left">
+        ${lang("content.video")}:
+      </td>
+      <td  align="left" valign="top" class="listrow2">
+        <a href="${config.actionRoot}?module=Video&do=list&${objectKey}=${anObject.id}">[+] ${lang("content.addvideo")}</a> |
+        <a href="${config.actionRoot}?module=Video&do=add&${objectKey}=${anObject.id}">${lang("content.uploadvideo")}</a>
+      </td>
+    </tr>
+    <list anObject.to_all_media_video as m>
+      <tr>
+      <td align=right valign=top>
+        <a href="${config.actionRoot}?module=Video&do=edit&id=${m["id"]}"><img src="${config.docRoot}/img/${m["big_icon"]}" alt="edit" border="0"></a>&nbsp;        
+      </td>
+      <td align="left" valign="top">
+        <a href="${config.actionRoot}?module=${objectModule}&do=dettach&${objectKey}=${anObject.id}&mid=${m["id"]}">[-] ${lang("delete")}</a>
+      </td>
+      </tr>
+    </list>
+    
+    <tr>
+      <td align=right valign=top class="table-left">
+        ${lang("content.other")}:
+      </td>
+      <td align="left" valign="top" class="listrow2">
+      <a href="${config.actionRoot}?module=OtherMedia&do=list&${objectKey}=${anObject.id}">[+] ${lang("content.addother")}</a> |
+      <a href="${config.actionRoot}?module=OtherMedia&do=add&${objectKey}=${anObject.id}">${lang("content.uploadother")}</a>
+      </td>
+    </tr>
+    <list anObject.to_all_media_other as m>
+      <tr>
+      <td align=right valign=top">
+      <a href="${config.actionRoot}?module=Video&do=edit&id=${m["id"]}"><img src="${config.docRoot}/img/${m["big_icon"]}" alt="edit" border="0"></a>&nbsp;  
+      </td>
+      <td align="left" valign="top">
+        <a href="${config.actionRoot}?module=${objectModule}&do=dettach&${objectKey}=${anObject.id}&mid=${m["id"]}">[-] ${lang("delete")}</a>
+      </td>
+      </tr>
+    </list>
   </table>
 </function>  
 
diff --git a/templates/admin/FUNCTIONS_media.template b/templates/admin/FUNCTIONS_media.template
index a836b66f..bf21f42a 100755
--- a/templates/admin/FUNCTIONS_media.template
+++ b/templates/admin/FUNCTIONS_media.template
@@ -1,6 +1,6 @@
 <comment>
-	the complete medialist-template in two functions
-	not used for image-list because imagelist uses other display method
+  the complete medialist-template in two functions
+  not used for image-list because imagelist uses other display method
 </comment>
 
 <function MediaSearch (module)>
@@ -13,51 +13,51 @@
 <input type="hidden" name="commentid" value="${data.commentid}">
 
 <table border="0" cellspacing="2" cellpadding="2">
-	<tr>
-		<td class="table-head">${lang("search")}:</td>
-		<td class="table-head">${lang("medialist.search_text_in")}:</td>
-		<td class="table-head">${lang("media.published")}:</td>
-		<td class="table-head">${lang("media.mediafolder")}:</td>
-		<td class="table-head">&nbsp;</td>
-		<td><a class="link-box" href="${config.actionRoot}?module=${module}&do=add">[+] ${lang("add")} </a></td>
-	</tr>
+  <tr>
+    <td class="table-head">${lang("search")}:</td>
+    <td class="table-head">${lang("medialist.search_text_in")}:</td>
+    <td class="table-head">${lang("media.published")}:</td>
+    <td class="table-head">${lang("media.mediafolder")}:</td>
+    <td class="table-head">&nbsp;</td>
+    <td><a class="link-box" href="${config.actionRoot}?module=${module}&do=add">[+] ${lang("add")} </a></td>
+  </tr>
 
-	<tr>
-		<td class="listrow2">
-			<input type="text" size="20" maxlength="30" name="query_text" value="${data.query_text}">
-		</td>	
-		<td class="listrow2">
-			<select name="query_field">
-				<option value="title"<if data.query_field=="title"> selected</if>>${lang("media.title")}</option>
-				<option value="creator"<if data.query_field=="creator"> selected</if>>${lang("media.creator")}</option>
-				<option value="place"<if data.query_field=="place"> selected</if>>${lang("media.location")}</option>
-			</select>
-		</td>
-		
-		<td class="listrow2">
-			<select name="query_is_published">
-				<option value="">${lang("dontcare")}</option>
-				<option value="0" <if data.query_is_published=="0"> selected</if>>${lang("no")}</option>
-				<option value="1" <if data.query_is_published=="1"> selected</if>>${lang("yes")}</option>
-			</select>
-		</td>
-		
-		<td class="listrow2">
-		<select name="query_media_folder">
-		<list extra.mediafolderPopupData as m>
-		<option value="${m.key}" <if m.key == data.query_media_folder>selected</if>>${m.value}</option>
-		</list>
-		</select>
-		</td>
-		
-		<td class="listrow2">
-			<input type="submit" name="search" value="${lang("filter")}">
-		</td>
-		
-		<td>
-		&nbsp;
-		</td>
-	</tr>
+  <tr>
+    <td class="listrow2">
+      <input type="text" size="20" maxlength="30" name="query_text" value="${data.query_text}">
+    </td> 
+    <td class="listrow2">
+      <select name="query_field">
+        <option value="title"<if data.query_field=="title"> selected</if>>${lang("media.title")}</option>
+        <option value="creator"<if data.query_field=="creator"> selected</if>>${lang("media.creator")}</option>
+        <option value="place"<if data.query_field=="place"> selected</if>>${lang("media.location")}</option>
+      </select>
+    </td>
+    
+    <td class="listrow2">
+      <select name="query_is_published">
+        <option value="">${lang("dontcare")}</option>
+        <option value="0" <if data.query_is_published=="0"> selected</if>>${lang("no")}</option>
+        <option value="1" <if data.query_is_published=="1"> selected</if>>${lang("yes")}</option>
+      </select>
+    </td>
+    
+    <td class="listrow2">
+    <select name="query_media_folder">
+    <list extra.mediafolderPopupData as m>
+    <option value="${m.key}" <if m.key == data.query_media_folder>selected</if>>${m.value}</option>
+    </list>
+    </select>
+    </td>
+    
+    <td class="listrow2">
+      <input type="submit" name="search" value="${lang("filter")}">
+    </td>
+    
+    <td>
+    &nbsp;
+    </td>
+  </tr>
 </table>
 
 </form>
@@ -69,75 +69,75 @@
 <table>
 
   <tr class="darkgrey" >
-  	<td class="table-head">
-	<b>${lang("media.icon")}</b></td>
-	<td class="table-head">
-	<b>${lang("media.title")}</b></td>
     <td class="table-head">
-	<b>${lang("media.format")}</b></td>
+  <b>${lang("media.icon")}</b></td>
+  <td class="table-head">
+  <b>${lang("media.title")}</b></td>
+    <td class="table-head">
+  <b>${lang("media.format")}</b></td>
     <td class="table-head">
-	<b>${lang("media.size")}</b></td>
+  <b>${lang("media.size")}</b></td>
     <td class="table-head">
-	<b>${lang("media.mediafolder")}</b></td>
+  <b>${lang("media.mediafolder")}</b></td>
     <td class="table-head">
-	<b>${lang("media.creator")}</b></td>
+  <b>${lang("media.creator")}</b></td>
     <td class="table-head">
-	&nbsp;</td>
+  &nbsp;</td>
 
   </tr>
-  	<if data.contentlist>
-  	<list data.contentlist as entry>
-  	<tr <if grey=="1"><assign grey="0">class="listrow1"<else>class="listrow2"<assign grey="1"> </if>>
-		<td>
-  	  		<a href="${config.actionRoot}?module=${module}&do=getMedia&id=${entry.id}">
-	  		<img src="${config.docRoot}/img/${entry.big_icon}" border=0></a>
-		</td>
-  		<td>
-			${entry.title}&nbsp;
-  	  		<if entry.description><br>${entry.description}</if>
-		</td>
-  		<td>
-			${entry.media_descr}&nbsp;
-		</td>
-  		<td>
-			${entry.human_readable_size}&nbsp;
-		</td>
-  		<td>
-			${data.mediafolderHashdata[entry.to_media_folder]["name"]}&nbsp;
-		</td>
-  		<td>
-			${entry.creator}&nbsp;
-		</td>
-  		<td>&nbsp;
-			<if data.articleid>
-				<a href="${config.actionRoot}?module=Content&do=attach&mid=${entry.id}&articleid=${data.articleid}">${lang("attach")}</a>
-			<else>
-			  <if data.commentid>
-				  <a href="${config.actionRoot}?module=Comment&do=attach&mid=${entry.id}&commentid=${data.commentid}">${lang("attach")}</a>
-				<else>
-  				<a href="${config.actionRoot}?module=${module}&do=delete&id=${entry.id}&query_text=${utility.encodeHTML(data.query_text_encoded)}&query_field=${utility.encodeHTML(data.query_field)}&query_is_published=${data.query_is_published}&query_media_folder=${data.query_media_folder}&offset=${data.offset}">${lang("delete")}</a>
-    			| <a href="${config.actionRoot}?module=${module}&do=edit&id=${entry.id}">${lang("edit")}</a>
-    	  </if>
-			</if>
-		</td>
-  	</tr>
-	</list>
-	<tr>
-		<td colspan="7" class="table-foot">
-			${data.count} ${lang("records")} / ${lang("show_from_to", data.from, data.to)}
-		</td>
-	</tr>
+    <if data.contentlist>
+    <list data.contentlist as entry>
+    <tr <if grey=="1"><assign grey="0">class="listrow1"<else>class="listrow2"<assign grey="1"> </if>>
+    <td>
+          <a href="${config.actionRoot}?module=${module}&do=getMedia&id=${entry.id}">
+        <img src="${config.docRoot}/img/${entry.big_icon}" border=0></a>
+    </td>
+      <td>
+      ${entry.title}&nbsp;
+          <if entry.description><br>${entry.description}</if>
+    </td>
+      <td>
+      ${entry.media_descr}&nbsp;
+    </td>
+      <td>
+      ${entry.human_readable_size}&nbsp;
+    </td>
+      <td>
+      ${data.mediafolderHashdata[entry.to_media_folder]["name"]}&nbsp;
+    </td>
+      <td>
+      ${entry.creator}&nbsp;
+    </td>
+      <td>&nbsp;
+      <if data.articleid>
+        <a href="${config.actionRoot}?module=Content&do=attach&mid=${entry.id}&articleid=${data.articleid}">${lang("attach")}</a>
+      <else>
+        <if data.commentid>
+          <a href="${config.actionRoot}?module=Comment&do=attach&mid=${entry.id}&commentid=${data.commentid}">${lang("attach")}</a>
+        <else>
+          <a href="${config.actionRoot}?module=${module}&do=delete&id=${entry.id}&query_text=${utility.encodeHTML(data.query_text_encoded)}&query_field=${utility.encodeHTML(data.query_field)}&query_is_published=${data.query_is_published}&query_media_folder=${data.query_media_folder}&offset=${data.offset}">${lang("delete")}</a>
+          | <a href="${config.actionRoot}?module=${module}&do=edit&id=${entry.id}">${lang("edit")}</a>
+        </if>
+      </if>
+    </td>
+    </tr>
+  </list>
+  <tr>
+    <td colspan="7" class="table-foot">
+      ${data.count} ${lang("records")} / ${lang("show_from_to", data.from, data.to)}
+    </td>
+  </tr>
 
-	<tr>
-		<td>
-			<if data.prev>
-				<a href="${config.actionRoot}?module=${module}&do=list&query_text=${data.query_text_encoded}&query_field=${data.query_field}&query_is_published=${data.query_is_published}&query_media_folder=${data.query_media_folder}&offset=${data.prev}&prev=zur&uuml;ck&articleid=${data.articleid}&commentid=${data.commentid}">${lang("list.previous")}</a>&nbsp;
-			</if>
-			<if data.next>
-				<a href="${config.actionRoot}?module=${module}&do=list&query_text=${data.query_text_encoded}&query_field=${data.query_field}&query_is_published=${data.query_is_published}&query_media_folder=${data.query_media_folder}&offset=${data.next}&next=weiter&articleid=${data.articleid}&commentid=${data.commentid}">${lang("list.next")}</a>
-			</if>
-		</td>
-	</tr>
+  <tr>
+    <td>
+      <if data.prev>
+        <a href="${config.actionRoot}?module=${module}&do=list&query_text=${data.query_text_encoded}&query_field=${data.query_field}&query_is_published=${data.query_is_published}&query_media_folder=${data.query_media_folder}&offset=${data.prev}&prev=zur&uuml;ck&articleid=${data.articleid}&commentid=${data.commentid}">${lang("list.previous")}</a>&nbsp;
+      </if>
+      <if data.next>
+        <a href="${config.actionRoot}?module=${module}&do=list&query_text=${data.query_text_encoded}&query_field=${data.query_field}&query_is_published=${data.query_is_published}&query_media_folder=${data.query_media_folder}&offset=${data.next}&next=weiter&articleid=${data.articleid}&commentid=${data.commentid}">${lang("list.next")}</a>
+      </if>
+    </td>
+  </tr>
 
 <else>
   <tr><td align="center" class="box" colspan="7">${lang("no_matches_found")}</td></tr>
diff --git a/templates/admin/abuse.filters.template b/templates/admin/abuse.filters.template
index 06bd9d9e..1c020483 100755
--- a/templates/admin/abuse.filters.template
+++ b/templates/admin/abuse.filters.template
@@ -34,37 +34,37 @@
 
 <html>
 <head>
-	<title>${config["Mir.Name"]} | ${lang("userlist.htmltitle")}</title>
-	<link rel="stylesheet" type="text/css" href="${config.docRoot}/style/admin.css">
+  <title>${config["Mir.Name"]} | ${lang("userlist.htmltitle")}</title>
+  <link rel="stylesheet" type="text/css" href="${config.docRoot}/style/admin.css">
 </head>
 
 <body marginwidth="0" marginheight="0" topmargin="0" leftmargin="0">
 <include "head.template">
 <p>
-	<a class="link-box" href="${config.actionRoot}?module=Abuse">[ &lt; ] ${lang("back")}</a>&nbsp;&nbsp;
-	<a class="link-box" href="${config.actionRoot}?module=Abuse&do=showlog">${lang("abuse.showlog")}</a>
-	<br><br>
+  <a class="link-box" href="${config.actionRoot}?module=Abuse">[ &lt; ] ${lang("back")}</a>&nbsp;&nbsp;
+  <a class="link-box" href="${config.actionRoot}?module=Abuse&do=showlog">${lang("abuse.showlog")}</a>
+  <br><br>
 </p>
 <table border="0" cellpadding="2" cellspacing="1">
-	<tr>
-		<td class="table-head"><b>${lang("abuse.filter.type")}</b></td>
-		<td class="table-head"><b>${lang("abuse.filter.expression")}</b></td>
-		<td class="table-head"><b>&nbsp;</b></td>
-		<td class="table-head"><b>&nbsp;</b></td>
-	</tr>
+  <tr>
+    <td class="table-head"><b>${lang("abuse.filter.type")}</b></td>
+    <td class="table-head"><b>${lang("abuse.filter.expression")}</b></td>
+    <td class="table-head"><b>&nbsp;</b></td>
+    <td class="table-head"><b>&nbsp;</b></td>
+  </tr>
 
-	<assign grey="0">      
-	<list filters as i>
-		<call showFilterEntry(i.type, i.expression, i.id)>
-	</list>
+  <assign grey="0">      
+  <list filters as i>
+    <call showFilterEntry(i.type, i.expression, i.id)>
+  </list>
 
-	<call showFilterEntry("", "", "")>
-	</table>
+  <call showFilterEntry("", "", "")>
+  </table>
 
-	
+  
 <p>
-	<a class="link-box" href="${config.actionRoot}?module=Abuse">[ &lt; ] ${lang("back")}</a>&nbsp;&nbsp;
-	<a class="link-box" href="${config.actionRoot}?module=Abuse&do=showlog">${lang("abuse.showlog")}</a>
+  <a class="link-box" href="${config.actionRoot}?module=Abuse">[ &lt; ] ${lang("back")}</a>&nbsp;&nbsp;
+  <a class="link-box" href="${config.actionRoot}?module=Abuse&do=showlog">${lang("abuse.showlog")}</a>
 </p>
  
  
diff --git a/templates/admin/abuse.log.template b/templates/admin/abuse.log.template
index 4eb8e2d6..b6b201ce 100755
--- a/templates/admin/abuse.log.template
+++ b/templates/admin/abuse.log.template
@@ -7,11 +7,11 @@
   <body marginwidth="0" marginheight="0" topmargin="0" leftmargin="0">
     <include "head.template">
     
-	<p>
-		<a class="link-box" href="${config.actionRoot}?module=Abuse"> [ &lt; ] ${lang("back")}</a>&nbsp;&nbsp;
-		<a class="link-box" href="${config.actionRoot}?module=Abuse&do=showfilters">${lang("abuse.showfilters")}</a>
-		<br>
-	</p>
+  <p>
+    <a class="link-box" href="${config.actionRoot}?module=Abuse"> [ &lt; ] ${lang("back")}</a>&nbsp;&nbsp;
+    <a class="link-box" href="${config.actionRoot}?module=Abuse&do=showfilters">${lang("abuse.showfilters")}</a>
+    <br>
+  </p>
     <table border="0" cellpadding="2" cellspacing="3">
       <tr class="darkgrey">
         <td class="table-head">${lang("abuse.log.time")}</td>
@@ -35,14 +35,14 @@
           <td>${l.browser}</td>
         </tr>
       </list>
-	  <tr>
-	  	<td colspan="4" class="table-foot">&nbsp;</td>
-	  </tr>
+    <tr>
+      <td colspan="4" class="table-foot">&nbsp;</td>
+    </tr>
     </table>
 
     <p>
       <a class="link-box" href="${config.actionRoot}?module=Abuse"> [ &lt; ] ${lang("back")}</a>&nbsp;&nbsp;
-	  <a class="link-box" href="${config.actionRoot}?module=Abuse&do=showfilters">${lang("abuse.showfilters")}</a>
+    <a class="link-box" href="${config.actionRoot}?module=Abuse&do=showfilters">${lang("abuse.showfilters")}</a>
     </p>
 
     <include "foot.template">
diff --git a/templates/admin/abuse.template b/templates/admin/abuse.template
index 4ac3eff1..05cd2754 100755
--- a/templates/admin/abuse.template
+++ b/templates/admin/abuse.template
@@ -1,7 +1,7 @@
 <html>
 <head>
-	<title>${config["Mir.Name"]} | ${lang("abuse.htmltitle")}</title>
-	<link rel="stylesheet" type="text/css" href="${config.docRoot}/style/admin.css">
+  <title>${config["Mir.Name"]} | ${lang("abuse.htmltitle")}</title>
+  <link rel="stylesheet" type="text/css" href="${config.docRoot}/style/admin.css">
 </head>
 
 <body marginwidth="0" marginheight="0" topmargin="0" leftmargin="0">
@@ -9,7 +9,7 @@
 <include "FUNCTIONS.template">
 <include "head.template">
 <p>
-	<a class="link-box"  href="${config.actionRoot}?module=Admin&do=superusermenu">[ &lt; ] ${lang("back")}</a>
+  <a class="link-box"  href="${config.actionRoot}?module=Admin&do=superusermenu">[ &lt; ] ${lang("back")}</a>
 </p>
 
 <table cellspacing="15">
@@ -17,46 +17,46 @@
 <td valign="top">
 
 <form method="post" action="${config.actionRoot}">
-	<input type="hidden" name="module" value="Abuse">
-	<input type="hidden" name="do" value="savesettings">
+  <input type="hidden" name="module" value="Abuse">
+  <input type="hidden" name="do" value="savesettings">
 
-	<table border="0" cellpadding="2" cellspacing="3">
-		<tr>
-			<td class="table-head"><b>${lang("abuse.setting")}</b></td>
-			<td class="table-head"><b>${lang("abuse.value")}</b></td>
-		</tr>
+  <table border="0" cellpadding="2" cellspacing="3">
+    <tr>
+      <td class="table-head"><b>${lang("abuse.setting")}</b></td>
+      <td class="table-head"><b>${lang("abuse.value")}</b></td>
+    </tr>
 
     <call CheckboxTableRow (lang("abuse.disableopenpostings"), "disableop", disableop)>
     <call CheckboxTableRow (lang("abuse.openpostingpassword"), "passwordop", passwordop)>
-		
-		<tr class="x-small"><td colspan="2">&nbsp;</td></tr>
+    
+    <tr class="x-small"><td colspan="2">&nbsp;</td></tr>
 
     <call CheckboxTableRow (lang("abuse.logpostings"), "logenabled", logenabled)>
     <call TextInputTableRow (lang("abuse.logsize"), 10, 10, "logsize", logsize)>
-		
-		<tr class="x-small"><td colspan="2">&nbsp;</td></tr>		
-		
+    
+    <tr class="x-small"><td colspan="2">&nbsp;</td></tr>    
+    
     <call CheckboxTableRow (lang("abuse.cookies"), "usecookies", usecookies)>
-		
-		<tr class="x-small"><td colspan="2">&nbsp;</td></tr>		
+    
+    <tr class="x-small"><td colspan="2">&nbsp;</td></tr>    
 
     <call PulldownTableRow (lang("abuse.articleaction"), "articleaction", articleactions, "identifier", "resource", articleaction, "content.operation.")>
     <call PulldownTableRow (lang("abuse.commentaction"), "commentaction", commentactions, "identifier", "resource", commentaction, "comment.operation.")>
 
-		<tr>
-			<td colspan="2" class="table-foot">
-				<input class="majorbutton" type="submit" name="submit" value="${lang("save")}">
-			</td>
-		</tr>
-	</table>
+    <tr>
+      <td colspan="2" class="table-foot">
+        <input class="majorbutton" type="submit" name="submit" value="${lang("save")}">
+      </td>
+    </tr>
+  </table>
 </form>
 
 </td>
 <td valign="top">
 
 <p class="box">
-	&gt; <a href="${config.actionRoot}?module=Abuse&do=showlog">${lang("abuse.showlog")}</a><br>
-	&gt; <a href="${config.actionRoot}?module=Abuse&do=showfilters">${lang("abuse.showfilters")}</a>
+  &gt; <a href="${config.actionRoot}?module=Abuse&do=showlog">${lang("abuse.showlog")}</a><br>
+  &gt; <a href="${config.actionRoot}?module=Abuse&do=showfilters">${lang("abuse.showfilters")}</a>
 </p>
 
 </td>
@@ -66,10 +66,10 @@
 
 
 <p>
-	<a class="link-box"  href="${config.actionRoot}?module=Admin&do=superusermenu">[ &lt; ] ${lang("back")}</a>
+  <a class="link-box"  href="${config.actionRoot}?module=Admin&do=superusermenu">[ &lt; ] ${lang("back")}</a>
 </p>
 
-	<include "foot.template">
+  <include "foot.template">
 </body>
 </html>
 
diff --git a/templates/admin/articletype.template b/templates/admin/articletype.template
index a5db3882..5d7c98f9 100755
--- a/templates/admin/articletype.template
+++ b/templates/admin/articletype.template
@@ -8,37 +8,37 @@
 <include "head.template">
 <form action="${config.actionRoot}" method="post">
 
-	<input type="hidden" name="module" value="ArticleType">
-	<input type="hidden" name="id" value="${data.id}">
-	<if data.new>
-		<input type="hidden" name="do" value="insert">
-	<else>
-		<input type="hidden" name="do" value="update">
-	</if>
+  <input type="hidden" name="module" value="ArticleType">
+  <input type="hidden" name="id" value="${data.id}">
+  <if data.new>
+    <input type="hidden" name="do" value="insert">
+  <else>
+    <input type="hidden" name="do" value="update">
+  </if>
     
-	<table border="0">
-		<tr>
-			<td align="right" class="table-left">
-				<B>${lang("articletype.id")}: </B>
-			</td>
-			<td class="listrow2">
-				${data.id}
-			</td>
-		</tr>
+  <table border="0">
+    <tr>
+      <td align="right" class="table-left">
+        <B>${lang("articletype.id")}: </B>
+      </td>
+      <td class="listrow2">
+        ${data.id}
+      </td>
+    </tr>
 
-		<call TextInputTableRow (lang("articletype.name"), 40, 255, "name", data.name)>
+    <call TextInputTableRow (lang("articletype.name"), 40, 255, "name", data.name)>
 
 
-		<tr>
-			<td colspan="2" align="right" class="table-foot">
-				<if data.new>
-					<input type="submit" name="save" value="${lang("insert")}">
-				<else>
-					<input type="submit" name="save" value="${lang("save")}">
-				</if> 
-			</td>
-		</tr>
-	</table>
+    <tr>
+      <td colspan="2" align="right" class="table-foot">
+        <if data.new>
+          <input type="submit" name="save" value="${lang("insert")}">
+        <else>
+          <input type="submit" name="save" value="${lang("save")}">
+        </if> 
+      </td>
+    </tr>
+  </table>
 
 </form>
 
diff --git a/templates/admin/articletypelist.template b/templates/admin/articletypelist.template
index 904a74c5..937896c1 100755
--- a/templates/admin/articletypelist.template
+++ b/templates/admin/articletypelist.template
@@ -5,23 +5,23 @@
   </head>
   <body marginwidth="0" marginheight="0" topmargin="0" leftmargin="0">
     
-		<include "FUNCTIONS.template">
+    <include "FUNCTIONS.template">
     <include "head.template">
 
-		<assign contentlist = data.contentlist>
-		<assign column_nr = 3>
-		<assign data_keys = ["id","name"]>
-		<assign column_head_texts = [lang("articletype.id"), lang("articletype.name")]>
-		<assign column_head_CSS = "table_head">
-		<assign listrow1CSS = "listrow1">
-		<assign listrow2CSS = "listrow2">
-		<assign footer_css = "table_foot">
-		<assign module_name = "ArticleType">
-		<assign module_jumpback = "Admin">
-		<assign do_jumpback = "superusermenu">
-	
+    <assign contentlist = data.contentlist>
+    <assign column_nr = 3>
+    <assign data_keys = ["id","name"]>
+    <assign column_head_texts = [lang("articletype.id"), lang("articletype.name")]>
+    <assign column_head_CSS = "table_head">
+    <assign listrow1CSS = "listrow1">
+    <assign listrow2CSS = "listrow2">
+    <assign footer_css = "table_foot">
+    <assign module_name = "ArticleType">
+    <assign module_jumpback = "Admin">
+    <assign do_jumpback = "superusermenu">
+  
     <include "templates/admin/head.template">
-	
+  
     <call AddOrBack(module_name, module_jumpback, do_jumpback)>
 
     <if data.contentlist>
diff --git a/templates/admin/audio.template b/templates/admin/audio.template
index 86d16eb0..17fb6047 100755
--- a/templates/admin/audio.template
+++ b/templates/admin/audio.template
@@ -16,37 +16,37 @@ function openWin(url) {
 
 <if data.new>
 <form action="${config.actionRoot}?module=Audio&do=add" method="post">
-	<if data.articleid>
-		<input type="hidden" name="articleid" value="${data.articleid}">
-	</if>
-	<if data.commentid>
-		<input type="hidden" name="commentid" value="${data.commentid}">
-	</if>
-	<table border="0">
-		<tr>
-			<td align="right" class="table-left">
-				<b>${lang("media.nr_of_media")} :</b><br>
-			</td>
-			<td class="listrow2">
-				<input type="text" size="3" name="medianum" value="${medianum}">&nbsp;&nbsp;<input type="submit" value="${lang("media.nr_of_media.submit")}">
-			</td>
-		</tr>
-	</table>
+  <if data.articleid>
+    <input type="hidden" name="articleid" value="${data.articleid}">
+  </if>
+  <if data.commentid>
+    <input type="hidden" name="commentid" value="${data.commentid}">
+  </if>
+  <table border="0">
+    <tr>
+      <td align="right" class="table-left">
+        <b>${lang("media.nr_of_media")} :</b><br>
+      </td>
+      <td class="listrow2">
+        <input type="text" size="3" name="medianum" value="${medianum}">&nbsp;&nbsp;<input type="submit" value="${lang("media.nr_of_media.submit")}">
+      </td>
+    </tr>
+  </table>
 </form>
 </if>
 
 
     <form enctype="multipart/form-data" method="post" action="${config.actionRoot}?module=Audio&do=<if data.new>insert<else>update</if>&id=${data.id}">
-    	<if data.articleid>
-    		<input type="hidden" name="articleid" value="${data.articleid}">
-    	</if>
-    	<if data.commentid>
-    		<input type="hidden" name="commentid" value="${data.commentid}">
-    	</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}">
+      <if data.articleid>
+        <input type="hidden" name="articleid" value="${data.articleid}">
+      </if>
+      <if data.commentid>
+        <input type="hidden" name="commentid" value="${data.commentid}">
+      </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">
     
@@ -55,8 +55,8 @@ function openWin(url) {
           <td align="right" valign="top">
             <a href="${config.actionRoot}?module=Audio&do=getMedia&id=${data.id}">
             <img src="${config.docRoot}/img/${data.big_icon}" border=0></a>&nbsp;&nbsp;
-      		</td>
-      		<td valign="bottom" class="small">
+          </td>
+          <td valign="bottom" class="small">
             ${lang("media.created")}: ${data.webdb_create}
             <if data.webdb_lastchange>/ ${lang("media.changed")} ${data.webdb_lastchange}</if><br>
             <if data.is_published=="1">${lang("media.published")}: ${data.publish_date} / ${data.publish_server}${data.publish_path}<br></if>
@@ -67,19 +67,19 @@ function openWin(url) {
           </tr>
         </if>
       
-      	<tr>
-      		<td align="right" class="table-left">
-      			<b>${lang("media.mediafolder")}:</b>
-      		</td>
-      		<td class="listrow2">
-      			<select name="to_media_folder">
-       			<list extra.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" class="table-left">
+            <b>${lang("media.mediafolder")}:</b>
+          </td>
+          <td class="listrow2">
+            <select name="to_media_folder">
+            <list extra.mediafolderPopupData as m>
+              <option value="${m.key}" <if m.key == data.to_media_folder>selected</if>>${m.value}</option>
+            </list>
+              </select>
+          </td>
+        </tr>
+        
           <if !data.new>
             <call TextInputTableRow (lang("media.title"), 40, 80, "title", data.title)>
           </if>
@@ -88,40 +88,40 @@ function openWin(url) {
           <call TextAreaTableRow  (lang("media.description"), "", 40, 2, "description", data.description)>
           <call TextAreaTableRow  (lang("media.comment"), "", 40, 2, "comment", data.comment)>
           <call TextInputTableRow (lang("media.source"), 40, 80, "source", data.source)>
-      	
+        
           <tr><td colspan="2" class="x-small">&nbsp;</td></tr>
-      	
-      	
-        	<if data.new>
-          	<tr>
-          		<td align="right" class="table-left">
-          			${lang("media.is_published")} : 
-          		</td>
-          		<td class="listrow2" style='border: 1px solid #FF0000;'>
-          			<input type="checkbox" name="is_published" value="1"<if data.is_published!="0" && data.is_published!=""> checked</if>> 
-          		</td>
-          	</tr>
-          	<tr><td colspan="2" class="x-small">&nbsp;</td></tr>
-        	
-          	<list data.mediafields as m>
-            	<tr>
-            		<td align="right" class="table-left">
-            			<B>${lang("media.title")}:<B>
-            		 </td>
-            		<td class="listrow2">
-            			<input type="text" name="media_title${m}" size="40" maxlength="80" value="">
-            		</td>
-            	</tr>
-            	<tr>
-            		<td align="right">
-            			&nbsp;
-            		</td>
-            		<td class="listrow2">
-            			<input type="file" name="media${m}"><br>
-            		</td>
-            	</tr>
-          	</list>
-        	</if>
+        
+        
+          <if data.new>
+            <tr>
+              <td align="right" class="table-left">
+                ${lang("media.is_published")} : 
+              </td>
+              <td class="listrow2" style='border: 1px solid #FF0000;'>
+                <input type="checkbox" name="is_published" value="1"<if data.is_published!="0" && data.is_published!=""> checked</if>> 
+              </td>
+            </tr>
+            <tr><td colspan="2" class="x-small">&nbsp;</td></tr>
+          
+            <list data.mediafields as m>
+              <tr>
+                <td align="right" class="table-left">
+                  <B>${lang("media.title")}:<B>
+                 </td>
+                <td class="listrow2">
+                  <input type="text" name="media_title${m}" size="40" maxlength="80" value="">
+                </td>
+              </tr>
+              <tr>
+                <td align="right">
+                  &nbsp;
+                </td>
+                <td class="listrow2">
+                  <input type="file" name="media${m}"><br>
+                </td>
+              </tr>
+            </list>
+          </if>
       
           <td colspan="2" align="right" class="table-foot">
             <if data.new>
diff --git a/templates/admin/audiolist.template b/templates/admin/audiolist.template
index 0a67543a..5d8916a7 100755
--- a/templates/admin/audiolist.template
+++ b/templates/admin/audiolist.template
@@ -1,6 +1,6 @@
 <html>
 <head>
-	<title>${config["Mir.Name"]} | ${lang("audiolist.htmltitle")}</title>
+  <title>${config["Mir.Name"]} | ${lang("audiolist.htmltitle")}</title>
         <link rel="stylesheet" type="text/css" href="${config.docRoot}/style/admin.css">
 </head>
 
diff --git a/templates/admin/breaking.template b/templates/admin/breaking.template
index 8292cf43..3ec12430 100755
--- a/templates/admin/breaking.template
+++ b/templates/admin/breaking.template
@@ -11,16 +11,16 @@
 
 
 <form action="${config.actionRoot}" method="post">
-	<input type="hidden" name="module" value="Breaking">
-	<input type="hidden" name="id" value="${data.id}">
-	<if data.new><input type="hidden" name="do" value="insert">
-	<else><input type="hidden" name="do" value="update"></if>
+  <input type="hidden" name="module" value="Breaking">
+  <input type="hidden" name="id" value="${data.id}">
+  <if data.new><input type="hidden" name="do" value="insert">
+  <else><input type="hidden" name="do" value="update"></if>
 <table border="0">
   
   <tr>
     <td align="right" class="table-left">
-	 <B>${lang("breaking.date")}:</B>
-	</td>
+   <B>${lang("breaking.date")}:</B>
+  </td>
     <td class="listrow2">
       ${data.webdb_create_formatted}
     </td>
@@ -30,19 +30,19 @@
   
   <tr>
     <td align="right" class="table-left">
-	<B>${lang("breaking.text")}:</B><br> ${lang("breaking.textinfo")}</td>
+  <B>${lang("breaking.text")}:</B><br> ${lang("breaking.textinfo")}</td>
     <td class="listrow2">
-	 <textarea cols="50" rows="5" name="text" wrap=virtual>${data.text}</textarea>
+   <textarea cols="50" rows="5" name="text" wrap=virtual>${data.text}</textarea>
     </td>
   </tr>
 
   <tr>
     <td colspan="2" align="right" class="table-foot">
-		<if data.new>
-			<input type="submit" name="save" value="${lang("insert")}">
-		<else>
-			<input type="submit" name="save" value="${lang("save")}">
-		</if> 
+    <if data.new>
+      <input type="submit" name="save" value="${lang("insert")}">
+    <else>
+      <input type="submit" name="save" value="${lang("save")}">
+    </if> 
     </td>
 </table>
 </form>
diff --git a/templates/admin/breakinglist.template b/templates/admin/breakinglist.template
index 2c074688..9b2cef8e 100755
--- a/templates/admin/breakinglist.template
+++ b/templates/admin/breakinglist.template
@@ -1,46 +1,46 @@
 <html>
 <head>
-	<title>${config["Mir.Name"]} | ${lang("breakinglist.htmltitle")}</title>
+  <title>${config["Mir.Name"]} | ${lang("breakinglist.htmltitle")}</title>
         <link rel="stylesheet" type="text/css" href="${config.docRoot}/style/admin.css">
 </head>
 
 <body marginwidth="0" marginheight="0" topmargin="0" leftmargin="0">
 
-  	<include "FUNCTIONS.template">
+    <include "FUNCTIONS.template">
   
     <include "head.template">
 
-		<comment>configure this template here</comment>
-		<assign contentlist =
-		 data.contentlist>
-		<assign column_nr = 3>
-		<assign column_head_texts = [lang("breaking.date"), lang("breaking.text")]>
-		<assign data_keys = ["webdb_create_formatted", "text",]>
-		<assign column_head_CSS = "table_head">
-		<assign listrow1CSS = "listrow1">
-		<assign listrow2CSS = "listrow2">
-		<assign footer_css = "table_foot">
-		<assign module_name = "Breaking">
-		<assign module_jumpback = "Admin">
-		<assign do_jumpback = "">
+    <comment>configure this template here</comment>
+    <assign contentlist =
+     data.contentlist>
+    <assign column_nr = 3>
+    <assign column_head_texts = [lang("breaking.date"), lang("breaking.text")]>
+    <assign data_keys = ["webdb_create_formatted", "text",]>
+    <assign column_head_CSS = "table_head">
+    <assign listrow1CSS = "listrow1">
+    <assign listrow2CSS = "listrow2">
+    <assign footer_css = "table_foot">
+    <assign module_name = "Breaking">
+    <assign module_jumpback = "Admin">
+    <assign do_jumpback = "">
 
     <if data.contentlist>
-	
-	<p>
+  
+  <p>
       <a class="link-box" href="${config.actionRoot}?module=Breaking&do=add">[+] ${lang("add")}</a> &nbsp;
       <a class="link-box" href="${config.actionRoot}">[&lt;&lt;&lt;] ${lang("head.start")}</a>
-	</p>
-		
-		<call ListTable(contentlist, data_keys, column_head_texts, column_head_CSS, listrow1CSS, listrow2CSS, footer_css, module_name)>	  
-		<call PrevNextPage(module_name)>	  
+  </p>
+    
+    <call ListTable(contentlist, data_keys, column_head_texts, column_head_CSS, listrow1CSS, listrow2CSS, footer_css, module_name)>   
+    <call PrevNextPage(module_name)>    
    <else>
-		<P align="center" class="box">${lang("no_matches_found")}</p>
+    <P align="center" class="box">${lang("no_matches_found")}</p>
     </if>
     
-	 <p>
+   <p>
       <a class="link-box" href="${config.actionRoot}?module=Breaking&do=add">[+] ${lang("add")}</a> &nbsp;
       <a class="link-box" href="${config.actionRoot}">[&lt;&lt;&lt;] ${lang("head.start")}</a>
-	</p>
+  </p>
 
 
     <include "foot.template">
diff --git a/templates/admin/comment.template b/templates/admin/comment.template
index 659759e1..9d2b339b 100755
--- a/templates/admin/comment.template
+++ b/templates/admin/comment.template
@@ -5,25 +5,25 @@
   <head>
 
   <body marginwidth="0" marginheight="0" topmargin="0" leftmargin="0">
-	
-	<include "FUNCTIONS.template">
+  
+  <include "FUNCTIONS.template">
     <include "head.template">
       
     <form method="post" action="${config.actionRoot}">
-    	<input type="hidden" name="module" value="Comment">
-    	<input type="hidden" name="id" value="${utility.encodeHTML(comment.id)}">
-    	<if new=="1"> 
-    	  <input type="hidden" name="do" value="insert">
-    	<else>	 
-    	  <input type="hidden" name="do" value="update">
-    	</if>
+      <input type="hidden" name="module" value="Comment">
+      <input type="hidden" name="id" value="${utility.encodeHTML(comment.id)}">
+      <if new=="1"> 
+        <input type="hidden" name="do" value="insert">
+      <else>   
+        <input type="hidden" name="do" value="update">
+      </if>
     
-    	<table border="0">  	
-      	
-		<tr><td colspan="2" class="table-head">${lang("comment.htmltitle")}</td></tr>
-		
-		
-		<tr> 
+      <table border="0">    
+        
+    <tr><td colspan="2" class="table-head">${lang("comment.htmltitle")}</td></tr>
+    
+    
+    <tr> 
           <td align="right" class="table-left">
             ${lang("comment.date")}
           </td>
@@ -35,13 +35,13 @@
 
     <call PulldownTableRow (lang("comment.status"), "to_comment_status", commentstatuses, "id", "name", comment.to_comment_status, "commentstatus.")>
 
-		<call TextInputTableRow (lang("comment.title"), 40, 255, "title", comment.title)>
-		<call TextInputTableRow (lang("comment.creator"), 40, 80, "creator", comment.creator)>
-		<call TextInputTableRow (lang("comment.url"), 40, 255, "main_url", comment.main_url)>
-		<call TextInputTableRow (lang("comment.email"), 40, 80, "email", comment.email)>
-		<call TextInputTableRow (lang("comment.phone"), 40, 80, "phone", comment.phone)>
-		<call TextInputTableRow (lang("comment.address"), 40, 80, "address", comment.address)>
-		
+    <call TextInputTableRow (lang("comment.title"), 40, 255, "title", comment.title)>
+    <call TextInputTableRow (lang("comment.creator"), 40, 80, "creator", comment.creator)>
+    <call TextInputTableRow (lang("comment.url"), 40, 255, "main_url", comment.main_url)>
+    <call TextInputTableRow (lang("comment.email"), 40, 80, "email", comment.email)>
+    <call TextInputTableRow (lang("comment.phone"), 40, 80, "phone", comment.phone)>
+    <call TextInputTableRow (lang("comment.address"), 40, 80, "address", comment.address)>
+    
     <call PulldownTableRow (lang("comment.language"), "to_language", languages, "id", "name", comment.to_language, "")>
     <call CheckboxTableRow       (lang("comment.html"), "is_html", comment.is_html )>
     <call TextAreaTableRow       (lang("comment.text"), "", 70, 15, "description", comment.description)>
@@ -49,8 +49,8 @@
         <tr>
           <td colspan="2" align="right" class="table-foot" > 
             <span class="text">
-      	      ${lang("comment.published")} <input type="checkbox" name="is_published" value="1" <if comment.is_published=="1"> checked</if>>
-      	      <if new=="1">
+              ${lang("comment.published")} <input type="checkbox" name="is_published" value="1" <if comment.is_published=="1"> checked</if>>
+              <if new=="1">
                 <input type="submit" name="save" value="${lang("insert")}">
               <else>
                 <input type="submit" name="save" value="${lang("save")}">
@@ -68,34 +68,34 @@
 <comment>
 <td align="left" valign="top">
 <table cellspacing="3" cellpadding="2">
-	<tr>
-		<td class="table-head" colspan="2">
-			${lang("content.family")}
-		</td>
-	</tr>
-		
-	<tr>
-		<td align=right valign=top class="table-left">
-			${lang("content.parent")}:
-		</td>
-		<td align="left" valign="top" class="listrow2">
-			<if article.parent>
-				<b>${utility.encodeHTML(article.parent.title)}</b><br>
-				<a href="${config.actionRoot}?module=Content&do=edit&id=${article.parent.id}&returnurl=${utility.encodeURI(thisurl)}">${lang("content.viewparent")}</a> |
-				<a href="${config.actionRoot}?module=Content&do=clearparent&id=${article.id}&returnurl=${utility.encodeURI(thisurl)}">${lang("content.clearparent")}</a> |
-			</if>    
-				&nbsp;<a href="${config.actionRoot}?module=Content&do=selectparent&id=${article.id}&returnurl=${utility.encodeURI(thisurl)}">${lang("content.selectparent")}</a>
-		</td>
-	</tr>
-		
-	<tr>
-		<td align=right valign=top class="table-left">
-			${lang("content.children")}:
-		</td>
-		<td align="left" valign="top" class="listrow2">
-			<a href="${config.actionRoot}?module=Content&do=listchildren&article_id=${article.id}">${lang("content.viewchildren")}</a>
-		</td>
-	</tr>
+  <tr>
+    <td class="table-head" colspan="2">
+      ${lang("content.family")}
+    </td>
+  </tr>
+    
+  <tr>
+    <td align=right valign=top class="table-left">
+      ${lang("content.parent")}:
+    </td>
+    <td align="left" valign="top" class="listrow2">
+      <if article.parent>
+        <b>${utility.encodeHTML(article.parent.title)}</b><br>
+        <a href="${config.actionRoot}?module=Content&do=edit&id=${article.parent.id}&returnurl=${utility.encodeURI(thisurl)}">${lang("content.viewparent")}</a> |
+        <a href="${config.actionRoot}?module=Content&do=clearparent&id=${article.id}&returnurl=${utility.encodeURI(thisurl)}">${lang("content.clearparent")}</a> |
+      </if>    
+        &nbsp;<a href="${config.actionRoot}?module=Content&do=selectparent&id=${article.id}&returnurl=${utility.encodeURI(thisurl)}">${lang("content.selectparent")}</a>
+    </td>
+  </tr>
+    
+  <tr>
+    <td align=right valign=top class="table-left">
+      ${lang("content.children")}:
+    </td>
+    <td align="left" valign="top" class="listrow2">
+      <a href="${config.actionRoot}?module=Content&do=listchildren&article_id=${article.id}">${lang("content.viewchildren")}</a>
+    </td>
+  </tr>
 </table>
 
 </td>
@@ -109,12 +109,12 @@
 </if>          
 
     </form>
-	
-	 <p>
+  
+   <p>
       <a class="link-box" href="${config.actionRoot}?module=Comment&do=list">[&lt;] ${lang("list")} </a> &nbsp;
       <a class="link-box" href="${config.actionRoot}">[&lt;&lt;&lt;] ${lang("head.start")}</a>
-	</p>
-	
+  </p>
+  
     <include "foot.template">
   </body>
 </html>
diff --git a/templates/admin/commentlist.template b/templates/admin/commentlist.template
index 3cba7fad..c3b0695e 100755
--- a/templates/admin/commentlist.template
+++ b/templates/admin/commentlist.template
@@ -1,7 +1,7 @@
 <html>
 <head>
-	<title>${config["Mir.Name"]} | ${lang("commentlist.htmltitle")}</title>
-	<link rel="stylesheet" type="text/css" href="${config.docRoot}/style/admin.css">
+  <title>${config["Mir.Name"]} | ${lang("commentlist.htmltitle")}</title>
+  <link rel="stylesheet" type="text/css" href="${config.docRoot}/style/admin.css">
 
 </head>
 
@@ -12,202 +12,202 @@
 <assign grey="0">
 
 <form method="post" action="${config.actionRoot}">
-	<input type="hidden" name="module" value="Comment">
-	<input type="hidden" name="do" value="search">
+  <input type="hidden" name="module" value="Comment">
+  <input type="hidden" name="do" value="search">
    
-	<table border="0" cellpadding="2" cellspacing="3">
-	<tr>
-		<td class="table-head">${lang("commentsearch.field")}</td>
-		<td class="table-head">${lang("commentsearch.value")}</td>
-		<td class="table-head">${lang("commentsearch.publishedstate")}</td>
-		<td class="table-head">${lang("commentsearch.status")}</td>
-		<td class="table-head">${lang("commentsearch.order")}</td>
-		<td class="table-head">&nbsp;</td>
-	</tr>
-
-	<tr>
-		<td class="listrow2">
-			<input type="text"   size="10" maxlength="20" name="searchtext" value="${searchtext}">
-		</td>
-		<td class="listrow2">
-			<select name="searchfield">
-				<option value="title"<if searchfield=="title"> selected</if>>${lang("commentsearch.field.title")}</option>
-				<option value="creator"<if searchfield=="creator"> selected</if>>${lang("commentsearch.field.creator")}</option>
-				<option value="description"<if searchfield=="description"> selected</if>>${lang("commentsearch.field.description")}</option>
-			</select>
-		</td>
-		<td class="listrow2">
-			<select name="searchispublished">
-				<option value="">--</option>
-				<option value="0" <if searchispublished=="0"> selected</if>>${lang("commentsearch.publishedstate.hidden")}</option>
-				<option value="1" <if searchispublished=="1"> selected</if>>${lang("commentsearch.publishedstate.published")}</option>
-			</select>
-		</td>
-		<td class="listrow2">
-			<select name="searchstatus">
-				<option value="">--</option>
-				<list commentstatuses as cs>
-					<option value="${cs.id}" <if searchstatus==cs.id> selected</if>>${lang("commentstatus." + cs.name)}</option>
-				</list>
-			</select>
-		</td>
-		<td class="listrow2">
-			<select name="searchorder">
-				<option value="datedesc" <if searchorder=="datedesc"> selected</if>>${lang("commentsearch.order.datedesc")}</option>
-				<option value="dateasc" <if searchorder=="dateasc"> selected</if>>${lang("commentsearch.order.dateasc")}</option>
-				<option value="articletitle" <if searchorder=="articletitle"> selected</if>>${lang("commentsearch.order.articletitle")}</option>
-			</select>
-		</td>
-		<td class="listrow2">
-			<input class="majorbutton" type="submit" name="search" value="${lang("commentsearch.searchbutton")}">
-		</td>
-	</tr>
+  <table border="0" cellpadding="2" cellspacing="3">
+  <tr>
+    <td class="table-head">${lang("commentsearch.field")}</td>
+    <td class="table-head">${lang("commentsearch.value")}</td>
+    <td class="table-head">${lang("commentsearch.publishedstate")}</td>
+    <td class="table-head">${lang("commentsearch.status")}</td>
+    <td class="table-head">${lang("commentsearch.order")}</td>
+    <td class="table-head">&nbsp;</td>
+  </tr>
+
+  <tr>
+    <td class="listrow2">
+      <input type="text"   size="10" maxlength="20" name="searchtext" value="${searchtext}">
+    </td>
+    <td class="listrow2">
+      <select name="searchfield">
+        <option value="title"<if searchfield=="title"> selected</if>>${lang("commentsearch.field.title")}</option>
+        <option value="creator"<if searchfield=="creator"> selected</if>>${lang("commentsearch.field.creator")}</option>
+        <option value="description"<if searchfield=="description"> selected</if>>${lang("commentsearch.field.description")}</option>
+      </select>
+    </td>
+    <td class="listrow2">
+      <select name="searchispublished">
+        <option value="">--</option>
+        <option value="0" <if searchispublished=="0"> selected</if>>${lang("commentsearch.publishedstate.hidden")}</option>
+        <option value="1" <if searchispublished=="1"> selected</if>>${lang("commentsearch.publishedstate.published")}</option>
+      </select>
+    </td>
+    <td class="listrow2">
+      <select name="searchstatus">
+        <option value="">--</option>
+        <list commentstatuses as cs>
+          <option value="${cs.id}" <if searchstatus==cs.id> selected</if>>${lang("commentstatus." + cs.name)}</option>
+        </list>
+      </select>
+    </td>
+    <td class="listrow2">
+      <select name="searchorder">
+        <option value="datedesc" <if searchorder=="datedesc"> selected</if>>${lang("commentsearch.order.datedesc")}</option>
+        <option value="dateasc" <if searchorder=="dateasc"> selected</if>>${lang("commentsearch.order.dateasc")}</option>
+        <option value="articletitle" <if searchorder=="articletitle"> selected</if>>${lang("commentsearch.order.articletitle")}</option>
+      </select>
+    </td>
+    <td class="listrow2">
+      <input class="majorbutton" type="submit" name="search" value="${lang("commentsearch.searchbutton")}">
+    </td>
+  </tr>
 </table>
 </form>
 
 <if comments>
 <if config["Mir.Localizer.Admin.ListOperationsFlavor"]!="0">
-	<form method="post" action="${config.actionRoot}">
-		<input type="hidden" name="module" value="Localizer">
-		<input type="hidden" name="do" value="commentoperationbatch">
-		<input type="hidden" name="returnurl" value="${utility.encodeHTML(thisurl)}">
-		<p class="box">
-			<input class="majorbutton" type="submit" name="save" value="${lang("save")}">&nbsp; (${lang("commentlist.activate")})
-		</p>
+  <form method="post" action="${config.actionRoot}">
+    <input type="hidden" name="module" value="Localizer">
+    <input type="hidden" name="do" value="commentoperationbatch">
+    <input type="hidden" name="returnurl" value="${utility.encodeHTML(thisurl)}">
+    <p class="box">
+      <input class="majorbutton" type="submit" name="save" value="${lang("save")}">&nbsp; (${lang("commentlist.activate")})
+    </p>
 </if>    
 
 <table border="0" cellpadding="2" cellspacing="3">  
-	<if comments>
-		<tr>
-			<td>
-				<if prevurl>
-					<a href="${config.actionRoot}?${prevurl}">[ ${lang("list.previous")} ]</a>&nbsp;
-				</if>
-				<if nexturl>
-					<a href="${config.actionRoot}?${nexturl}">[ ${lang("list.next")} ]</a>&nbsp;
-				</if>
-			</td>
-		</tr>
-	</if>
-
-	<tr class="table-head">
-		<td valign="top">
-			${lang("comment.date")}
-		</td>
-		<td>
-			${lang("comment.article")} / ${lang("comment.title")} / ${lang("comment.creator")} / ${lang("comment.text")}
-		</td>
-		<td>
-			&nbsp;
-		</td>
-	</tr>
+  <if comments>
+    <tr>
+      <td>
+        <if prevurl>
+          <a href="${config.actionRoot}?${prevurl}">[ ${lang("list.previous")} ]</a>&nbsp;
+        </if>
+        <if nexturl>
+          <a href="${config.actionRoot}?${nexturl}">[ ${lang("list.next")} ]</a>&nbsp;
+        </if>
+      </td>
+    </tr>
+  </if>
+
+  <tr class="table-head">
+    <td valign="top">
+      ${lang("comment.date")}
+    </td>
+    <td>
+      ${lang("comment.article")} / ${lang("comment.title")} / ${lang("comment.creator")} / ${lang("comment.text")}
+    </td>
+    <td>
+      &nbsp;
+    </td>
+  </tr>
     
 <list comments as entry>
-	<tr <if grey=="1"><assign grey="0">class="listrow1"<else><assign grey="1">class="listrow2"</if>>
-		<td valign="top" class="small">
-			${entry.creationdate.formatted["dd.MM.yyyy HH:mm"]}<br>
-			<if entry.is_published=="0"><b>${lang("commentlist.hidden")}</b><else>-</if><br>
-			<br>
-			${lang("comment.status")}: <br>
-			<if entry.status>
-				<b>
-					${lang("commentstatus." + entry.status.name)}
-				</b>
-			<else> 
-				- 
-			</if>
-		</td>
+  <tr <if grey=="1"><assign grey="0">class="listrow1"<else><assign grey="1">class="listrow2"</if>>
+    <td valign="top" class="small">
+      ${entry.creationdate.formatted["dd.MM.yyyy HH:mm"]}<br>
+      <if entry.is_published=="0"><b>${lang("commentlist.hidden")}</b><else>-</if><br>
+      <br>
+      ${lang("comment.status")}: <br>
+      <if entry.status>
+        <b>
+          ${lang("commentstatus." + entry.status.name)}
+        </b>
+      <else> 
+        - 
+      </if>
+    </td>
         
-		<td>
-			<a name="${entry.id}"></a>
-			<if entry.to_content>
-  				<div class="small">
-  				${lang("comment.article")}:
-  				<a href="${config.actionRoot}?module=Content&do=edit&id=${entry.to_content.id}">
-  					${utility.encodeHTML(entry.to_content.title)}
-  				</a>
-        		(${lang("articletypes."+entry.to_content.article_type.name)}) 
-
-        		[
-        		<a href="${config.actionRoot}?module=Content&do=edit&id=${entry.to_content.id}">
-  					${lang("edit")}
+    <td>
+      <a name="${entry.id}"></a>
+      <if entry.to_content>
+          <div class="small">
+          ${lang("comment.article")}:
+          <a href="${config.actionRoot}?module=Content&do=edit&id=${entry.to_content.id}">
+            ${utility.encodeHTML(entry.to_content.title)}
+          </a>
+            (${lang("articletypes."+entry.to_content.article_type.name)}) 
+
+            [
+            <a href="${config.actionRoot}?module=Content&do=edit&id=${entry.to_content.id}">
+            ${lang("edit")}
+            </a> |
+            <a href="${entry.publicurl}">
+              ${lang("start.show")}
             </a> |
-        		<a href="${entry.publicurl}">
-        			${lang("start.show")}
-        		</a> |
-        		<a href="${config.actionRoot}?module=Comment&do=articlecomments&articleid=${entry.to_content.id}">
-        			${lang("commentlist.allcomments")}
-        		</a>
-        		]
-        		</div>
-      		</if>
-
-			
-			<b>${entry.title}</b> &nbsp;
-			<if entry.creator>
-				${lang("by")}: ${entry.creator}
-			</if>
-			<br>
-			${utility.encodeHTML(entry.description)}
-			
-			<if entry.main_url><br>URL: ${entry.main_url}</if>
-			<br>
-<!--			<div class="bg-neutral small">-->
-			<if config["Mir.Localizer.Admin.ListOperationsFlavor"]=="0">
-				<list entry.operations as op>
-					[ <a href="${config.actionRoot}?module=Localizer&do=commentoperation&operation=${op}&id=${entry.id}&returnurl=${utility.encodeURI(thisurl + "#" + entry.id)}">${lang("comment.operation."+op)}</a> ]
-				</list>
-			</if>
-			<if config["Mir.Localizer.Admin.ListOperationsFlavor"]=="1">
-				<list entry.operations as op>
-					 <input type="checkbox" name="operation" value="${entry.id};${op}">${lang("comment.operation."+op)} 
-				</list>
-			</if>
-			<if config["Mir.Localizer.Admin.ListOperationsFlavor"]=="2">
-				<select name="operation">
-					<option value="" selected>&nbsp;</option>
-					<list entry.operations as op>
-						<option value="${entry.id};${op}">${lang("comment.operation."+op)}</option>
-					</list>
-				</select>
-			</if>
-			<if entry.operations>&nbsp;|&nbsp;</if>
-			<a href="${config.actionRoot}?module=Comment&do=edit&id=${entry.id}">${lang("edit")}</a>                
-<!--			</div>-->
-		</td>
+            <a href="${config.actionRoot}?module=Comment&do=articlecomments&articleid=${entry.to_content.id}">
+              ${lang("commentlist.allcomments")}
+            </a>
+            ]
+            </div>
+          </if>
+
       
-		<td valign="top">
-			&nbsp;
+      <b>${entry.title}</b> &nbsp;
+      <if entry.creator>
+        ${lang("by")}: ${entry.creator}
+      </if>
+      <br>
+      ${utility.encodeHTML(entry.description)}
+      
+      <if entry.main_url><br>URL: ${entry.main_url}</if>
+      <br>
+<!--      <div class="bg-neutral small">-->
+      <if config["Mir.Localizer.Admin.ListOperationsFlavor"]=="0">
+        <list entry.operations as op>
+          [ <a href="${config.actionRoot}?module=Localizer&do=commentoperation&operation=${op}&id=${entry.id}&returnurl=${utility.encodeURI(thisurl + "#" + entry.id)}">${lang("comment.operation."+op)}</a> ]
+        </list>
+      </if>
+      <if config["Mir.Localizer.Admin.ListOperationsFlavor"]=="1">
+        <list entry.operations as op>
+           <input type="checkbox" name="operation" value="${entry.id};${op}">${lang("comment.operation."+op)} 
+        </list>
+      </if>
+      <if config["Mir.Localizer.Admin.ListOperationsFlavor"]=="2">
+        <select name="operation">
+          <option value="" selected>&nbsp;</option>
+          <list entry.operations as op>
+            <option value="${entry.id};${op}">${lang("comment.operation."+op)}</option>
+          </list>
+        </select>
+      </if>
+      <if entry.operations>&nbsp;|&nbsp;</if>
+      <a href="${config.actionRoot}?module=Comment&do=edit&id=${entry.id}">${lang("edit")}</a>                
+<!--      </div>-->
+    </td>
+      
+    <td valign="top">
+      &nbsp;
       <if config["Mir.Localizer.Admin.AllowDeleteComment"]=="1">
         <a class="small" href="${config.actionRoot}?module=Comment&do=delete&id=${entry.id}&searchtext=${utility.encodeHTML(searchtext)}&searchfield=${utility.encodeHTML(searchfield)}&searchispublished=${searchispublished}&searchorder=${searchorder}&offset=${offset}">[${lang("delete")}]</a>
       </if>
-		</td>    
-	</tr>
+    </td>    
+  </tr>
 </list>
       
-	<tr>
-		<td colspan="3" class="table-foot">
-			${count} ${lang("records")} / ${lang("show_from_to", from, to)}
-		</td>
-	</tr>
-
-	<tr>
-		<td>
-			<if prevurl>
-				<a href="${config.actionRoot}?${prevurl}">[ ${lang("list.previous")} ]</a>&nbsp;
-			</if>
-			<if nexturl>
-				<a href="${config.actionRoot}?${nexturl}">[ ${lang("list.next")} ]</a>&nbsp;
-			</if>
-		</td>
-	</tr>
+  <tr>
+    <td colspan="3" class="table-foot">
+      ${count} ${lang("records")} / ${lang("show_from_to", from, to)}
+    </td>
+  </tr>
+
+  <tr>
+    <td>
+      <if prevurl>
+        <a href="${config.actionRoot}?${prevurl}">[ ${lang("list.previous")} ]</a>&nbsp;
+      </if>
+      <if nexturl>
+        <a href="${config.actionRoot}?${nexturl}">[ ${lang("list.next")} ]</a>&nbsp;
+      </if>
+    </td>
+  </tr>
 </table>
 
 <if config["Mir.Localizer.Admin.ListOperationsFlavor"]!="0">
-	<p class="box">
-		<input class="majorbutton" type="submit" name="save" value="${lang("save")}"> &nbsp; (${lang("commentlist.activate")})
-	</p>
-	</form>	
+  <p class="box">
+    <input class="majorbutton" type="submit" name="save" value="${lang("save")}"> &nbsp; (${lang("commentlist.activate")})
+  </p>
+  </form> 
 </if>  
   
 <else>
diff --git a/templates/admin/commentstatus.template b/templates/admin/commentstatus.template
index 85736f97..bb778275 100755
--- a/templates/admin/commentstatus.template
+++ b/templates/admin/commentstatus.template
@@ -4,28 +4,28 @@
     <link rel="stylesheet" type="text/css" href="${config.docRoot}/style/admin.css">
   <head>
   <body marginwidth="0" marginheight="0" topmargin="0" leftmargin="0">
-	<include "FUNCTIONS.template">
+  <include "FUNCTIONS.template">
     <include "head.template">
     <form action="${config.actionRoot}" method="post">
 
-    	<input type="hidden" name="module" value="CommentStatus">
-    	<input type="hidden" name="id" value="${data.id}">
-    	<if data.new>
-    	  <input type="hidden" name="do" value="insert">
-    	<else>
-    	  <input type="hidden" name="do" value="update">
-    	</if>
+      <input type="hidden" name="module" value="CommentStatus">
+      <input type="hidden" name="id" value="${data.id}">
+      <if data.new>
+        <input type="hidden" name="do" value="insert">
+      <else>
+        <input type="hidden" name="do" value="update">
+      </if>
     
       <table border="0">
         <tr>
           <td align="right" class="table-left">
-      		<B>${lang("commentstatus.id")}:</B></td>
+          <B>${lang("commentstatus.id")}:</B></td>
           <td class="listrow2">
             ${data.id}
           </td>
         </tr>
         
-		<call TextInputTableRow (lang("commentstatus.name"), 40, 255, "name", data.name)>
+    <call TextInputTableRow (lang("commentstatus.name"), 40, 255, "name", data.name)>
         <tr>
           <td colspan="2" align="right" class="table-foot">
             <span class="witetext">
@@ -40,7 +40,7 @@
       </table>
 
     </form>
-	<p><a class="link-box" href="${config.actionRoot}?module=CommentStatus&do=list">[&lt;] ${lang("back")} </a> &nbsp;</p>
+  <p><a class="link-box" href="${config.actionRoot}?module=CommentStatus&do=list">[&lt;] ${lang("back")} </a> &nbsp;</p>
     <include "foot.template">
   </body>
 </html>
diff --git a/templates/admin/commentstatuslist.template b/templates/admin/commentstatuslist.template
index 3187c891..8944f9bd 100755
--- a/templates/admin/commentstatuslist.template
+++ b/templates/admin/commentstatuslist.template
@@ -4,33 +4,33 @@
     <link rel="stylesheet" type="text/css" href="${config.docRoot}/style/admin.css">
   </head>
   <body marginwidth="0" marginheight="0" topmargin="0" leftmargin="0">
-	
-	<include "FUNCTIONS.template">
+  
+  <include "FUNCTIONS.template">
   
     <include "head.template">
 
-		<comment>configure this template here</comment>
-		<assign contentlist = data.contentlist>
-		<assign column_nr = 3>
-		<assign data_keys = ["id","name"]>
-		<assign column_head_texts = [lang("commentstatus.id"), lang("commentstatus.name")]>
-		<assign column_head_CSS = "table_head">
-		<assign listrow1CSS = "listrow1">
-		<assign listrow2CSS = "listrow2">
-		<assign footer_css = "table_foot">
-		<assign module_name = "CommentStatus">
-		<assign module_jumpback = "Admin">
-		<assign do_jumpback = "superusermenu">
+    <comment>configure this template here</comment>
+    <assign contentlist = data.contentlist>
+    <assign column_nr = 3>
+    <assign data_keys = ["id","name"]>
+    <assign column_head_texts = [lang("commentstatus.id"), lang("commentstatus.name")]>
+    <assign column_head_CSS = "table_head">
+    <assign listrow1CSS = "listrow1">
+    <assign listrow2CSS = "listrow2">
+    <assign footer_css = "table_foot">
+    <assign module_name = "CommentStatus">
+    <assign module_jumpback = "Admin">
+    <assign do_jumpback = "superusermenu">
 
     <if data.contentlist>
-		<call AddOrBack(module_name, module_jumpback, do_jumpback)>
-		<call ListTable(contentlist, data_keys, column_head_texts, column_head_CSS, listrow1CSS, listrow2CSS, footer_css, module_name)>	  
-		<call PrevNextPage(module_name)>	  
+    <call AddOrBack(module_name, module_jumpback, do_jumpback)>
+    <call ListTable(contentlist, data_keys, column_head_texts, column_head_CSS, listrow1CSS, listrow2CSS, footer_css, module_name)>   
+    <call PrevNextPage(module_name)>    
    <else>
-		<P align="center">${lang("no_matches_found")}</p>
+    <P align="center">${lang("no_matches_found")}</p>
     </if>
     
-	<call AddOrBack(module_name, module_jumpback, do_jumpback)>
+  <call AddOrBack(module_name, module_jumpback, do_jumpback)>
 
     <include "foot.template">
   
diff --git a/templates/admin/confirm.template b/templates/admin/confirm.template
index 4411e3c0..a317b1ff 100755
--- a/templates/admin/confirm.template
+++ b/templates/admin/confirm.template
@@ -9,7 +9,7 @@
   <include "head_nonavi.template">
       <form method="post" action="${config.actionRoot}">
       <table><tr><td>
-	  <p class="box-head" align="center"><b>${lang("confirm.really_delete")}</b></p>
+    <p class="box-head" align="center"><b>${lang("confirm.really_delete")}</b></p>
         <p class="box" align="center">
           <input type="hidden" name="module" value="${data.module}">
           <input type="hidden" name="do" value="delete">
@@ -23,12 +23,12 @@
           <input type="hidden" name="offset" value="${data.offset}">
           <input type="submit" name="cancel" value="${lang("cancel")}">
           <input type="submit" name="confirm" value="${lang("delete")}"><br>
-		  <br>
-		  <b><span class="text-alert">${lang("confirm.text")}</span></b>
+      <br>
+      <b><span class="text-alert">${lang("confirm.text")}</span></b>
         </p>
-		
+    
       </td></tr></table>
-	  </form>
+    </form>
 </center>
 <include "foot.template">
   </body>
diff --git a/templates/admin/content.template b/templates/admin/content.template
index 026a7a57..7a821a5c 100755
--- a/templates/admin/content.template
+++ b/templates/admin/content.template
@@ -1,7 +1,7 @@
 <html>
 <head>
-	<title>${lang("content.htmltitle")}</title>
-	<link rel="stylesheet" type="text/css" href="${config.docRoot}/style/admin.css"
+  <title>${lang("content.htmltitle")}</title>
+  <link rel="stylesheet" type="text/css" href="${config.docRoot}/style/admin.css"
 </head>
 
 <body marginwidth="0" marginheight="0" topmargin="0" leftmargin="0">
@@ -10,133 +10,133 @@
 <include "head.template">
 
 <form method="post" action="${config.actionRoot}">
-	<input type="hidden" name="module" value="Content">
-	<input type="hidden" name="id" value="${utility.encodeHTML(article.id)}">
-	<input type="hidden" name="returnurl" value="${utility.encodeHTML(returnurl)}">
-	<if new=="1">
-		<input type="hidden" name="do" value="insert">
-	<else>
-		<input type="hidden" name="do" value="update">
-	</if>
+  <input type="hidden" name="module" value="Content">
+  <input type="hidden" name="id" value="${utility.encodeHTML(article.id)}">
+  <input type="hidden" name="returnurl" value="${utility.encodeHTML(returnurl)}">
+  <if new=="1">
+    <input type="hidden" name="do" value="insert">
+  <else>
+    <input type="hidden" name="do" value="update">
+  </if>
 
 <table width="90%" cellspacing="3" cellpadding="2">
-	<tr>
-		<td align="left" valign="top">
-			<if new=="0">
-				[ <a href="${config.actionRoot}?module=Comment&do=articlecomments&articleid=${article.id}&returnurl=${thisurl}">${lang("content.comments")}</a> ] &nbsp;&nbsp;
-			    [ <a href="${article.publicurl}">${lang("preview")}</a> ]
-			</if>
-			
-		</td>
-		<td align="right" valign="top">
-			${lang("content.published")} :
-			<input type="checkbox" name="is_published" value="1"<if article.is_published!="0" && article.is_published!=""> checked</if>>
-			<if new=="1">
-				<input type="submit" name="save" value="${lang("insert")}">
-			<else>
-				<input type="submit" name="save" value="${lang("save")}">
-			</if>
-		</td>
-	</tr>
-
-	<tr>
-		<td align="right" class="table-left">
-			id # :
-		</td>
-		<td class="listrow2">
-			${article.id}
-		</td>
-	</tr>
-	
-	<tr>
-		<td align="right" class="table-left">
-			${lang("content.lastchange_date")}:
-		</td>
-		<td class="listrow2">
-			${utility.encodeHTML(article.webdb_lastchange)}<br>
-		</td>
-	</tr>
-
-	<tr>
-		<td align="right" valign="top" class="table-left">
-			${lang("content.create_date")}:
-		</td>
-		<td class="listrow2">
-  		${utility.encodeHTML(article.webdb_create)}<br>${lang("edit")}:
-  		<input type="text" size="10" maxlength="16" name="webdb_create" value=""> &nbsp; <span class="small">(yyyy-mm-dd [HH:mm])</span>
-		</td>
-	</tr>
+  <tr>
+    <td align="left" valign="top">
+      <if new=="0">
+        [ <a href="${config.actionRoot}?module=Comment&do=articlecomments&articleid=${article.id}&returnurl=${thisurl}">${lang("content.comments")}</a> ] &nbsp;&nbsp;
+          [ <a href="${article.publicurl}">${lang("preview")}</a> ]
+      </if>
+      
+    </td>
+    <td align="right" valign="top">
+      ${lang("content.published")} :
+      <input type="checkbox" name="is_published" value="1"<if article.is_published!="0" && article.is_published!=""> checked</if>>
+      <if new=="1">
+        <input type="submit" name="save" value="${lang("insert")}">
+      <else>
+        <input type="submit" name="save" value="${lang("save")}">
+      </if>
+    </td>
+  </tr>
+
+  <tr>
+    <td align="right" class="table-left">
+      id # :
+    </td>
+    <td class="listrow2">
+      ${article.id}
+    </td>
+  </tr>
+  
+  <tr>
+    <td align="right" class="table-left">
+      ${lang("content.lastchange_date")}:
+    </td>
+    <td class="listrow2">
+      ${utility.encodeHTML(article.webdb_lastchange)}<br>
+    </td>
+  </tr>
+
+  <tr>
+    <td align="right" valign="top" class="table-left">
+      ${lang("content.create_date")}:
+    </td>
+    <td class="listrow2">
+      ${utility.encodeHTML(article.webdb_create)}<br>${lang("edit")}:
+      <input type="text" size="10" maxlength="16" name="webdb_create" value=""> &nbsp; <span class="small">(yyyy-mm-dd [HH:mm])</span>
+    </td>
+  </tr>
 
 
   <call PulldownTableRow (lang("content.articletype"), "to_article_type", articletypes, "id", "name", article.to_article_type, "articletypes.")>
   <call PulldownTableRow (lang("content.language"), "to_language", languages, "id", "name", article.to_language, "")>
-	
-	<tr>
-		<td align="right" valign="top" class="table-left">
-			${lang("content.topic")}:
-		</td>
-		<td class="listrow2" >
-			<if config["Mir.Localizer.Admin.TopicListFlavor"]!="0">      
-			<table border=0 cellpadding="2" cellspacing="0">
-				<tr> 
-					<assign col=config["Mir.Localizer.Admin.TopicListColumns"]>
-					<list topics as t>
-						<if col=="0">
-				</tr>
-				<tr>
-					<assign col=config["Mir.Localizer.Admin.TopicListColumns"]>
-						</if>
-					<td title="${utility.encodeHTML(t.description)}">
-						<input type="checkbox" name="to_topic" value="${t.id}" <list article.to_topics as to><if (t.id == to["id"])>checked</if></list>>
-						<span class="small"> ${t.title}</span>
-					</td>
-					<assign col=utility.increment(col, "-1")>
-					</list>
-						<if col!="0">
-							<td colspan="${col}">
-								&nbsp;
-							</td>
-						</if>
-				</tr>
-			</table>
-			<else>
-			<select name="to_topic" size="5" multiple>
-				<list topics as t>
-					<option value="${t.id}" <list article.to_topics as to><if (t.id == to["id"])>selected</if></list>>${t.title}</option>
-				</list>
-			</select>
-			</if>        
-		</td>
-	</tr>
-	
-	<call TextInputTableRow      (lang("content.title"), 40, 255, "title", article.title)>
-	<call TextInputTableRowLight (lang("content.subtitle"), 40, 255, "subtitle", article.subtitle)>
-	<call TextInputTableRowLight (lang("content.edittitle"), 40, 255, "edittitle", article.edittitle)>
+  
+  <tr>
+    <td align="right" valign="top" class="table-left">
+      ${lang("content.topic")}:
+    </td>
+    <td class="listrow2" >
+      <if config["Mir.Localizer.Admin.TopicListFlavor"]!="0">      
+      <table border=0 cellpadding="2" cellspacing="0">
+        <tr> 
+          <assign col=config["Mir.Localizer.Admin.TopicListColumns"]>
+          <list topics as t>
+            <if col=="0">
+        </tr>
+        <tr>
+          <assign col=config["Mir.Localizer.Admin.TopicListColumns"]>
+            </if>
+          <td title="${utility.encodeHTML(t.description)}">
+            <input type="checkbox" name="to_topic" value="${t.id}" <list article.to_topics as to><if (t.id == to["id"])>checked</if></list>>
+            <span class="small"> ${t.title}</span>
+          </td>
+          <assign col=utility.increment(col, "-1")>
+          </list>
+            <if col!="0">
+              <td colspan="${col}">
+                &nbsp;
+              </td>
+            </if>
+        </tr>
+      </table>
+      <else>
+      <select name="to_topic" size="5" multiple>
+        <list topics as t>
+          <option value="${t.id}" <list article.to_topics as to><if (t.id == to["id"])>selected</if></list>>${t.title}</option>
+        </list>
+      </select>
+      </if>        
+    </td>
+  </tr>
+  
+  <call TextInputTableRow      (lang("content.title"), 40, 255, "title", article.title)>
+  <call TextInputTableRowLight (lang("content.subtitle"), 40, 255, "subtitle", article.subtitle)>
+  <call TextInputTableRowLight (lang("content.edittitle"), 40, 255, "edittitle", article.edittitle)>
   <comment>
-		<call TextInputTableRowLight ("", 20, 20, "subtitle", article.edittitle)>
+    <call TextInputTableRowLight ("", 20, 20, "subtitle", article.edittitle)>
   </comment>
-	<call TextInputTableRowLight (lang("content.location"), 40, 40, "source", article.source)>
-	<call TextInputTableRow      (lang("content.creator"), 40, 40, "creator", article.creator)>
-	<call TextInputTableRowLight (lang("content.creator.email"), 40, 60, "creator_email", article.creator_email)>
-	<call TextInputTableRowLight (lang("content.creator.url"), 40, 60, "creator_main_url", article.creator_main_url)>
-	<call TextInputTableRowLight (lang("content.creator.address"), 20, 40, "creator_address", article.creator_address)>
-	<call TextInputTableRowLight (lang("content.creator.telephone"), 20, 40, "creator_phone", article.creator_phone)>
+  <call TextInputTableRowLight (lang("content.location"), 40, 40, "source", article.source)>
+  <call TextInputTableRow      (lang("content.creator"), 40, 40, "creator", article.creator)>
+  <call TextInputTableRowLight (lang("content.creator.email"), 40, 60, "creator_email", article.creator_email)>
+  <call TextInputTableRowLight (lang("content.creator.url"), 40, 60, "creator_main_url", article.creator_main_url)>
+  <call TextInputTableRowLight (lang("content.creator.address"), 20, 40, "creator_address", article.creator_address)>
+  <call TextInputTableRowLight (lang("content.creator.telephone"), 20, 40, "creator_phone", article.creator_phone)>
   <call CheckboxTableRow       (lang("content.html"), "is_html", article.is_html )>
-	<call TextAreaTableRow       (lang("content.abstract"), "", 70, 15, "description", article.description)>
-	<call TextAreaTableRow       (lang("content.content"), "", 70, 20, "content_data", article.content_data)>
-	<call TextAreaTableRow       (lang("content.comment"), lang("content.internal"), 70, 6, "comment", article.comment)>
-
-	<tr>
-		<td colspan="2" align="right" valign="top">
-			<if new=="1">
-				<input type="submit" name="save" value="${lang("insert")}">
-			<else>
-				<input type="submit" name="save" value="${lang("save")}">
-			</if>
-		</td>
-	</tr>
+  <call TextAreaTableRow       (lang("content.abstract"), "", 70, 15, "description", article.description)>
+  <call TextAreaTableRow       (lang("content.content"), "", 70, 20, "content_data", article.content_data)>
+  <call TextAreaTableRow       (lang("content.comment"), lang("content.internal"), 70, 6, "comment", article.comment)>
+
+  <tr>
+    <td colspan="2" align="right" valign="top">
+      <if new=="1">
+        <input type="submit" name="save" value="${lang("insert")}">
+      <else>
+        <input type="submit" name="save" value="${lang("save")}">
+      </if>
+    </td>
+  </tr>
 </table>
-	
+  
 <if new=="0">
 
 <table width="90%" cellspacing="0" cellpadding="0">
@@ -145,34 +145,34 @@
 <td align="left" valign="top">
 
 <table cellspacing="3" cellpadding="2">
-	<tr>
-		<td class="table-head" colspan="2">
-			${lang("content.family")}
-		</td>
-	</tr>
-		
-	<tr>
-		<td align=right valign=top class="table-left">
-			${lang("content.parent")}:
-		</td>
-		<td align="left" valign="top" class="listrow2">
-			<if article.parent>
-				<b>${utility.encodeHTML(article.parent.title)}</b><br>
-				<a href="${config.actionRoot}?module=Content&do=edit&id=${article.parent.id}&returnurl=${utility.encodeURI(thisurl)}">${lang("content.viewparent")}</a> |
-				<a href="${config.actionRoot}?module=Content&do=clearparent&id=${article.id}&returnurl=${utility.encodeURI(thisurl)}">${lang("content.clearparent")}</a> |
-			</if>    
-				&nbsp;<a href="${config.actionRoot}?module=Content&do=selectparent&id=${article.id}&returnurl=${utility.encodeURI(thisurl)}">${lang("content.selectparent")}</a>
-		</td>
-	</tr>
-		
-	<tr>
-		<td align=right valign=top class="table-left">
-			${lang("content.children")}:
-		</td>
-		<td align="left" valign="top" class="listrow2">
-			<a href="${config.actionRoot}?module=Content&do=listchildren&article_id=${article.id}">${lang("content.viewchildren")}</a>
-		</td>
-	</tr>
+  <tr>
+    <td class="table-head" colspan="2">
+      ${lang("content.family")}
+    </td>
+  </tr>
+    
+  <tr>
+    <td align=right valign=top class="table-left">
+      ${lang("content.parent")}:
+    </td>
+    <td align="left" valign="top" class="listrow2">
+      <if article.parent>
+        <b>${utility.encodeHTML(article.parent.title)}</b><br>
+        <a href="${config.actionRoot}?module=Content&do=edit&id=${article.parent.id}&returnurl=${utility.encodeURI(thisurl)}">${lang("content.viewparent")}</a> |
+        <a href="${config.actionRoot}?module=Content&do=clearparent&id=${article.id}&returnurl=${utility.encodeURI(thisurl)}">${lang("content.clearparent")}</a> |
+      </if>    
+        &nbsp;<a href="${config.actionRoot}?module=Content&do=selectparent&id=${article.id}&returnurl=${utility.encodeURI(thisurl)}">${lang("content.selectparent")}</a>
+    </td>
+  </tr>
+    
+  <tr>
+    <td align=right valign=top class="table-left">
+      ${lang("content.children")}:
+    </td>
+    <td align="left" valign="top" class="listrow2">
+      <a href="${config.actionRoot}?module=Content&do=listchildren&article_id=${article.id}">${lang("content.viewchildren")}</a>
+    </td>
+  </tr>
 </table>
 
 </td>
@@ -186,6 +186,6 @@
 
 </form>
 
-	<include "foot.template">
+  <include "foot.template">
 </body>
 </html>
diff --git a/templates/admin/contentlist.template b/templates/admin/contentlist.template
index 52d2271b..26482dd7 100755
--- a/templates/admin/contentlist.template
+++ b/templates/admin/contentlist.template
@@ -3,17 +3,17 @@
 </comment>
 
 <if selectarticleurl!="">
-	<assign showsearch="1">
-	<assign showactions="0">
+  <assign showsearch="1">
+  <assign showactions="0">
 <else>
-	<assign showactions="1">
-	<assign showsearch="0">
+  <assign showactions="1">
+  <assign showsearch="0">
 </if>
 
 <html>
 <head>
-	<title>${config["Mir.Name"]} | ${lang("contentlist.htmltitle")} </title>
-	<link rel="stylesheet" type="text/css" href="${config.docRoot}/style/admin.css">
+  <title>${config["Mir.Name"]} | ${lang("contentlist.htmltitle")} </title>
+  <link rel="stylesheet" type="text/css" href="${config.docRoot}/style/admin.css">
 </head>
 
 <body marginwidth="0" marginheight="0" topmargin="0" leftmargin="0">
@@ -21,110 +21,110 @@
 <include "head.template">
 
 <if showsearch=="1">
-	<call ContentSearch ("layouted")>
+  <call ContentSearch ("layouted")>
 </if>
 
 <if articles>
 
 <if showactions=="1">
-	<if config["Mir.Localizer.Admin.ListOperationsFlavor"]!="0">
-		<form method="post" action="${config.actionRoot}">
-			<input type="hidden" name="module" value="Localizer">
-			<input type="hidden" name="do" value="articleoperationbatch">
-			<input type="hidden" name="returnurl" value="${utility.encodeHTML(thisurl)}">
-			<p class="box">
-				<input type="submit" name="save" value="${lang("save")}"> &nbsp; (${lang("commentlist.activate")})
-			</p>
-	</if>    
+  <if config["Mir.Localizer.Admin.ListOperationsFlavor"]!="0">
+    <form method="post" action="${config.actionRoot}">
+      <input type="hidden" name="module" value="Localizer">
+      <input type="hidden" name="do" value="articleoperationbatch">
+      <input type="hidden" name="returnurl" value="${utility.encodeHTML(thisurl)}">
+      <p class="box">
+        <input type="submit" name="save" value="${lang("save")}"> &nbsp; (${lang("commentlist.activate")})
+      </p>
+  </if>    
 </if>
 
 <call PrevNext ("right")>
 
 <table border="0" width="100%" cellspacing="3" cellpadding="2">
-	<tr>
-		<td class="table-head" valign="top">
-			<span class="small">	  
-			${lang("content.creationdate")}<br>
-			${lang("content.modificationdate")}<br>
-			${lang("content.status")}
-			</span>
-		</td>
-		<td class="table-head" valign="top">
-			${lang("content.type")} - ${lang("content.title")} <br>
-			${lang("content.creator")}
-		</td>
-		<td class="table-head" valign="top">
-			${lang("content.comment")}
-		</td>
-		<td class="table-head" valign="top">&nbsp;</td>
-	</tr>
+  <tr>
+    <td class="table-head" valign="top">
+      <span class="small">    
+      ${lang("content.creationdate")}<br>
+      ${lang("content.modificationdate")}<br>
+      ${lang("content.status")}
+      </span>
+    </td>
+    <td class="table-head" valign="top">
+      ${lang("content.type")} - ${lang("content.title")} <br>
+      ${lang("content.creator")}
+    </td>
+    <td class="table-head" valign="top">
+      ${lang("content.comment")}
+    </td>
+    <td class="table-head" valign="top">&nbsp;</td>
+  </tr>
 
 <assign grey="0">
 
-	<list articles as entry>
-		<tr <if grey=="1"><assign grey="0">class="listrow1"<else>class="listrow2"<assign grey="1"></if>>
-			<td class="x-small">
-					${entry.creationdate.formatted["dd.MM.yyyy HH:mm"]}<br>
-					${entry.changedate.formatted["dd.MM.yyyy HH:mm"]}<br>
-					<if entry.is_published!="0">Pub.<else>-</if> <if entry.is_html!="0">HTML<else>-</if>
-			</td>
-			<td>
-				<b>${entry.title}</b><br>
-				${lang("by")}: ${entry.creator}<br>
-				(${lang("articletypes." + entry.article_type.name)}) 
-				<if showactions=="1">
-					<if config["Mir.Localizer.Admin.ListOperationsFlavor"]=="0">
-						<list entry.operations as op>
-							[ <a href="${config.actionRoot}?module=Localizer&do=articleoperation&operation=${op}&articleid=${entry.id}&returnurl=${utility.encodeURI(thisurl)}">${lang("content.operation."+op)}</a> ]
-						</list>
-					</if>
-				<if config["Mir.Localizer.Admin.ListOperationsFlavor"]=="1">
-					<list entry.operations as op>
-						[ <input type="checkbox" name="operation" value="${entry.id};${op}"> ${lang("content.operation."+op)} ]
-					</list>
-				</if>
-					<if config["Mir.Localizer.Admin.ListOperationsFlavor"]=="2">
-						<select name="operation">
-							<option value="" selected>&nbsp;</option>
-							<list entry.operations as op>
-								<option value="${entry.id};${op}">${lang("content.operation."+op)}</option>
-							</list>
-						</select>
-					</if>
-					<if entry.operations> | </if>
-					<a href="${config.actionRoot}?module=Content&do=edit&id=${entry.id}&returnurl=${utility.encodeURI(thisurl)}">${lang("edit")}</a> |
-					<a href="${config.actionRoot}?module=Comment&do=articlecomments&articleid=${entry.id}&returnurl=${utility.encodeURI(thisurl)}">${lang("contentlist.comments")}</a> (${entry.commentcount})
-				<else>
-					<span class="text">
-					<a href="${config.actionRoot}?${selectarticleurl}&id=${entry.id}">${lang("contentlist.select")}</a>
-				</if>
-			</td>
-			<td width="25%"  <if grey=="1">class="listrow3"<else>class="listrow4"</if> valign="top">
-				<span class="small">${entry.comment}&nbsp;</span>
-			</td>
-			<td valign="top" class="listcommand">
-				<if showactions=="1">
+  <list articles as entry>
+    <tr <if grey=="1"><assign grey="0">class="listrow1"<else>class="listrow2"<assign grey="1"></if>>
+      <td class="x-small">
+          ${entry.creationdate.formatted["dd.MM.yyyy HH:mm"]}<br>
+          ${entry.changedate.formatted["dd.MM.yyyy HH:mm"]}<br>
+          <if entry.is_published!="0">Pub.<else>-</if> <if entry.is_html!="0">HTML<else>-</if>
+      </td>
+      <td>
+        <b>${entry.title}</b><br>
+        ${lang("by")}: ${entry.creator}<br>
+        (${lang("articletypes." + entry.article_type.name)}) 
+        <if showactions=="1">
+          <if config["Mir.Localizer.Admin.ListOperationsFlavor"]=="0">
+            <list entry.operations as op>
+              [ <a href="${config.actionRoot}?module=Localizer&do=articleoperation&operation=${op}&articleid=${entry.id}&returnurl=${utility.encodeURI(thisurl)}">${lang("content.operation."+op)}</a> ]
+            </list>
+          </if>
+        <if config["Mir.Localizer.Admin.ListOperationsFlavor"]=="1">
+          <list entry.operations as op>
+            [ <input type="checkbox" name="operation" value="${entry.id};${op}"> ${lang("content.operation."+op)} ]
+          </list>
+        </if>
+          <if config["Mir.Localizer.Admin.ListOperationsFlavor"]=="2">
+            <select name="operation">
+              <option value="" selected>&nbsp;</option>
+              <list entry.operations as op>
+                <option value="${entry.id};${op}">${lang("content.operation."+op)}</option>
+              </list>
+            </select>
+          </if>
+          <if entry.operations> | </if>
+          <a href="${config.actionRoot}?module=Content&do=edit&id=${entry.id}&returnurl=${utility.encodeURI(thisurl)}">${lang("edit")}</a> |
+          <a href="${config.actionRoot}?module=Comment&do=articlecomments&articleid=${entry.id}&returnurl=${utility.encodeURI(thisurl)}">${lang("contentlist.comments")}</a> (${entry.commentcount})
+        <else>
+          <span class="text">
+          <a href="${config.actionRoot}?${selectarticleurl}&id=${entry.id}">${lang("contentlist.select")}</a>
+        </if>
+      </td>
+      <td width="25%"  <if grey=="1">class="listrow3"<else>class="listrow4"</if> valign="top">
+        <span class="small">${entry.comment}&nbsp;</span>
+      </td>
+      <td valign="top" class="listcommand">
+        <if showactions=="1">
           <if config["Mir.Localizer.Admin.AllowDeleteArticle"]=="1">
             <a href="${config.actionRoot}?module=Content&do=delete&id=${entry.id}&where=${utility.encodeURI(where)}&order=${utility.encodeURI(order)}&offset=${utility.encodeURI(offset)}">[${lang("delete")}]</a>
           </if>
-				</if>
-			</td>
-	</tr>
+        </if>
+      </td>
+  </tr>
 </list>
-	<tr>
-		<td colspan="4" class="table-foot">
-			${count} ${lang("records")} / ${lang("show_from_to", from, to)}
-		</td>
-	</tr>
+  <tr>
+    <td colspan="4" class="table-foot">
+      ${count} ${lang("records")} / ${lang("show_from_to", from, to)}
+    </td>
+  </tr>
 </table>
 
 <if showactions=="1">
-	<if config["Mir.Localizer.Admin.ListOperationsFlavor"]!="0">
-		<p class="box">
-			<input class="majorbutton" type="submit" name="save" value="${lang("save")}"> &nbsp; ( ${lang("commentlist.activate")})
-		</p>
-	</form> 
-	</if>  
+  <if config["Mir.Localizer.Admin.ListOperationsFlavor"]!="0">
+    <p class="box">
+      <input class="majorbutton" type="submit" name="save" value="${lang("save")}"> &nbsp; ( ${lang("commentlist.activate")})
+    </p>
+  </form> 
+  </if>  
 </if>
 
 
diff --git a/templates/admin/fileedit.template b/templates/admin/fileedit.template
index 6317856e..28d8c332 100755
--- a/templates/admin/fileedit.template
+++ b/templates/admin/fileedit.template
@@ -1,6 +1,6 @@
 <html>
 <head>
-	<title>${config["Mir.Name"]} | ${lang("fileedit.htmltitle")}</title>
+  <title>${config["Mir.Name"]} | ${lang("fileedit.htmltitle")}</title>
   <link rel="stylesheet" type="text/css" href="${config.docRoot}/style/admin.css">
 </head>
 
@@ -9,25 +9,25 @@
 <include "head.template">
 
 <p>
-	<b>${lang("fileedit.filename")} :</b> ${filename}<br>
-	<b>${lang("fileedit.subdirectory")} :</b> ${subdirectory}
+  <b>${lang("fileedit.filename")} :</b> ${filename}<br>
+  <b>${lang("fileedit.subdirectory")} :</b> ${subdirectory}
 </p>
 
 <br>
 
 <form action="${config.actionRoot}" method="post">
-	<input type="hidden" name="module" value="FileEdit">
-	<input type="hidden" name="filename" value="${filename}">
-	<input type="hidden" name="entry" value="${entry}">
-	<input type="hidden" name="subdirectory" value="${subdirectory}">
-	<input type="hidden" name="do" value="update">
-	<input type="submit" name="save" value="${lang("save")}"> &nbsp;
-	<input type="reset" value="${lang("reset")}">
-	<br><br>	
-	<textarea cols="120" rows="40" name="text" wrap=virtual>${utility.encodeHTML(text)}</textarea>
-	<br><br>
-	<input type="submit" name="save" value="${lang("save")}"> &nbsp;
-	<input type="reset" value="${lang("reset")}">
+  <input type="hidden" name="module" value="FileEdit">
+  <input type="hidden" name="filename" value="${filename}">
+  <input type="hidden" name="entry" value="${entry}">
+  <input type="hidden" name="subdirectory" value="${subdirectory}">
+  <input type="hidden" name="do" value="update">
+  <input type="submit" name="save" value="${lang("save")}"> &nbsp;
+  <input type="reset" value="${lang("reset")}">
+  <br><br>  
+  <textarea cols="120" rows="40" name="text" wrap=virtual>${utility.encodeHTML(text)}</textarea>
+  <br><br>
+  <input type="submit" name="save" value="${lang("save")}"> &nbsp;
+  <input type="reset" value="${lang("reset")}">
 </form>
 <br>
 <br>
diff --git a/templates/admin/fileeditlist.template b/templates/admin/fileeditlist.template
index cfbac44a..968877dc 100755
--- a/templates/admin/fileeditlist.template
+++ b/templates/admin/fileeditlist.template
@@ -1,7 +1,7 @@
 <html>
 <head>
-	<title>${config["Mir.Name"]} | ${lang("fileeditlist.htmltitle")}</title>
-		<link rel="stylesheet" type="text/css" href="${config.docRoot}/style/admin.css">
+  <title>${config["Mir.Name"]} | ${lang("fileeditlist.htmltitle")}</title>
+    <link rel="stylesheet" type="text/css" href="${config.docRoot}/style/admin.css">
 </head>
 
 <body marginwidth="0" marginheight="0" topmargin="0" leftmargin="0">
@@ -16,32 +16,32 @@
         <if dirlist || updir>
           <table border="0" cellpadding="2" cellspacing="2">
           
-          	<tr>
-          		<td class="table-head"><b>${lang("fileeditlist.dirname")}</b></td>
-          		<td class="table-head">&nbsp;</td>
-          	</tr>
-          	<assign grey="0">
+            <tr>
+              <td class="table-head"><b>${lang("fileeditlist.dirname")}</b></td>
+              <td class="table-head">&nbsp;</td>
+            </tr>
+            <assign grey="0">
           
             <if updir>
-            	<tr class="list1">
-            		<td>&nbsp;..&nbsp;</td>
-            		<td><a class="tablecommand" href="${config.actionRoot}?module=FileEdit&do=enter&entry=${entry}&subdirectory=${utility.encodeURI(updir)}&directory=">${lang("edit")}</a></td>
-            	</tr>
+              <tr class="list1">
+                <td>&nbsp;..&nbsp;</td>
+                <td><a class="tablecommand" href="${config.actionRoot}?module=FileEdit&do=enter&entry=${entry}&subdirectory=${utility.encodeURI(updir)}&directory=">${lang("edit")}</a></td>
+              </tr>
             </if>
             
             <if dirlist>
-            	<list dirlist as item>
-            		<if grey=="1">
-            			<assign grey="0">
-            			<tr class="listrow1">
-            		<else>
-            			<tr class="listrow2">
-            			<assign grey="1"> 
-            		</if>
-            				<td> ${item}&nbsp;</td>
-            				<td class="tablecommand"><a href="${config.actionRoot}?module=FileEdit&do=enter&entry=${entry}&subdirectory=${utility.encodeURI(subdirectory)}&directory=${utility.encodeURI(item)}">${lang("edit")}</a></td>
-            			</tr>
-            	</list>
+              <list dirlist as item>
+                <if grey=="1">
+                  <assign grey="0">
+                  <tr class="listrow1">
+                <else>
+                  <tr class="listrow2">
+                  <assign grey="1"> 
+                </if>
+                    <td> ${item}&nbsp;</td>
+                    <td class="tablecommand"><a href="${config.actionRoot}?module=FileEdit&do=enter&entry=${entry}&subdirectory=${utility.encodeURI(subdirectory)}&directory=${utility.encodeURI(item)}">${lang("edit")}</a></td>
+                  </tr>
+              </list>
             </if>
           
           </table>
@@ -53,28 +53,28 @@
           
           <table border="0" cellpadding="2" cellspacing="2">
           
-          	<tr>
-          		<td class="table-head"><b>${lang("fileeditlist.filename")}</b></td>
-          		<td class="table-head">&nbsp;</td>
-          	</tr>
+            <tr>
+              <td class="table-head"><b>${lang("fileeditlist.filename")}</b></td>
+              <td class="table-head">&nbsp;</td>
+            </tr>
             <if filelist>
               <assign grey="0">
               <list filelist as item>
-              	<if grey=="1">
-              		<assign grey="0">
-              		<tr class="listrow1">
-              	<else>
-              	  <tr class="listrow2">
-              		<assign grey="1">
-              	</if>
+                <if grey=="1">
+                  <assign grey="0">
+                  <tr class="listrow1">
+                <else>
+                  <tr class="listrow2">
+                  <assign grey="1">
+                </if>
                     <td>${item}&nbsp;</td>
                     <td class="tablecommand"><a href="${config.actionRoot}?module=FileEdit&do=edit&entry=${entry}&subdirectory=${utility.encodeURI(subdirectory)}&filename=${utility.encodeURI(item)}">${lang("edit")}</a></td>
                   </tr>
               </list>
             <else>
               <tr><td colspan="2">
-            	<P align="center" class="box">${lang("no_matches_found")}</p>
-            	</tr></tr>
+              <P align="center" class="box">${lang("no_matches_found")}</p>
+              </tr></tr>
             </if>
           </table>
         </td>
diff --git a/templates/admin/foot.template b/templates/admin/foot.template
index e85a9d61..e1432d3f 100755
--- a/templates/admin/foot.template
+++ b/templates/admin/foot.template
@@ -1,23 +1,23 @@
-<hr>	
+<hr>  
 <table width="99%" cellspacing="0">
-	<tbody>
-	<tr>
-		<td align="left" class="table-head">
-			<a href="#top"><span class="table-head"> ${lang("foot.top")}</span></a>
-			<if returnurl>
-				<a href="${config.actionRoot}?${returnurl}"><span class="table-head"> | &nbsp;&nbsp;${lang("back")} [ &lt; ]</span></a>&nbsp;&nbsp;
-			</if>
-		</td>
-		<td align="right" class="table-head">
-			<a href="mailto:${config["Mir.Contact-email.address"]}"><span class="table-head">${config["Mir.Shortname"]}</span></a> - ${config["Mir.Version"]}
-		</td>
-	</tr>
+  <tbody>
+  <tr>
+    <td align="left" class="table-head">
+      <a href="#top"><span class="table-head"> ${lang("foot.top")}</span></a>
+      <if returnurl>
+        <a href="${config.actionRoot}?${returnurl}"><span class="table-head"> | &nbsp;&nbsp;${lang("back")} [ &lt; ]</span></a>&nbsp;&nbsp;
+      </if>
+    </td>
+    <td align="right" class="table-head">
+      <a href="mailto:${config["Mir.Contact-email.address"]}"><span class="table-head">${config["Mir.Shortname"]}</span></a> - ${config["Mir.Version"]}
+    </td>
+  </tr>
 </tbody>
 </table>
 
 
-	
-	
-	
+  
+  
+  
 
 
diff --git a/templates/admin/head.template b/templates/admin/head.template
index 52d13892..a2cf60d8 100755
--- a/templates/admin/head.template
+++ b/templates/admin/head.template
@@ -1,18 +1,18 @@
 <a name="top"></a>
 
 <table class="table-head" width="100%" cellspacing="0" cellpadding="0">
-	<tr>
-		<td>
-			<img src="${config.docRoot}/img/logo_small.gif" border="0" align="middle">&nbsp;
-			${config["Mir.Name"]}
-		</td>
-		<td align="right">
-			<if returnurl>
-				<a href="${config.actionRoot}?${returnurl}"><span class="table-head">[ &lt; ] ${lang("back")}</span></a>&nbsp;&nbsp;|
-			</if>
-			<a href="${config.actionRoot}"><span class="table-head">${lang("head.start")}</span></a> |
-			<a href="${config.actionRoot}?module=logout"><span class="table-head">${lang("head.logout")}</span></a>
-		</td>
-	</tr>
+  <tr>
+    <td>
+      <img src="${config.docRoot}/img/logo_small.gif" border="0" align="middle">&nbsp;
+      ${config["Mir.Name"]}
+    </td>
+    <td align="right">
+      <if returnurl>
+        <a href="${config.actionRoot}?${returnurl}"><span class="table-head">[ &lt; ] ${lang("back")}</span></a>&nbsp;&nbsp;|
+      </if>
+      <a href="${config.actionRoot}"><span class="table-head">${lang("head.start")}</span></a> |
+      <a href="${config.actionRoot}?module=logout"><span class="table-head">${lang("head.logout")}</span></a>
+    </td>
+  </tr>
 </table>
 <hr>
diff --git a/templates/admin/head_nonavi.template b/templates/admin/head_nonavi.template
index b34f0852..1cdb1116 100755
--- a/templates/admin/head_nonavi.template
+++ b/templates/admin/head_nonavi.template
@@ -1,18 +1,18 @@
 <a name="top"></a>
 <table width="100%" cellspacing="0" cellpadding="0">
-	<tr>
-		<td class="table-head">
-			<img src="${config.docRoot}/img/logo_small.gif" border="0" align="middle">&nbsp;
-			<b>${config["Mir.Name"]}</b>
-		</td>
-	</tr>
+  <tr>
+    <td class="table-head">
+      <img src="${config.docRoot}/img/logo_small.gif" border="0" align="middle">&nbsp;
+      <b>${config["Mir.Name"]}</b>
+    </td>
+  </tr>
 <if login_user>
-	<tr>
-		<td align="right">
-			<b>${login_user.login}</b> ${lang("head.logged_in")} |
-			<a href="${actionRoot}?module=logout">${lang("head.logout")}</a>
-		</td>
-	</tr>
+  <tr>
+    <td align="right">
+      <b>${login_user.login}</b> ${lang("head.logged_in")} |
+      <a href="${actionRoot}?module=logout">${lang("head.logout")}</a>
+    </td>
+  </tr>
 </if>
-	<tr><td><hr></td></tr>
+  <tr><td><hr></td></tr>
 </table>
diff --git a/templates/admin/hiddenlist.template b/templates/admin/hiddenlist.template
index 537e0c36..043c8ea2 100755
--- a/templates/admin/hiddenlist.template
+++ b/templates/admin/hiddenlist.template
@@ -1,7 +1,7 @@
 <html>
 <head>
-	<title>${config["Mir.Name"]} | ${lang("start.content.hidden")}</title>
-	<link rel="stylesheet" type="text/css" href="${config.docRoot}/style/admin.css">
+  <title>${config["Mir.Name"]} | ${lang("start.content.hidden")}</title>
+  <link rel="stylesheet" type="text/css" href="${config.docRoot}/style/admin.css">
 </head>
 
 <body marginwidth="0" marginheight="0" topmargin="0" leftmargin="0">
@@ -9,55 +9,55 @@
 <include "head.template">
 
 <table width="50%" align="center" >
-	<tr>
-		<td class="table-head">
-			<b>${lang("start.content.hidden")}</b>
-		</td>
-	</tr>
-	<tr>
-		<td class="listrow2">
+  <tr>
+    <td class="table-head">
+      <b>${lang("start.content.hidden")}</b>
+    </td>
+  </tr>
+  <tr>
+    <td class="listrow2">
 
 
 <form method="get" action="${config.actionRoot}">
-	<input type="hidden" name="module" value="Hidden">
-	<input type="hidden" name="do" value="list">
-
-
-
-	${lang("month")}
-	<select name="month">
-	<option value="01" selected >01</option>
-	<option value="02">02</option>
-	<option value="03">03</option>
-	<option value="04">04</option>
-	<option value="05">05</option>
-	<option value="06">06</option>
-	<option value="07">07</option>
-	<option value="08">08</option>
-	<option value="09">09</option>
-	<option value="10">10</option>
-	<option value="11">11</option>
-	<option value="12">12</option>
-	</select>
-	${lang("year")}
-	<select name="year">
-	<option value="2001">2001</option>
-	<option value="2002">2002</option>
-	<option value="2003" selected >2003</option>
-	<option value="2004">2004</option>
-	<option value="2005">2005</option>
-	<option value="2006">2006</option>
-	<option value="2007">2007</option>
-	<option value="2008">2008</option>
-	</select>
-
-	&nbsp;
-
-	<input type="submit" name="search" value="${lang("commentlist.search")}">
+  <input type="hidden" name="module" value="Hidden">
+  <input type="hidden" name="do" value="list">
+
+
+
+  ${lang("month")}
+  <select name="month">
+  <option value="01" selected >01</option>
+  <option value="02">02</option>
+  <option value="03">03</option>
+  <option value="04">04</option>
+  <option value="05">05</option>
+  <option value="06">06</option>
+  <option value="07">07</option>
+  <option value="08">08</option>
+  <option value="09">09</option>
+  <option value="10">10</option>
+  <option value="11">11</option>
+  <option value="12">12</option>
+  </select>
+  ${lang("year")}
+  <select name="year">
+  <option value="2001">2001</option>
+  <option value="2002">2002</option>
+  <option value="2003" selected >2003</option>
+  <option value="2004">2004</option>
+  <option value="2005">2005</option>
+  <option value="2006">2006</option>
+  <option value="2007">2007</option>
+  <option value="2008">2008</option>
+  </select>
+
+  &nbsp;
+
+  <input type="submit" name="search" value="${lang("commentlist.search")}">
 </form>
 
 
-	</td>
+  </td>
 </tr>
 </table>
 
@@ -69,40 +69,40 @@
 <if data.contentlist>
 <table cellpadding="6" width="98%" class="litegrey">
 <tr>
-	<td>
-	<p>${lang("start.content.hidden")} | ${lang("month")}: ${data.month} , ${lang("year")}:${data.year}</p>
-	</td>
+  <td>
+  <p>${lang("start.content.hidden")} | ${lang("month")}: ${data.month} , ${lang("year")}:${data.year}</p>
+  </td>
 </tr>
 </table>
 
 <list data.contentlist as i>
-	<p
-		${lang("content.title")}: <b>${i.title}</b><br>
-		${lang("content.creator")}: ${i.creator}<br>
-		${lang("message.date")}: ${i.webdb_create_formatted}<br>
-		<br>
-		<if i.to_media_audio >additional media, type: audio<br></if>
-		<if i.to_media_video >additional media, type: video<br></if>
-		<if i.to_media_other >additional media, type: other<br></if>
-		<if i.to_media_images >additional media, type: image<br></if>
-	</p>
-
-	<p>
-		${lang("content.abstract")}:<br>
-		${i.description_parsed}
-	</p>
-
-	<p>
-		${lang("content.content")}:<br>
-		${i.content_data_parsed}
-	</p>
-	<p>&nbsp;</p>
-	<hr size="4" width="98%" noshade>
-	<p>&nbsp;</p>
+  <p
+    ${lang("content.title")}: <b>${i.title}</b><br>
+    ${lang("content.creator")}: ${i.creator}<br>
+    ${lang("message.date")}: ${i.webdb_create_formatted}<br>
+    <br>
+    <if i.to_media_audio >additional media, type: audio<br></if>
+    <if i.to_media_video >additional media, type: video<br></if>
+    <if i.to_media_other >additional media, type: other<br></if>
+    <if i.to_media_images >additional media, type: image<br></if>
+  </p>
+
+  <p>
+    ${lang("content.abstract")}:<br>
+    ${i.description_parsed}
+  </p>
+
+  <p>
+    ${lang("content.content")}:<br>
+    ${i.content_data_parsed}
+  </p>
+  <p>&nbsp;</p>
+  <hr size="4" width="98%" noshade>
+  <p>&nbsp;</p>
 </list>
 
 <else>
-	<tr><td><div class="box" align="center"><b>${lang("no_matches_found")}</b></div></td></tr>
+  <tr><td><div class="box" align="center"><b>${lang("no_matches_found")}</b></div></td></tr>
 </if>
 
 
diff --git a/templates/admin/image.template b/templates/admin/image.template
index e4a40605..1e89c10e 100755
--- a/templates/admin/image.template
+++ b/templates/admin/image.template
@@ -17,120 +17,120 @@ function openWin(url) {
 <if data.new>
 <form action="${config.actionRoot}?module=Images&do=add" method="post">
 
-	<if data.articleid>
-		<input type="hidden" name="articleid" value="${data.articleid}">
-	</if>
-	<if data.commentid>
-		<input type="hidden" name="commentid" value="${data.commentid}">
-	</if>
-	
-	
-	<table border="0">
-		<tr>
-			<td align="right" class="table-left">
-				<b>${lang("media.nr_of_media")} :</b><br>
-			</td>
-			<td class="listrow2">
-				<input type="text" size="3" name="medianum" value="${medianum}">&nbsp;&nbsp;<input type="submit" value="${lang("media.nr_of_media.submit")}">
-			</td>
-		</tr>
-	</table>
+  <if data.articleid>
+    <input type="hidden" name="articleid" value="${data.articleid}">
+  </if>
+  <if data.commentid>
+    <input type="hidden" name="commentid" value="${data.commentid}">
+  </if>
+  
+  
+  <table border="0">
+    <tr>
+      <td align="right" class="table-left">
+        <b>${lang("media.nr_of_media")} :</b><br>
+      </td>
+      <td class="listrow2">
+        <input type="text" size="3" name="medianum" value="${medianum}">&nbsp;&nbsp;<input type="submit" value="${lang("media.nr_of_media.submit")}">
+      </td>
+    </tr>
+  </table>
 </form>
 </if>
 
 
 <form enctype="multipart/form-data" method="post" action="${config.actionRoot}?module=Images&do=<if data.new>insert<else>update</if>&id=${data.id}">
-	
-	<if data.articleid>
-		<input type="hidden" name="articleid" value="${data.articleid}">
-	</if>
+  
+  <if data.articleid>
+    <input type="hidden" name="articleid" value="${data.articleid}">
+  </if>
 
-	<if data.commentid>
-		<input type="hidden" name="commentid" value="${data.commentid}">
-	</if>
+  <if data.commentid>
+    <input type="hidden" name="commentid" value="${data.commentid}">
+  </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}">
+  <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">
+  <table border="0">
 
-	<if !data.new>
-	<tr>
-    	<td align="right" valign="top">
-			<a href="JavaScript:openWin('${config.actionRoot}?module=Images&do=getMedia&id=${data.id}')">
-	  		<img src="${config.actionRoot}?module=Images&do=getIcon&id=${data.id}" border=0></a>&nbsp;&nbsp;
-		</td>
-		<td valign="bottom" class="small">
-			${lang("media.created")}: ${data.webdb_create}
-			<if data.webdb_lastchange>/ ${lang("media.changed")} ${data.webdb_lastchange}</if><br>
-			<if data.is_published=="1">${lang("media.published")}: ${data.publish_date} / ${data.publish_server}${data.publish_path}<br></if>
-			${lang("media.format")}: ${data.mimetype} / ${data.media_descr}<br>
-			${lang("media.size")}: ${data.human_readable_size}<br>
-			${lang("media.rights")}: <b>${data.rightsHashdata[to_rights]["name"]}</b><br>
-		</td>
-  	</tr>
-	</if>
+  <if !data.new>
+  <tr>
+      <td align="right" valign="top">
+      <a href="JavaScript:openWin('${config.actionRoot}?module=Images&do=getMedia&id=${data.id}')">
+        <img src="${config.actionRoot}?module=Images&do=getIcon&id=${data.id}" border=0></a>&nbsp;&nbsp;
+    </td>
+    <td valign="bottom" class="small">
+      ${lang("media.created")}: ${data.webdb_create}
+      <if data.webdb_lastchange>/ ${lang("media.changed")} ${data.webdb_lastchange}</if><br>
+      <if data.is_published=="1">${lang("media.published")}: ${data.publish_date} / ${data.publish_server}${data.publish_path}<br></if>
+      ${lang("media.format")}: ${data.mimetype} / ${data.media_descr}<br>
+      ${lang("media.size")}: ${data.human_readable_size}<br>
+      ${lang("media.rights")}: <b>${data.rightsHashdata[to_rights]["name"]}</b><br>
+    </td>
+    </tr>
+  </if>
 
-	<tr>
-		<td align="right" class="table-left">
-			<B>${lang("media.mediafolder")}:</B>
-		</td>
-		<td class="listrow2">
-			<select name="to_media_folder">
- 			<list extra.mediafolderPopupData as m>
-				<option value="${m.key}" <if m.key == data.to_media_folder>selected</if>>${m.value}</option>
-			</list>
-	    	</select>
-		</td>
-	</tr>
-	
-	<if !data.new>
-	  <call TextInputTableRow (lang("media.title"), 40, 80, "title", data.title)>
-	</if>
-	<call TextInputTableRow (lang("media.date"), 8, 8, "date", data.date)>
-	<call TextInputTableRow (lang("media.creator"), 40, 80, "creator", data.creator)>
-	<call TextAreaTableRow  (lang("media.description"), "", 40, 2, "description", data.description)>
-	<call TextAreaTableRow  (lang("media.comment"), "", 40, 2, "comment", data.comment)>
-	<call TextInputTableRow (lang("media.source"), 40, 80, "source", data.source)>
-	
-	<tr><td colspan="2" class="x-small">&nbsp;</td></tr>
-	
-	<if data.new>
-	<tr>
-		<td align="right" class="table-left">
-			${lang("media.is_published")} : 
-		</td>
-		<td class="listrow2" style='border: 1px solid #FF0000;'>
-			<input type="checkbox" name="is_published" value="1"<if data.is_published!="0" && data.is_published!=""> checked</if>>	
-		</td>
-	</tr>
-	
-	<tr><td colspan="2" class="x-small">&nbsp;</td></tr>
-	
-	<list data.mediafields as m>
-	<tr>
-		<td align="right" class="table-left">
-			<B>${lang("media.title")}:<B>
-		 </td>
-		<td class="listrow2">
-			<input type="text" name="media_title${m}" size="40" maxlength="80" value="">
-		</td>
-	</tr>
-	<tr>
-		<td align="right">
-			&nbsp;
-		</td>
-		<td class="listrow2">
-			<input type="file" name="media${m}"><br>
-		</td>
-	</tr>
-	</list>
-	</if>
+  <tr>
+    <td align="right" class="table-left">
+      <B>${lang("media.mediafolder")}:</B>
+    </td>
+    <td class="listrow2">
+      <select name="to_media_folder">
+      <list extra.mediafolderPopupData as m>
+        <option value="${m.key}" <if m.key == data.to_media_folder>selected</if>>${m.value}</option>
+      </list>
+        </select>
+    </td>
+  </tr>
+  
+  <if !data.new>
+    <call TextInputTableRow (lang("media.title"), 40, 80, "title", data.title)>
+  </if>
+  <call TextInputTableRow (lang("media.date"), 8, 8, "date", data.date)>
+  <call TextInputTableRow (lang("media.creator"), 40, 80, "creator", data.creator)>
+  <call TextAreaTableRow  (lang("media.description"), "", 40, 2, "description", data.description)>
+  <call TextAreaTableRow  (lang("media.comment"), "", 40, 2, "comment", data.comment)>
+  <call TextInputTableRow (lang("media.source"), 40, 80, "source", data.source)>
+  
+  <tr><td colspan="2" class="x-small">&nbsp;</td></tr>
+  
+  <if data.new>
+  <tr>
+    <td align="right" class="table-left">
+      ${lang("media.is_published")} : 
+    </td>
+    <td class="listrow2" style='border: 1px solid #FF0000;'>
+      <input type="checkbox" name="is_published" value="1"<if data.is_published!="0" && data.is_published!=""> checked</if>>  
+    </td>
+  </tr>
+  
+  <tr><td colspan="2" class="x-small">&nbsp;</td></tr>
+  
+  <list data.mediafields as m>
+  <tr>
+    <td align="right" class="table-left">
+      <B>${lang("media.title")}:<B>
+     </td>
+    <td class="listrow2">
+      <input type="text" name="media_title${m}" size="40" maxlength="80" value="">
+    </td>
+  </tr>
+  <tr>
+    <td align="right">
+      &nbsp;
+    </td>
+    <td class="listrow2">
+      <input type="file" name="media${m}"><br>
+    </td>
+  </tr>
+  </list>
+  </if>
 
     <td colspan="2" align="right" class="table-foot">
-	<if data.new>
+  <if data.new>
       <input type="submit" name="save" value="${lang("insert")}">
     <else>
      ${lang("media.is_published")} <input type="checkbox" name="is_published" value="1"<if data.is_published!="0" && data.is_published!=""> checked</if>>
diff --git a/templates/admin/imagelist.template b/templates/admin/imagelist.template
index 08e99707..b166e3f3 100755
--- a/templates/admin/imagelist.template
+++ b/templates/admin/imagelist.template
@@ -39,12 +39,8 @@ function openWin(url) {
   	<list data.contentlist as entry>
   	<tr <if grey=="1"><assign grey="0">class="listrow1"<else>class="listrow2"<assign grey="1"> </if>>
 		<td>
-  	  		<if entry.icon_data!="" && entry.icon_data!="0">
-  				
 				<a href="JavaScript:openWin('${config.actionRoot}?module=Images&do=getMedia&id=${entry.id}')">
 	  			<img src="${config.actionRoot}?module=Images&do=getIcon&id=${entry.id}" border=0></a>
-				
-			</if>
 		</td>
   		<td>
 			${entry.title}&nbsp;
diff --git a/templates/admin/infomessage.template b/templates/admin/infomessage.template
index 66ac36d6..a7f22218 100755
--- a/templates/admin/infomessage.template
+++ b/templates/admin/infomessage.template
@@ -6,19 +6,19 @@
 <body>
 <include "head.template">
 <table width="100%" border="0" align="center">
-	<tr>
-		<td>
-			<p>
-			  <b>${lang("infomessage."+message, argument1, argument2)}<b>
-			<p>
-			<p>
-				<br>
-				<a class="link-box" href="${config.actionRoot}">[&lt;&lt;&lt;] ${lang("head.start")}</a>&nbsp;&nbsp;&nbsp;
-				
-			</p>
-			
-		</td>
-	</tr>
+  <tr>
+    <td>
+      <p>
+        <b>${lang("infomessage."+message, argument1, argument2)}<b>
+      <p>
+      <p>
+        <br>
+        <a class="link-box" href="${config.actionRoot}">[&lt;&lt;&lt;] ${lang("head.start")}</a>&nbsp;&nbsp;&nbsp;
+        
+      </p>
+      
+    </td>
+  </tr>
 </table>
 <include "foot.template">
 </body>
diff --git a/templates/admin/language.template b/templates/admin/language.template
index 189a5113..de733de8 100755
--- a/templates/admin/language.template
+++ b/templates/admin/language.template
@@ -9,22 +9,22 @@
 <include "head.template">
 
 <form action="${config.actionRoot}" method="post">
-	<input type="hidden" name="module" value="Language">
-	<input type="hidden" name="id" value="${data.id}">
-	<if data.new><input type="hidden" name="do" value="insert">
-	<else><input type="hidden" name="do" value="update"></if>
+  <input type="hidden" name="module" value="Language">
+  <input type="hidden" name="id" value="${data.id}">
+  <if data.new><input type="hidden" name="do" value="insert">
+  <else><input type="hidden" name="do" value="update"></if>
 <table border="0">
-		<call TextInputTableRow (lang("language.name"), 30, 255, "name", data.name)>
-		<call TextInputTableRow (lang("language.code"), 2, 2,"code", data.code)>
+    <call TextInputTableRow (lang("language.name"), 30, 255, "name", data.name)>
+    <call TextInputTableRow (lang("language.code"), 2, 2,"code", data.code)>
   <tr>
     <td class="table-foot" colspan="2" align="right"> 
-	<if data.new>
+  <if data.new>
       <input type="submit" name="save" value="${lang("insert")}">
     <else>
       <input type="submit" name="save" value="${lang("save")}">
     </if>
-	</td>
-	</tr>
+  </td>
+  </tr>
 </table>
 </form>
 <p><a class="link-box" href="${config.actionRoot}?module=Language&do=list">[&lt;] ${lang("back")} </a> &nbsp;</p>
diff --git a/templates/admin/languagelist.template b/templates/admin/languagelist.template
index 3e61489a..5ee774f4 100755
--- a/templates/admin/languagelist.template
+++ b/templates/admin/languagelist.template
@@ -5,32 +5,32 @@
   </head>
   <body marginwidth="0" marginheight="0" topmargin="0" leftmargin="0">
 
-  	<include "FUNCTIONS.template">
+    <include "FUNCTIONS.template">
   
     <include "head.template">
 
-		<comment>configure this template here</comment>
-		<assign contentlist = data.contentlist>
-		<assign column_nr = 3>
-		<assign data_keys = ["name","code"]>
-		<assign column_head_texts = [lang("language.name"), lang("language.code")]>
-		<assign column_head_CSS = "table_head">
-		<assign listrow1CSS = "listrow1">
-		<assign listrow2CSS = "listrow2">
-		<assign footer_css = "table_foot">
-		<assign module_name = "Language">
-		<assign module_jumpback = "Admin">
-		<assign do_jumpback = "superusermenu">
+    <comment>configure this template here</comment>
+    <assign contentlist = data.contentlist>
+    <assign column_nr = 3>
+    <assign data_keys = ["name","code"]>
+    <assign column_head_texts = [lang("language.name"), lang("language.code")]>
+    <assign column_head_CSS = "table_head">
+    <assign listrow1CSS = "listrow1">
+    <assign listrow2CSS = "listrow2">
+    <assign footer_css = "table_foot">
+    <assign module_name = "Language">
+    <assign module_jumpback = "Admin">
+    <assign do_jumpback = "superusermenu">
 
     <if data.contentlist>
-		<call AddOrBack(module_name, module_jumpback, do_jumpback)>
-		<call ListTable(contentlist, data_keys, column_head_texts, column_head_CSS, listrow1CSS, listrow2CSS, footer_css, module_name)>	  
-		<call PrevNextPage(module_name)>	  
+    <call AddOrBack(module_name, module_jumpback, do_jumpback)>
+    <call ListTable(contentlist, data_keys, column_head_texts, column_head_CSS, listrow1CSS, listrow2CSS, footer_css, module_name)>   
+    <call PrevNextPage(module_name)>    
    <else>
-		<P align="center">${lang("no_matches_found")}</p>
+    <P align="center">${lang("no_matches_found")}</p>
     </if>
     
-	<call AddOrBack(module_name, module_jumpback, do_jumpback)>
+  <call AddOrBack(module_name, module_jumpback, do_jumpback)>
     <include "foot.template">
   </body>
 </html>
diff --git a/templates/admin/linksimcs.template b/templates/admin/linksimcs.template
index c0dc87ba..ab40ab18 100755
--- a/templates/admin/linksimcs.template
+++ b/templates/admin/linksimcs.template
@@ -8,28 +8,28 @@
 
 <include "head.template">
 <form action="${config.actionRoot}" method="post">
-	<input type=hidden name=module value=LinksImcs>
-	<input type="hidden" name="id" value="${data.entity.id}">
-	<if data.new><input type="hidden" name="do" value="insert">
-	<else><input type="hidden" name="do" value="update"></if>
+  <input type=hidden name=module value=LinksImcs>
+  <input type="hidden" name="id" value="${data.entity.id}">
+  <if data.new><input type="hidden" name="do" value="insert">
+  <else><input type="hidden" name="do" value="update"></if>
 <table border="0">
   <tr>
     <td align="right" class="darkgrey"><span class="witesmall>
-		<B>${lang("linkimcs.name")}:</B></span></td>
+    <B>${lang("linkimcs.name")}:</B></span></td>
     <td>
-      	<input type="text" size="40" name="title" value="${data.entity.title}">
+        <input type="text" size="40" name="title" value="${data.entity.title}">
     </td>
   </tr>
   <tr>
     <td align="right" class="darkgrey"><span class="witesmall>
-		<B>${lang("linkimcs.continent")}:</B></span></td>
+    <B>${lang("linkimcs.continent")}:</B></span></td>
     <td>
-		<if data.parentlist>
-     	<select name="to_parent_id" size="1">
-			<option value=NULL> ${lang("linkimcs.new_parent")}
-			<list data.parentlist as entry><option value="${entry.id}"<if entry.id == data.entity.to_parent_id> selected</if>> ${entry.title}</list>
-		</select>
-		</if>
+    <if data.parentlist>
+      <select name="to_parent_id" size="1">
+      <option value=NULL> ${lang("linkimcs.new_parent")}
+      <list data.parentlist as entry><option value="${entry.id}"<if entry.id == data.entity.to_parent_id> selected</if>> ${entry.title}</list>
+    </select>
+    </if>
     </td>
   </tr>
   <tr>
@@ -42,30 +42,30 @@
     <td align="right" class="darkgrey"><span class="witetext"><B>${lang("linkimcs.sort-by")}:</B></span></td>
     <td>
       <select name="sortpriority" size="1">
-		<option value="1"<if data.entity.sortpriority == 1> selected</if>> 1
-		<option value="2"<if data.entity.sortpriority == 2> selected</if>> 2
-		<option value="3"<if data.entity.sortpriority == 3> selected</if>> 3
-		<option value="4"<if data.entity.sortpriority == 4> selected</if>> 4
-		</select>
+    <option value="1"<if data.entity.sortpriority == 1> selected</if>> 1
+    <option value="2"<if data.entity.sortpriority == 2> selected</if>> 2
+    <option value="3"<if data.entity.sortpriority == 3> selected</if>> 3
+    <option value="4"<if data.entity.sortpriority == 4> selected</if>> 4
+    </select>
     </td>
   </tr>
   <tr>
     <td align="right" class="darkgrey"><span class="witetext"><B>${lang("linkimcs.language")}:</B></span></td>
     <td>
       <select name="to_language" size="1">
-	  	<list data.languagelist as language>
-			<option value="${language.id}"<if data.entity.to_language == language.id> selected</if>> ${language.name}
-		</list>
-	  </select>
+      <list data.languagelist as language>
+      <option value="${language.id}"<if data.entity.to_language == language.id> selected</if>> ${language.name}
+    </list>
+    </select>
     </td>
   </tr>
   <tr>
     <td colspan="2" align="right"><span class="witetext">
-		<if data.new>
-      		<input type="submit" name="save" value="${lang("insert")}">
-    	<else>
-    		<input type="submit" name="save" value="${lang("save")}">
-    	</if> </span></form></span>
+    <if data.new>
+          <input type="submit" name="save" value="${lang("insert")}">
+      <else>
+        <input type="submit" name="save" value="${lang("save")}">
+      </if> </span></form></span>
     </td>
   </tr>
 </table>
diff --git a/templates/admin/linksimcslist.template b/templates/admin/linksimcslist.template
index b723fa36..6d6c2f4d 100755
--- a/templates/admin/linksimcslist.template
+++ b/templates/admin/linksimcslist.template
@@ -1,6 +1,6 @@
 <html>
 <head>
-	<title>${config["Mir.Name"]} | ${lang("linkimcslist.htmltitle")}</title>
+  <title>${config["Mir.Name"]} | ${lang("linkimcslist.htmltitle")}</title>
         <link rel="stylesheet" type="text/css" href="${config.docRoot}/style/admin.css">
 </head>
 
@@ -9,92 +9,92 @@
 <include "head.template">
 
 <form method="post" action="${config.actionRoot}">
-	<input type="hidden" name="module" value="LinksImcs">
-	<input type="hidden" name="do" value="list">
-	<input type="hidden" name="cid" value="">
-	<table border="0">
-	<tr class="table-head">
-		<td>${lang("linkimcslist.search_in")}:</td>
-		<td>${lang("linkimcs.parent")}:</td>
-		<td>${lang("linkimcs.language")}:</td>
-		<td>&nbsp;</td>
-	</tr>
-	
-	<tr>
-	<td>
-		<input type="text" size="10" maxlength="20" name="query_text" value="${data.query_text}">
-		<select name="query_field">
-			<option value="title"<if data.query_field == "title"> selected</if>>${lang("linkimcs.name")}
-			<option value="url"<if data.query_field == "url"> selected</if>>${lang("linkimcs.url")}
-    	</select>
-	</td>
-	<td>
-		<select name="to_parent_id">
-			<option value=""></option>
-		    <list data.parentlist as parent><option value="${parent.id}"<if to_parent_id == parent.id> selected</if>>${parent.title}</option>
-			</list>
-	    </select>
-	</td>
-	<td>
-		<select name="to_language">
- 			<option value="">${lang("all")}</option>
-			<list data.languagelist as language><option value="${language.id}"<if to_language == language.id> selected</if>>${language.name}</option>
-			</list>	
-   		</select>
-	</td>
-	<td>
-		<input type="submit" name="search" value="${lang("filter")}">
-	</td>
-	</tr>	
-	</table>
-	</form>
-	
+  <input type="hidden" name="module" value="LinksImcs">
+  <input type="hidden" name="do" value="list">
+  <input type="hidden" name="cid" value="">
+  <table border="0">
+  <tr class="table-head">
+    <td>${lang("linkimcslist.search_in")}:</td>
+    <td>${lang("linkimcs.parent")}:</td>
+    <td>${lang("linkimcs.language")}:</td>
+    <td>&nbsp;</td>
+  </tr>
+  
+  <tr>
+  <td>
+    <input type="text" size="10" maxlength="20" name="query_text" value="${data.query_text}">
+    <select name="query_field">
+      <option value="title"<if data.query_field == "title"> selected</if>>${lang("linkimcs.name")}
+      <option value="url"<if data.query_field == "url"> selected</if>>${lang("linkimcs.url")}
+      </select>
+  </td>
+  <td>
+    <select name="to_parent_id">
+      <option value=""></option>
+        <list data.parentlist as parent><option value="${parent.id}"<if to_parent_id == parent.id> selected</if>>${parent.title}</option>
+      </list>
+      </select>
+  </td>
+  <td>
+    <select name="to_language">
+      <option value="">${lang("all")}</option>
+      <list data.languagelist as language><option value="${language.id}"<if to_language == language.id> selected</if>>${language.name}</option>
+      </list> 
+      </select>
+  </td>
+  <td>
+    <input type="submit" name="search" value="${lang("filter")}">
+  </td>
+  </tr> 
+  </table>
+  </form>
+  
 <if data.imcslist>
 <table border="0">
   <tr class="darkgrey">
     <td><span class="witesmall">
-		<b>${lang("linkimcs.name")}</b></span></td>
+    <b>${lang("linkimcs.name")}</b></span></td>
     <td><span class="witesmall">
-		<b>${lang("linkimcs.parent")}</b></span></td>
-	<td><span class="witesmall">
-		<b>${lang("linkimcs.url")}</b></span></td>
-	<td><span class="witesmall">
-		<b>${lang("linkimcs.sort_by")}</b></span></td>
-	<td><span class="witesmall">
-		<b>${lang("linkimcs.language")}</b></span></td>
-	<td><span class="witesmall">
-		<b>&nbsp;</b></span></td>
+    <b>${lang("linkimcs.parent")}</b></span></td>
+  <td><span class="witesmall">
+    <b>${lang("linkimcs.url")}</b></span></td>
+  <td><span class="witesmall">
+    <b>${lang("linkimcs.sort_by")}</b></span></td>
+  <td><span class="witesmall">
+    <b>${lang("linkimcs.language")}</b></span></td>
+  <td><span class="witesmall">
+    <b>&nbsp;</b></span></td>
   </tr>
   <list data.imcslist as entry>
   <assign parent = "">
   <assign language = "">
   <list data.parentlist as p>
-		<if entry.to_parent_id == p.id><assign parent = p.title></if>
+    <if entry.to_parent_id == p.id><assign parent = p.title></if>
   </list>
   <list data.languagelist as l>
-		<if entry.to_language == l.id><assign language = l.name></if>
+    <if entry.to_language == l.id><assign language = l.name></if>
   </list>
 
   <tr <if grey=="1"><assign grey="0">class="list1"<else>class="list2"<assign grey="1"> </if>>
-  	<td><span class="small">${entry.title}&nbsp;</span></td>
-  	<td><span class="small">${parent}</span></td>
-	<td><span class="small">${entry.url}</span></td>
-  	<td><span class="small">${entry.sortpriority}</span></td>
-  	<td><span class="small">${data.language}</span></td>
-	<td><span class="text">&nbsp;<a href="${actionRoot}?module=LinksImcs&do=delete&id=${entry.id}">${lang("delete")}</a>
-    	| <a href="${actionRoot}?module=LinksImcs&do=edit&id=${entry.id}">${lang("edit")}</a></span>
-  	</td>
+    <td><span class="small">${entry.title}&nbsp;</span></td>
+    <td><span class="small">${parent}</span></td>
+  <td><span class="small">${entry.url}</span></td>
+    <td><span class="small">${entry.sortpriority}</span></td>
+    <td><span class="small">${data.language}</span></td>
+  <td><span class="text">&nbsp;<a href="${actionRoot}?module=LinksImcs&do=delete&id=${entry.id}">${lang("delete")}</a>
+      | <a href="${actionRoot}?module=LinksImcs&do=edit&id=${entry.id}">${lang("edit")}</a></span>
+    </td>
   </tr>
   </list>
   <tr>
   <td colspan="6" class="darkgrey"><span class="witesmall">
-  	${data.count} ${lang("records")} / ${lang("show_from_to", data.from, data.to)}</span></td>
+    ${data.count} ${lang("records")} / ${lang("show_from_to", data.from, data.to)}</span></td>
   <td>&nbsp;</td>
   </tr>
 </table>
 <P>
 <if data.prev>
-	<a href="${config.actionRoot}?module=LinksImcs&do=list&order=${data.order}&query_text=${data.query_text_encoded}&query_field=${data.query_field}&to_parent_id=${data.to_parent_id}&to_language=${data.to_language}&prevoffset=${data.prev}&prev=zur&uuml;ck">${lang("list.previous")}</a>&nbsp;
+  <a href="${config.actionRoot}?module=LinksImcs&do=list&order=${data.order}&query_text=${data.query_text_encoded}&query_field=${data.query_field}&to_parent_id=${data.to_parent_id}&to_language=${data.to_language}&prevoffset=${data.prev}&prev=zur&uuml;ck">${lang("list.previous")}</a>&nbsp;
 </if>
 <if data.next>
 <a href="${config.actionRoot}?module=LinksImcs&do=list&order=${data.order}&query_text=${data.query_text_encoded}&query_field=${data.query_field}&to_parent_id=${data.to_parent_id}&to_language=${data.to_language}&nextoffset=${data.next}&next=weiter">${lang("list.next")}</a>
diff --git a/templates/admin/login.template b/templates/admin/login.template
index a48ca7e4..279f8c6f 100755
--- a/templates/admin/login.template
+++ b/templates/admin/login.template
@@ -11,7 +11,7 @@
   </head>
   <body onLoad="placeFocus()" marginwidth="0" marginheight="0" topmargin="0" leftmargin="0">
     
-	<include "head_nonavi.template">
+  <include "head_nonavi.template">
 
 <center>
       <p>
@@ -23,54 +23,54 @@
                  )
            }
       </p>
-	    
-		<hr>
+      
+    <hr>
 <div style="width:300px;">
 
-	<div class="box-head"><b>${lang("login.title")}</b></div>
-	
-	<div class="box">
-		
-		
+  <div class="box-head"><b>${lang("login.title")}</b></div>
+  
+  <div class="box">
+    
+    
       <form method="post" action="${config.actionRoot}">
         
-		<input type="hidden" name="module" value="login">
+    <input type="hidden" name="module" value="login">
 
-		<table cellpadding="4">
-		<tbody>
-			<tr>
-			<td align="right">${lang("login.name")}:</td>
-			<td align="left"><input type="text" name="login" size="15"></td>
-			</tr>
-			<tr>
-			<td align="right">${lang("login.password")}:</td>
-			<td align="left"><input type="password" name="password" size="15"></td>
-			</tr>
-			<tr>
-			<td align="right">${lang("login.language")}:</td>
-			<td align="left">  
-				<select name="language">
-				<list data.languages as l>
-					<option value="${l.code}" <if l.code==data.defaultlanguage>selected</if> >${l.name}</option>
-				</list>
-				</select>
-			</td>
-			</tr>  
-		<tr>
-			<td colspan="2" align="right">
-				<input type="submit" value="${lang("login.submit")}">
-			</td>
-		</tr>
-		</tbody>
-		</table>                
+    <table cellpadding="4">
+    <tbody>
+      <tr>
+      <td align="right">${lang("login.name")}:</td>
+      <td align="left"><input type="text" name="login" size="15"></td>
+      </tr>
+      <tr>
+      <td align="right">${lang("login.password")}:</td>
+      <td align="left"><input type="password" name="password" size="15"></td>
+      </tr>
+      <tr>
+      <td align="right">${lang("login.language")}:</td>
+      <td align="left">  
+        <select name="language">
+        <list data.languages as l>
+          <option value="${l.code}" <if l.code==data.defaultlanguage>selected</if> >${l.name}</option>
+        </list>
+        </select>
+      </td>
+      </tr>  
+    <tr>
+      <td colspan="2" align="right">
+        <input type="submit" value="${lang("login.submit")}">
+      </td>
+    </tr>
+    </tbody>
+    </table>                
 
       </form>
-	</div>
+  </div>
 </div>
 <br>
 </center>
-	  
-	  <include "foot.template">
+    
+    <include "foot.template">
   
   </body>
 </html>
diff --git a/templates/admin/media.template b/templates/admin/media.template
index 897f852a..a1907ada 100755
--- a/templates/admin/media.template
+++ b/templates/admin/media.template
@@ -16,71 +16,71 @@ function openWin(url) {
 
 <if data.new>
 <form action="${config.actionRoot}?module=OtherMedia&do=add" method="post">
-	<if data.articleid>
-		<input type="hidden" name="articleid" value="${data.articleid}">
-	</if>
-	<if data.commentid>
-		<input type="hidden" name="commentid" value="${data.commentid}">
-	</if>
-	
-	<table border="0">
-		<tr>
-			<td align="right" class="table-left">
-				<b>${lang("media.nr_of_media")} :</b><br>
-			</td>
-			<td class="listrow2">
-				<input type="text" size="3" name="medianum" value="${medianum}">&nbsp;&nbsp;<input type="submit" value="${lang("media.nr_of_media.submit")}">
-			</td>
-		</tr>
-	</table>
+  <if data.articleid>
+    <input type="hidden" name="articleid" value="${data.articleid}">
+  </if>
+  <if data.commentid>
+    <input type="hidden" name="commentid" value="${data.commentid}">
+  </if>
+  
+  <table border="0">
+    <tr>
+      <td align="right" class="table-left">
+        <b>${lang("media.nr_of_media")} :</b><br>
+      </td>
+      <td class="listrow2">
+        <input type="text" size="3" name="medianum" value="${medianum}">&nbsp;&nbsp;<input type="submit" value="${lang("media.nr_of_media.submit")}">
+      </td>
+    </tr>
+  </table>
 </form>
 </if>
 
 
 <form enctype="multipart/form-data" method="post" action="${config.actionRoot}?module=OtherMedia&do=<if data.new>insert<else>update</if>&id=${data.id}">
-	
-	<if data.articleid>
-		<input type="hidden" name="articleid" value="${data.articleid}">
- 	</if>
-	<if data.commentid>
-		<input type="hidden" name="commentid" value="${data.commentid}">
-	</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}">
+  
+  <if data.articleid>
+    <input type="hidden" name="articleid" value="${data.articleid}">
+  </if>
+  <if data.commentid>
+    <input type="hidden" name="commentid" value="${data.commentid}">
+  </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">
+  <table border="0">
 
-	<if !data.new>
-	<tr>
-    	<td align="right" valign="top">
-			<a href="${config.actionRoot}?module=OtherMedia&do=getMedia&id=${data.id}">
-	  	  	<img src="${config.docRoot}/img/${data.big_icon}" border=0></a>&nbsp;&nbsp;
-		</td>
-		<td valign="bottom" class="small">
-			${lang("media.created")}: ${data.webdb_create}
-			<if data.webdb_lastchange>/ ${lang("media.changed")} ${data.webdb_lastchange}</if><br>
-			<if data.is_published=="1">${lang("media.published")}: ${data.publish_date} / ${data.publish_server}${data.publish_path}<br></if>
-			${lang("media.format")}: ${data.mimetype} / ${data.media_descr}<br>
-			${lang("media.size")}: ${data.human_readable_size}<br>
-			${lang("media.rights")}: <b>${data.rightsHashdata[to_rights]["name"]}</b><br>
-		</td>
-  	</tr>
-	</if>
+  <if !data.new>
+  <tr>
+      <td align="right" valign="top">
+      <a href="${config.actionRoot}?module=OtherMedia&do=getMedia&id=${data.id}">
+          <img src="${config.docRoot}/img/${data.big_icon}" border=0></a>&nbsp;&nbsp;
+    </td>
+    <td valign="bottom" class="small">
+      ${lang("media.created")}: ${data.webdb_create}
+      <if data.webdb_lastchange>/ ${lang("media.changed")} ${data.webdb_lastchange}</if><br>
+      <if data.is_published=="1">${lang("media.published")}: ${data.publish_date} / ${data.publish_server}${data.publish_path}<br></if>
+      ${lang("media.format")}: ${data.mimetype} / ${data.media_descr}<br>
+      ${lang("media.size")}: ${data.human_readable_size}<br>
+      ${lang("media.rights")}: <b>${data.rightsHashdata[to_rights]["name"]}</b><br>
+    </td>
+    </tr>
+  </if>
 
-	<tr>
-		<td align="right" class="table-left">
-			<B>${lang("media.mediafolder")}:</B>
-		</td>
-		<td class="listrow2">
-			<select name="to_media_folder">
- 			<list extra.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" class="table-left">
+      <B>${lang("media.mediafolder")}:</B>
+    </td>
+    <td class="listrow2">
+      <select name="to_media_folder">
+      <list extra.mediafolderPopupData as m>
+        <option value="${m.key}" <if m.key == data.to_media_folder>selected</if>>${m.value}</option>
+      </list>
+        </select>
+    </td>
+  </tr>
 
         <if !data.new>
           <call TextInputTableRow (lang("media.title"), 40, 80, "title", data.title)>
@@ -90,43 +90,43 @@ function openWin(url) {
         <call TextAreaTableRow  (lang("media.description"), "", 40, 2, "description", data.description)>
         <call TextAreaTableRow  (lang("media.comment"), "", 40, 2, "comment", data.comment)>
         <call TextInputTableRow (lang("media.source"), 40, 80, "source", data.source)>
-	
-	<tr><td colspan="2" class="x-small">&nbsp;</td></tr>
-	
-	<if data.new>
-	<tr>
-		<td align="right" class="table-left">
-			${lang("media.is_published")} : 
-		</td>
-		<td class="listrow2" style='border: 1px solid #FF0000;'>
-			<input type="checkbox" name="is_published" value="1"<if data.is_published!="0" && data.is_published!=""> checked</if>>	
-		</td>
-	</tr>
-	
-	<tr><td colspan="2" class="x-small">&nbsp;</td></tr>
-	
-	<list data.mediafields as m>
-	<tr>
-		<td align="right" class="table-left">
-			<B>${lang("media.title")}:<B>
-		 </td>
-		<td class="listrow2">
-			<input type="text" name="media_title${m}" size="40" maxlength="80" value="">
-		</td>
-	</tr>
-	<tr>
-		<td align="right">
-			&nbsp;
-		</td>
-		<td class="listrow2">
-			<input type="file" name="media${m}"><br>
-		</td>
-	</tr>
-	</list>
-	</if>
+  
+  <tr><td colspan="2" class="x-small">&nbsp;</td></tr>
+  
+  <if data.new>
+  <tr>
+    <td align="right" class="table-left">
+      ${lang("media.is_published")} : 
+    </td>
+    <td class="listrow2" style='border: 1px solid #FF0000;'>
+      <input type="checkbox" name="is_published" value="1"<if data.is_published!="0" && data.is_published!=""> checked</if>>  
+    </td>
+  </tr>
+  
+  <tr><td colspan="2" class="x-small">&nbsp;</td></tr>
+  
+  <list data.mediafields as m>
+  <tr>
+    <td align="right" class="table-left">
+      <B>${lang("media.title")}:<B>
+     </td>
+    <td class="listrow2">
+      <input type="text" name="media_title${m}" size="40" maxlength="80" value="">
+    </td>
+  </tr>
+  <tr>
+    <td align="right">
+      &nbsp;
+    </td>
+    <td class="listrow2">
+      <input type="file" name="media${m}"><br>
+    </td>
+  </tr>
+  </list>
+  </if>
 
     <td colspan="2" align="right" class="table-foot">
-	<if data.new>
+  <if data.new>
       <input type="submit" name="save" value="${lang("insert")}">
     <else>
      ${lang("media.is_published")} <input type="checkbox" name="is_published" value="1"<if data.is_published!="0" && data.is_published!=""> checked</if>>
diff --git a/templates/admin/mediafolder.template b/templates/admin/mediafolder.template
index 66c865e2..0389eb9f 100755
--- a/templates/admin/mediafolder.template
+++ b/templates/admin/mediafolder.template
@@ -10,10 +10,10 @@
 <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 data.new> <input type="hidden" name="do" value="insert">
-	<else>	 <input type="hidden" name="do" value="update"></if>
+  <input type=hidden name=module value=Mediafolder>
+  <input type="hidden" name="id" value="${data.id}">
+  <if data.new> <input type="hidden" name="do" value="insert">
+  <else>   <input type="hidden" name="do" value="update"></if>
 
 <table border="0" cellspacing="2" cellpadding="2">
 <call TextInputTableRow (lang("mediafolder.date"), 8, 8, "date", data.date)>
@@ -25,9 +25,9 @@
 
   <tr>
     <td colspan="4" align="right" class="table-foot"> 
-		<if data.new> <input type="submit" name="save" value="${lang("insert")}">
-    	<else>   <input type="submit" name="save" value="${lang("save")}"></if>
-		
+    <if data.new> <input type="submit" name="save" value="${lang("insert")}">
+      <else>   <input type="submit" name="save" value="${lang("save")}"></if>
+    
     </td>
   </tr>
 </table>
@@ -36,7 +36,7 @@
     <p>      
       <a class="link-box" href="${config.actionRoot}?module=Mediafolder&do=list">[&lt;] ${lang("list")} </a> &nbsp;
       <a class="link-box" href="${config.actionRoot}">[&lt;&lt;&lt;] ${lang("head.start")}</a>
-	</p>
+  </p>
 
 <include "foot.template">
 </body>
diff --git a/templates/admin/mediafolderlist.template b/templates/admin/mediafolderlist.template
index e5e7efd0..06b3a31c 100755
--- a/templates/admin/mediafolderlist.template
+++ b/templates/admin/mediafolderlist.template
@@ -1,6 +1,6 @@
 <html>
 <head>
-	<title>${config["Mir.Name"]} | ${lang("mediafolderlist.htmltitle")}</title>
+  <title>${config["Mir.Name"]} | ${lang("mediafolderlist.htmltitle")}</title>
         <link rel="stylesheet" type="text/css" href="${config.docRoot}/style/admin.css">
 </head>
 
@@ -8,40 +8,40 @@
 
 <include "head.template">
 <if data.contentlist>
-	<table border="0">
-  		<tr class="darkgrey">
-    		<td class="table-head">${lang("mediafolder.date")}</td>
-		    <td class="table-head">${lang("mediafolder.name")}</td>
-    		<td class="table-head">${lang("mediafolder.location")}</td>
-			<td class="table-head">${lang("mediafolder.comment")}</td>
-			<td class="table-head">${lang("mediafolder.keywords")}</td>
-			<td class="table-head">&nbsp;</td>
- 		 </tr>
-	  <list data.contentlist as entry>
-		  <tr <if grey=="1"><assign grey="0">class="listrow1"<else>class="listrow2"<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><a href="${config.actionRoot}?module=Mediafolder&do=delete&id=${entry.id}">${lang("delete")}</a>
-    			| <a href="${config.actionRoot}?module=Mediafolder&do=edit&id=${entry.id}">${lang("edit")}</a>
-				| <a href="${config.actionRoot}?module=Images&do=list&query_media_folder=${entry.id}">${lang("list")}</a></td>
- 		  </tr>
-  	  </list>
-  		<tr>
-    	<td colspan="6" class="table-foot">${data.count} ${lang("records")} /
+  <table border="0">
+      <tr class="darkgrey">
+        <td class="table-head">${lang("mediafolder.date")}</td>
+        <td class="table-head">${lang("mediafolder.name")}</td>
+        <td class="table-head">${lang("mediafolder.location")}</td>
+      <td class="table-head">${lang("mediafolder.comment")}</td>
+      <td class="table-head">${lang("mediafolder.keywords")}</td>
+      <td class="table-head">&nbsp;</td>
+     </tr>
+    <list data.contentlist as entry>
+      <tr <if grey=="1"><assign grey="0">class="listrow1"<else>class="listrow2"<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><a href="${config.actionRoot}?module=Mediafolder&do=delete&id=${entry.id}">${lang("delete")}</a>
+          | <a href="${config.actionRoot}?module=Mediafolder&do=edit&id=${entry.id}">${lang("edit")}</a>
+        | <a href="${config.actionRoot}?module=Images&do=list&query_media_folder=${entry.id}">${lang("list")}</a></td>
+      </tr>
+      </list>
+      <tr>
+      <td colspan="6" class="table-foot">${data.count} ${lang("records")} /
         ${lang("show_from_to", data.from, data.to)}</td>
-    	<td>&nbsp;</td>
-  		</tr>
-	</table>
+      <td>&nbsp;</td>
+      </tr>
+  </table>
       <P>
-	<if data.prev>
-	<a href="${config.actionRoot}?module=Mediafolder&do=list&where=${data.where}&prevoffset=${data.prev}&prev=zur&uuml;ck">${lang("list.previous")}</a>&nbsp;
-	</if>
-	<if data.next>
-	<a href="${config.actionRoot}?module=Mediafolder&do=list&where=${data.where}&nextoffset=${data.next}&next=weiter">${lang("list.next")}</a>
-	</if>
+  <if data.prev>
+  <a href="${config.actionRoot}?module=Mediafolder&do=list&where=${data.where}&prevoffset=${data.prev}&prev=zur&uuml;ck">${lang("list.previous")}</a>&nbsp;
+  </if>
+  <if data.next>
+  <a href="${config.actionRoot}?module=Mediafolder&do=list&where=${data.where}&nextoffset=${data.next}&next=weiter">${lang("list.next")}</a>
+  </if>
 <else>
   <P align="center" class="box">${lang("no_matches_found")}</p>
 </if>
@@ -49,7 +49,7 @@
     <p>
       <a class="link-box" href="${config.actionRoot}?module=Mediafolder&do=add">[+] ${lang("add")}</a> &nbsp;
       <a class="link-box" href="${config.actionRoot}">[&lt;&lt;&lt;] ${lang("head.start")}</a>
-	</p>
+  </p>
 
 <include "foot.template">
 </body>
diff --git a/templates/admin/medialist.template b/templates/admin/medialist.template
index 144e31dc..4875d556 100755
--- a/templates/admin/medialist.template
+++ b/templates/admin/medialist.template
@@ -1,6 +1,6 @@
 <html>
 <head>
-	<title>${config["Mir.Name"]} | ${lang("other_medialist.htmltitle")}</title>
+  <title>${config["Mir.Name"]} | ${lang("other_medialist.htmltitle")}</title>
         <link rel="stylesheet" type="text/css" href="${config.docRoot}/style/admin.css">
 </head>
 
diff --git a/templates/admin/message.template b/templates/admin/message.template
index 1b3e7abb..244b2908 100755
--- a/templates/admin/message.template
+++ b/templates/admin/message.template
@@ -10,19 +10,19 @@
 
 
 <form action="${config.actionRoot}" method="post">
-	<input type="hidden" name="module" value="Message">
-	<input type="hidden" name="id" value="${data.id}">
-	<if data.new>
-		<input type="hidden" name="do" value="insert">
-	<else>
-		<input type="hidden" name="do" value="update">
-	</if>
-	
+  <input type="hidden" name="module" value="Message">
+  <input type="hidden" name="id" value="${data.id}">
+  <if data.new>
+    <input type="hidden" name="do" value="insert">
+  <else>
+    <input type="hidden" name="do" value="update">
+  </if>
+  
 <table border="0">
   
   <tr>
     <td align="right" class="table-left">
-	${lang("message.date")}:</td>
+  ${lang("message.date")}:</td>
     <td>
       ${data.date}
     </td>
@@ -37,14 +37,14 @@
 
   <tr>
     <td class="table-foot">
-	${lang("message.textinfo")}
-	</td>
-	
-	<td align="right" class="table-foot"> 
-	<if new>
-		<input type="submit" name="save" value="${lang("insert")}">
+  ${lang("message.textinfo")}
+  </td>
+  
+  <td align="right" class="table-foot"> 
+  <if new>
+    <input type="submit" name="save" value="${lang("insert")}">
     <else>
-		<input type="submit" name="save" value="${lang("save")}">
+    <input type="submit" name="save" value="${lang("save")}">
     </if> 
     </td>
   </tr>
@@ -55,7 +55,7 @@
       
       <a class="link-box" href="${config.actionRoot}?module=Message&do=list">[&lt;] ${lang("back")} </a> &nbsp;
       <a class="link-box" href="${config.actionRoot}">[&lt;&lt;&lt;] ${lang("head.start")}</a>
-	</p>
+  </p>
 
 
 <include "foot.template">
diff --git a/templates/admin/messagelist.template b/templates/admin/messagelist.template
index 1700a22c..c487cb68 100755
--- a/templates/admin/messagelist.template
+++ b/templates/admin/messagelist.template
@@ -1,7 +1,7 @@
 <html>
 <head>
-	<title>${config["Mir.Name"]} | ${lang("messagelist.htmltitle")}</title>
-	<link rel="stylesheet" type="text/css" href="${config.docRoot}/style/admin.css">
+  <title>${config["Mir.Name"]} | ${lang("messagelist.htmltitle")}</title>
+  <link rel="stylesheet" type="text/css" href="${config.docRoot}/style/admin.css">
 </head>
 
 <body marginwidth="0" marginheight="0" topmargin="0" leftmargin="0">
@@ -9,8 +9,8 @@
 <include "head.template">
 
 <p>
-	<a class="link-box" href="${config.actionRoot}?module=Message&do=add">[+] ${lang("add")}</a> &nbsp;
-	<a class="link-box" href="${config.actionRoot}">[&lt;&lt;&lt;] ${lang("head.start")}</a>
+  <a class="link-box" href="${config.actionRoot}?module=Message&do=add">[+] ${lang("add")}</a> &nbsp;
+  <a class="link-box" href="${config.actionRoot}">[&lt;&lt;&lt;] ${lang("head.start")}</a>
 </p>
 
 <if data.contentlist>
@@ -18,28 +18,28 @@
 <table border="0" cellpadding="2" cellspacing="1" width="70%">
   <tr>
     <td class="table-head">
-		${lang("message.date")}</td>
+    ${lang("message.date")}</td>
     <td class="table-head">
-	 	${lang("message.title")} /<br>${lang("message.creator")}</td>
+    ${lang("message.title")} /<br>${lang("message.creator")}</td>
     <td colspan="2" class="table-head">
-		${lang("message.text")}</td>
+    ${lang("message.text")}</td>
   </tr>
 
   <list data.contentlist as entry>
   <tr
-		<if grey=="1">
-			<assign grey="0">class="listrow1"
-		<else>class="listrow2"
-			<assign grey="1"> 
-		</if> >
+    <if grey=="1">
+      <assign grey="0">class="listrow1"
+    <else>class="listrow2"
+      <assign grey="1"> 
+    </if> >
   <td class="x-small" valign="top">${entry.webdb_create}&nbsp;</td>
   <td valign="top"><span class="small"><b>${entry.title}</b></span><br>
      <span class="x-small">${lang("by")}: ${entry.creator}</span></td>
   <td>${entry.description}&nbsp;</td>
   <td valign="top">
-  		<a class="listcommand" href="${config.actionRoot}?module=Message&do=delete&id=${entry.id}">[&nbsp;${lang("delete")}&nbsp;]</a><br>
-		<a class="listcommand" href="${config.actionRoot}?module=Message&do=edit&id=${entry.id}">[&nbsp;${lang("edit")}&nbsp;]</a>
-	</td>
+      <a class="listcommand" href="${config.actionRoot}?module=Message&do=delete&id=${entry.id}">[&nbsp;${lang("delete")}&nbsp;]</a><br>
+    <a class="listcommand" href="${config.actionRoot}?module=Message&do=edit&id=${entry.id}">[&nbsp;${lang("edit")}&nbsp;]</a>
+  </td>
   </tr>
   </list>
   
@@ -53,10 +53,10 @@
 
       <P>
 <if data.prev>
-	<a class="majorcommand" href="${config.actionRoot}?module=Message&do=list&where=${data.where}&offset=${data.prev}&prev=zurück">[&nbsp;${lang("list.previous")}&nbsp;]</a>&nbsp;
+  <a class="majorcommand" href="${config.actionRoot}?module=Message&do=list&where=${data.where}&offset=${data.prev}&prev=zurück">[&nbsp;${lang("list.previous")}&nbsp;]</a>&nbsp;
 </if>
 <if data.next>
-	<a class="majorcommand" href="${config.actionRoot}?module=Message&do=list&where=${data.where}&offset=${data.next}&next=weiter">[&nbsp;${lang("list.next")}&nbsp;]</a>
+  <a class="majorcommand" href="${config.actionRoot}?module=Message&do=list&where=${data.where}&offset=${data.next}&next=weiter">[&nbsp;${lang("list.next")}&nbsp;]</a>
 </if>
 
 <else>
diff --git a/templates/admin/producerqueue.template b/templates/admin/producerqueue.template
index 8e40598f..ce9631bb 100755
--- a/templates/admin/producerqueue.template
+++ b/templates/admin/producerqueue.template
@@ -1,6 +1,6 @@
 <html>
 <head>
-	<title>${config["Mir.Name"]} | ${lang("producerqueue.htmltitle")}</title>
+  <title>${config["Mir.Name"]} | ${lang("producerqueue.htmltitle")}</title>
 <link rel="stylesheet" type="text/css" href="${config.docRoot}/style/admin.css">
 </head>
 
@@ -12,33 +12,33 @@
 <p class="box"><b>${lang("producer.producerlist.title")}</b></p>
 
 <table border="0" cellspacing="3" cellpadding="2">
-	<tr>
-		<td class="box_head" colspan="2"><b>${lang("producer.verb.name")}</b></td>
-		<td class="box_head" colspan="2"><b>${lang("producer.verb.description")}</b></td>
-		
-	</tr>
-
-	<assign grey="0">
-	<list producers as p>
-		<tr>
-			<td colspan="4" class="table-head"><b>${p.name}</b></td>
-		</tr>
-
-		<list p.verbs as v>
-		<tr <if grey=="1">class="listrow2"<else>class="listrow2"</if>>
-			<td width="25"></td>
-			<if v.name=="all">
-				<td class="small text-alert">${v.name} [!]</td>
-			<else>
-				<td class="small">${v.name}</td>
-			</if>
-			<td class="small">${v.description}</td>
-			<td class="small"><a href="${config.actionRoot}?module=Producer&do=enqueue&producer=${utility.encodeURI(p.name)}&verb=${utility.encodeURI(v.name)}">${lang("producer.verb.enqueue")}</a>&nbsp;</td>
-		</tr>
-		<if grey=="1"><assign grey="0"><else><assign grey="1"></if>
-		</list>
-		
-	</list>
+  <tr>
+    <td class="box_head" colspan="2"><b>${lang("producer.verb.name")}</b></td>
+    <td class="box_head" colspan="2"><b>${lang("producer.verb.description")}</b></td>
+    
+  </tr>
+
+  <assign grey="0">
+  <list producers as p>
+    <tr>
+      <td colspan="4" class="table-head"><b>${p.name}</b></td>
+    </tr>
+
+    <list p.verbs as v>
+    <tr <if grey=="1">class="listrow2"<else>class="listrow2"</if>>
+      <td width="25"></td>
+      <if v.name=="all">
+        <td class="small text-alert">${v.name} [!]</td>
+      <else>
+        <td class="small">${v.name}</td>
+      </if>
+      <td class="small">${v.description}</td>
+      <td class="small"><a href="${config.actionRoot}?module=Producer&do=enqueue&producer=${utility.encodeURI(p.name)}&verb=${utility.encodeURI(v.name)}">${lang("producer.verb.enqueue")}</a>&nbsp;</td>
+    </tr>
+    <if grey=="1"><assign grey="0"><else><assign grey="1"></if>
+    </list>
+    
+  </list>
 </table>
 
 
@@ -51,46 +51,46 @@
 <p class="box" align="left"><b>${lang("producer.jobqueue.title")}</b></p>
 
 <table border="0" cellspacing="3" cellpadding="2">
-	<tr >
-		<td class="bg-neutral" colspan="2"><b>${lang("producer.job.name")}</b></td>
-		<td class="bg-neutral" ><b>${lang("producer.job.status")}</b></td>
-		<td class="bg-neutral small" ><b>${lang("producer.job.date")}</b></td>
-		<comment>    
-		<td class="box-head" >&nbsp;</td>
-		</comment>    
-	</tr>
-
-	<if queue>
-		<assign grey="1">
-		<list queue as q>
-			<tr <if grey=="1">class="listrow1"<else>class="listrow2"</if>>
-				<td class="small">${q.factory}</td>
-				<td class="small">(${q.verb})</td>
-				
-				<if q.status=="pending">
-					<td class="text-alert small">${q.status}</td>
-				<else>
-					<td class="small">${q.status}</td>
-				</if>
-				
-				<td class="small">${q.lastchange["HH:mm:ss"]}</td>
-				<comment> ML: needs to be implemented       
-					<td><a href="${config.actionRoot}?module=Producer&do=abort">${lang("producer.job.cancel")}</a></td>
-				</comment>        
-			</tr>
-			<if grey=="1"><assign grey="0"><else><assign grey="1"></if>
-		</list>
-	<else>
-		<tr class="list2">
-			<td colspan="5" align="center">${lang("producer.job.empty")}</td>
-		</tr>
-	</if>
-	<tr>
-		<td colspan="5" class="table-foot">
-			<br>
-			<a class="link-box"  href="${config.actionRoot}?${thisurl}">${lang("producer.jobqueue.refresh")}</a>
-		</td>
-	</tr>
+  <tr >
+    <td class="bg-neutral" colspan="2"><b>${lang("producer.job.name")}</b></td>
+    <td class="bg-neutral" ><b>${lang("producer.job.status")}</b></td>
+    <td class="bg-neutral small" ><b>${lang("producer.job.date")}</b></td>
+    <comment>    
+    <td class="box-head" >&nbsp;</td>
+    </comment>    
+  </tr>
+
+  <if queue>
+    <assign grey="1">
+    <list queue as q>
+      <tr <if grey=="1">class="listrow1"<else>class="listrow2"</if>>
+        <td class="small">${q.factory}</td>
+        <td class="small">(${q.verb})</td>
+        
+        <if q.status=="pending">
+          <td class="text-alert small">${q.status}</td>
+        <else>
+          <td class="small">${q.status}</td>
+        </if>
+        
+        <td class="small">${q.lastchange["HH:mm:ss"]}</td>
+        <comment> ML: needs to be implemented       
+          <td><a href="${config.actionRoot}?module=Producer&do=abort">${lang("producer.job.cancel")}</a></td>
+        </comment>        
+      </tr>
+      <if grey=="1"><assign grey="0"><else><assign grey="1"></if>
+    </list>
+  <else>
+    <tr class="list2">
+      <td colspan="5" align="center">${lang("producer.job.empty")}</td>
+    </tr>
+  </if>
+  <tr>
+    <td colspan="5" class="table-foot">
+      <br>
+      <a class="link-box"  href="${config.actionRoot}?${thisurl}">${lang("producer.jobqueue.refresh")}</a>
+    </td>
+  </tr>
 </table>
 
 </td></tr></table>
diff --git a/templates/admin/start_admin.template b/templates/admin/start_admin.template
index 3c248a90..903f4109 100755
--- a/templates/admin/start_admin.template
+++ b/templates/admin/start_admin.template
@@ -10,45 +10,45 @@
   <include "head.template">
 
 <table border="0" width="100%">
-	<tr>
-		<td valign="top" width="40%">
-		<!-- ###### left column ###### -->
-		<p class="box-head"><b>${lang("start.administer.title")}</b></p>
-		<p class="box"> 
-		  <list administeroperations as a>
+  <tr>
+    <td valign="top" width="40%">
+    <!-- ###### left column ###### -->
+    <p class="box-head"><b>${lang("start.administer.title")}</b></p>
+    <p class="box"> 
+      <list administeroperations as a>
           <a href="${config.actionRoot}?${a.url}">${lang("start.administer."+a.name)}</a><br>
-		  </list>
+      </list>
 <!--      
-			<a href="${config.actionRoot}?module=Content&do=list&where=is_published%3d'1'%20and%20to_article_type%3D0&order=webdb_create%20desc">&gt; ${lang("start.allarticlesoftype", lang("articletypes.openposting"))}</a>	
-			<br>
-			<a href="${config.actionRoot}?module=Comment&do=list">
-				&gt; ${lang("start.content.comments")}
-			</a>
--->			
-		</p>
-
-	 	<p class="box-head"><b>${lang("start.list.title")}</b></p>	
-		<p class="box">
+      <a href="${config.actionRoot}?module=Content&do=list&where=is_published%3d'1'%20and%20to_article_type%3D0&order=webdb_create%20desc">&gt; ${lang("start.allarticlesoftype", lang("articletypes.openposting"))}</a>  
+      <br>
+      <a href="${config.actionRoot}?module=Comment&do=list">
+        &gt; ${lang("start.content.comments")}
+      </a>
+-->     
+    </p>
+
+    <p class="box-head"><b>${lang("start.list.title")}</b></p>  
+    <p class="box">
       <list articletypes as a>
-    			<a href="${config.actionRoot}?module=Content&do=list&where=is_published%3d'1'%20and%20to_article_type%3D${a.id}&order=webdb_create%20desc">&gt; ${lang("start.allarticlesoftype", lang("articletypes."+a.name))}</a><br>
+          <a href="${config.actionRoot}?module=Content&do=list&where=is_published%3d'1'%20and%20to_article_type%3D${a.id}&order=webdb_create%20desc">&gt; ${lang("start.allarticlesoftype", lang("articletypes."+a.name))}</a><br>
       </list>
-			<br>	
-			<a href="${config.actionRoot}?module=Content&do=list&where=${utility.encodeURI("is_published='f'")}&order=${utility.encodeURI("webdb_create desc")}" >&gt; ${lang("start.content.not_published")}</a><br>
-			<a href="${config.actionRoot}?module=Content&do=list&where=${utility.encodeURI("id in (select content_id from content_x_media, media where media.id=media_id)")}&order=${utility.encodeURI("webdb_create desc")}">&gt; ${lang("start.content.with_media")}</a><br>
-			<a href="${config.actionRoot}?module=Content&do=list&where=&order=${utility.encodeURI("webdb_lastchange desc")}">&gt; ${lang("start.content.last_changes")}</a><br>
-			<a href="${config.actionRoot}?module=Content&do=list&where=${utility.encodeURI("not (comment is null or comment like '')")}&order=${utility.encodeURI("webdb_create desc")}">&gt; ${lang("start.content.with_comments")}</a><br>
-			<br>
-			<a href="${config.actionRoot}?module=Content&do=list&where=&order=${utility.encodeURI("webdb_create desc")}">&gt; ${lang("start.content.all")}</a><br>
-		</p>
-
-		<p class="box-head"><b>${lang("start.extra.title")}</b></p>		
-		<p class="box">	
-			<a href="${config.actionRoot}?module=Hidden&do=list">&gt; ${lang("start.content.hidden")}</a>
-			<list fileeditentries as e>
-			  <br>
+      <br>  
+      <a href="${config.actionRoot}?module=Content&do=list&where=${utility.encodeURI("is_published='f'")}&order=${utility.encodeURI("webdb_create desc")}" >&gt; ${lang("start.content.not_published")}</a><br>
+      <a href="${config.actionRoot}?module=Content&do=list&where=${utility.encodeURI("id in (select content_id from content_x_media, media where media.id=media_id)")}&order=${utility.encodeURI("webdb_create desc")}">&gt; ${lang("start.content.with_media")}</a><br>
+      <a href="${config.actionRoot}?module=Content&do=list&where=&order=${utility.encodeURI("webdb_lastchange desc")}">&gt; ${lang("start.content.last_changes")}</a><br>
+      <a href="${config.actionRoot}?module=Content&do=list&where=${utility.encodeURI("not (comment is null or comment like '')")}&order=${utility.encodeURI("webdb_create desc")}">&gt; ${lang("start.content.with_comments")}</a><br>
+      <br>
+      <a href="${config.actionRoot}?module=Content&do=list&where=&order=${utility.encodeURI("webdb_create desc")}">&gt; ${lang("start.content.all")}</a><br>
+    </p>
+
+    <p class="box-head"><b>${lang("start.extra.title")}</b></p>   
+    <p class="box"> 
+      <a href="${config.actionRoot}?module=Hidden&do=list">&gt; ${lang("start.content.hidden")}</a>
+      <list fileeditentries as e>
+        <br>
           <a href="${config.actionRoot}?module=FileEdit&do=list&entry=${e}">&gt; ${lang("start.fileedit."+e+".title")}</a>
       </list>
-		</p>
+    </p>
 </td>
 
 <!-- ###### end left column ###### -->
@@ -57,119 +57,119 @@
 <!-- ###### Spacer-column ###### -->
 
 <comment> Middle column </comment>
-			
+      
     <td valign="top" width="30%">
-		
-		<p class="box-head"><b>${lang("start.addandedit.title")}</b></p>
-		<div class="box">
-			<a href="${config.actionRoot}?module=Content&do=add&where=aktuell">&gt; ${lang("start.content.new")}</a>
-			<br>
-			
-			<a href="${config.actionRoot}?module=Breaking&do=list">&gt; ${lang("start.breaking.title")}</a>&nbsp;
-			<a href="${config.actionRoot}?module=Breaking&do=add">[+]</a>
-			<form>
-				<input type="hidden" name="module" value="Content">
-				<input type="hidden" name="do" value="edit">
-				${lang("start.open_by_id")}: 
-				<input type="text" name="id" value="" size="7">
-				<input type="submit" value=" &gt; ">
-			</form>
-			
-			
-		</div>
-		
-		<p class="box-head"><b>${lang("start.media.title")}</b></p>	
-		<div class="box">
-			
-			<a href="${config.actionRoot}?module=Images&do=list">&gt; ${lang("start.images.title")}</a>&nbsp;
-			<a href="${config.actionRoot}?module=Images&do=add">[+]</a><br>
-
-			<a href="${config.actionRoot}?module=Audio&do=list">&gt; ${lang("start.audio.title")}</a>&nbsp;
-			<a href="${config.actionRoot}?module=Audio&do=add">[+]</a><br>
-
-			
-			<a href="${config.actionRoot}?module=Video&do=list">&gt; ${lang("start.video.title")}</a>&nbsp;
-			<a href="${config.actionRoot}?module=Video&do=add">[+]</a><br>
-
-			
-			<a href="${config.actionRoot}?module=OtherMedia&do=list">&gt; ${lang("start.other_media.title")}</a>&nbsp;
-			<a href="${config.actionRoot}?module=OtherMedia&do=add" >[+]</a><br>
-
-			<br>
-			<a href="${config.actionRoot}?module=Mediafolder&do=list">&gt; ${lang("start.mediafolder.title")}</a>&nbsp;
-			<a href="${config.actionRoot}?module=Mediafolder&do=add">[+]</a><br>
-		</div>
-		
-		
-		
-		<p class="box-head"><b>${lang("start.producers.title")}</b></p>
-		<p class="box">
-			<a href="${config.actionRoot}?module=Producer&do=produceAllNew">&gt; ${lang("start.producers.produceAllNew")}</a><br>
-			<a href="${config.actionRoot}?module=Producer&do=showProducerQueueStatus">&gt; ${lang("start.producers.advanced")}</a>
-		</p>
-		
-		<p class="box bg-neutral">
-			<a href="${config.actionRoot}?module=Admin&do=superusermenu">${lang("start.superusermenu")}</a>		
-		</p>
-
-	</td>
+    
+    <p class="box-head"><b>${lang("start.addandedit.title")}</b></p>
+    <div class="box">
+      <a href="${config.actionRoot}?module=Content&do=add&where=aktuell">&gt; ${lang("start.content.new")}</a>
+      <br>
+      
+      <a href="${config.actionRoot}?module=Breaking&do=list">&gt; ${lang("start.breaking.title")}</a>&nbsp;
+      <a href="${config.actionRoot}?module=Breaking&do=add">[+]</a>
+      <form>
+        <input type="hidden" name="module" value="Content">
+        <input type="hidden" name="do" value="edit">
+        ${lang("start.open_by_id")}: 
+        <input type="text" name="id" value="" size="7">
+        <input type="submit" value=" &gt; ">
+      </form>
+      
+      
+    </div>
+    
+    <p class="box-head"><b>${lang("start.media.title")}</b></p> 
+    <div class="box">
+      
+      <a href="${config.actionRoot}?module=Images&do=list">&gt; ${lang("start.images.title")}</a>&nbsp;
+      <a href="${config.actionRoot}?module=Images&do=add">[+]</a><br>
+
+      <a href="${config.actionRoot}?module=Audio&do=list">&gt; ${lang("start.audio.title")}</a>&nbsp;
+      <a href="${config.actionRoot}?module=Audio&do=add">[+]</a><br>
+
+      
+      <a href="${config.actionRoot}?module=Video&do=list">&gt; ${lang("start.video.title")}</a>&nbsp;
+      <a href="${config.actionRoot}?module=Video&do=add">[+]</a><br>
+
+      
+      <a href="${config.actionRoot}?module=OtherMedia&do=list">&gt; ${lang("start.other_media.title")}</a>&nbsp;
+      <a href="${config.actionRoot}?module=OtherMedia&do=add" >[+]</a><br>
+
+      <br>
+      <a href="${config.actionRoot}?module=Mediafolder&do=list">&gt; ${lang("start.mediafolder.title")}</a>&nbsp;
+      <a href="${config.actionRoot}?module=Mediafolder&do=add">[+]</a><br>
+    </div>
+    
+    
+    
+    <p class="box-head"><b>${lang("start.producers.title")}</b></p>
+    <p class="box">
+      <a href="${config.actionRoot}?module=Producer&do=produceAllNew">&gt; ${lang("start.producers.produceAllNew")}</a><br>
+      <a href="${config.actionRoot}?module=Producer&do=showProducerQueueStatus">&gt; ${lang("start.producers.advanced")}</a>
+    </p>
+    
+    <p class="box bg-neutral">
+      <a href="${config.actionRoot}?module=Admin&do=superusermenu">${lang("start.superusermenu")}</a>   
+    </p>
+
+  </td>
 
     <td width="2%">&nbsp;</td>
 
 <comment> RIGHT COLUMN </comment>
 
-	<td valign="top" width="26%" rowspan="2">
-
-	<comment>internal messageboard</comment>
-
-
-		<p class="box-head"><b>${lang("start.messageboard.title")}</b></p>
-		<div class="box-bg">
-			<span class="small">
-				<a href="${config.actionRoot}?module=Message&do=add">[ + ${lang("add")}]</a> 
-				<a href="${config.actionRoot}?module=Message&do=list">[${lang("edit")}]</a>
-			</span>
-			<if messages>
-				<list messages as m>
-					<p class="x-small">
-						<if m.title><b>${m.title}</b><br></if>
-						${m.description}<br>
-						<span class="x-small">
-							<if m.creator><i>by: ${m.creator}</i> / </if>${m.webdb_create}<br>
-						</span>
-					</p>
-				</list>
-			<else>
-				<p><i>${lang("start.messageboard.no_messages")}</i>
-			</if></span>
-		</div>
-	</td>
-
- 	</tr>
-	
-	<comment> BOTTOM ROW FOR SEARCH </comment>
-	<tr>
-		<td colspan="3" valign="top">
-			<p class="box-head"><b>${lang("start.search.title")}</b></p>
-			<div class="box">
-				<call ContentSearch ("")>
-			</div>
-			
-			<!-- HELP -DEMO -->
-			<p class="box">
-				<b>HELP-Demo:</b><br>
-				popup small-link: <call Help ("../help/content_datum.html", "1", "" )>&nbsp;&nbsp;  popup big-link: <call Help ("../help/content_datum.html", "1", "1" )><br><br>
-				newwin small-link: <call Help ("../help/content_datum.html", "", "" )>&nbsp;&nbsp; newwin big-link: <call Help ("../help/content_datum.html", "", "1" )>
-			</p>
-			
-			
-		</td>
-		<td>&nbsp;</td>
-	</tr>
-	
+  <td valign="top" width="26%" rowspan="2">
+
+  <comment>internal messageboard</comment>
+
+
+    <p class="box-head"><b>${lang("start.messageboard.title")}</b></p>
+    <div class="box-bg">
+      <span class="small">
+        <a href="${config.actionRoot}?module=Message&do=add">[ + ${lang("add")}]</a> 
+        <a href="${config.actionRoot}?module=Message&do=list">[${lang("edit")}]</a>
+      </span>
+      <if messages>
+        <list messages as m>
+          <p class="x-small">
+            <if m.title><b>${m.title}</b><br></if>
+            ${m.description}<br>
+            <span class="x-small">
+              <if m.creator><i>by: ${m.creator}</i> / </if>${m.webdb_create}<br>
+            </span>
+          </p>
+        </list>
+      <else>
+        <p><i>${lang("start.messageboard.no_messages")}</i>
+      </if></span>
+    </div>
+  </td>
+
+  </tr>
+  
+  <comment> BOTTOM ROW FOR SEARCH </comment>
+  <tr>
+    <td colspan="3" valign="top">
+      <p class="box-head"><b>${lang("start.search.title")}</b></p>
+      <div class="box">
+        <call ContentSearch ("")>
+      </div>
+      
+      <!-- HELP -DEMO -->
+      <p class="box">
+        <b>HELP-Demo:</b><br>
+        popup small-link: <call Help ("../help/content_datum.html", "1", "" )>&nbsp;&nbsp;  popup big-link: <call Help ("../help/content_datum.html", "1", "1" )><br><br>
+        newwin small-link: <call Help ("../help/content_datum.html", "", "" )>&nbsp;&nbsp; newwin big-link: <call Help ("../help/content_datum.html", "", "1" )>
+      </p>
+      
+      
+    </td>
+    <td>&nbsp;</td>
+  </tr>
+  
 </table>
 
-	<include "foot.template">
+  <include "foot.template">
 
-	</body>
+  </body>
 </html>
diff --git a/templates/admin/superusermenu.template b/templates/admin/superusermenu.template
index 36910cd8..2e627f17 100755
--- a/templates/admin/superusermenu.template
+++ b/templates/admin/superusermenu.template
@@ -1,7 +1,7 @@
 <html>
 <head>
-	<title>${config["Mir.Name"]} | ${lang("superusermenu.htmltitle")}</title>
-	<link rel="stylesheet" type="text/css" href="${config.docRoot}/style/admin.css">
+  <title>${config["Mir.Name"]} | ${lang("superusermenu.htmltitle")}</title>
+  <link rel="stylesheet" type="text/css" href="${config.docRoot}/style/admin.css">
 </head>
 
 <body marginwidth="0" marginheight="0" topmargin="0" leftmargin="0">
@@ -11,17 +11,17 @@
 <table width="95%">
   <tbody>
     <tr>
-		<td width="30%">  
-		<p class="box-head"><b>${lang("superusermenu.manage")}:</b></p>
-		<p class="box">
-		&gt; <a href="${config.actionRoot}?module=Topics&do=list">${lang("superusermenu.topics")}</a><br>
-		&gt; <a href="${config.actionRoot}?module=ArticleType&do=list">${lang("superusermenu.articletypes")}</a><br>
-		&gt; <a href="${config.actionRoot}?module=CommentStatus&do=list">${lang("superusermenu.comment_statuses")}</a><br>
-		&gt; <a href="${config.actionRoot}?module=Users&do=list">${lang("superusermenu.users")}</a><br>
-		&gt; <a href="${config.actionRoot}?module=Language&do=list">${lang("superusermenu.languages")}</a><br>
-		&gt; <a href="${config.actionRoot}?module=Abuse">${lang("superusermenu.abuse")}</a><br>
-		</p>
-		</td>
+    <td width="30%">  
+    <p class="box-head"><b>${lang("superusermenu.manage")}:</b></p>
+    <p class="box">
+    &gt; <a href="${config.actionRoot}?module=Topics&do=list">${lang("superusermenu.topics")}</a><br>
+    &gt; <a href="${config.actionRoot}?module=ArticleType&do=list">${lang("superusermenu.articletypes")}</a><br>
+    &gt; <a href="${config.actionRoot}?module=CommentStatus&do=list">${lang("superusermenu.comment_statuses")}</a><br>
+    &gt; <a href="${config.actionRoot}?module=Users&do=list">${lang("superusermenu.users")}</a><br>
+    &gt; <a href="${config.actionRoot}?module=Language&do=list">${lang("superusermenu.languages")}</a><br>
+    &gt; <a href="${config.actionRoot}?module=Abuse">${lang("superusermenu.abuse")}</a><br>
+    </p>
+    </td>
       <td>&nbsp;  </td>
       <td>&nbsp;  </td>
     </tr>
diff --git a/templates/admin/topic.template b/templates/admin/topic.template
index 1eb043bd..999547df 100755
--- a/templates/admin/topic.template
+++ b/templates/admin/topic.template
@@ -6,8 +6,8 @@
 
   <body marginwidth="0" marginheight="0" topmargin="0" leftmargin="0">
     <include "FUNCTIONS.template">
-	
-	<include "head.template">
+  
+  <include "head.template">
 
     <form action="${config.actionRoot}" method="post">
       <input type=hidden name=module value=Topics>
@@ -19,11 +19,11 @@
       </if>
 
       <table border="0">
-		<call TextInputTableRow (lang("topic.title"), 40, 255, "title", data.title)>
-		<call TextAreaTableRow (lang("topic.description"), "", 40, 3, "description", data.description)>
-		<call TextInputTableRow (lang("topic.filename"), 20, 255, "filename", data.filename)>
-		<call TextInputTableRow (lang("topic.main_url"), 40, 255, "main_url", data.main_url)>
-		<call TextInputTableRow (lang("topic.archive_url"), 40, 255, "archiv_url", data.archiv_url)>
+    <call TextInputTableRow (lang("topic.title"), 40, 255, "title", data.title)>
+    <call TextAreaTableRow (lang("topic.description"), "", 40, 3, "description", data.description)>
+    <call TextInputTableRow (lang("topic.filename"), 20, 255, "filename", data.filename)>
+    <call TextInputTableRow (lang("topic.main_url"), 40, 255, "main_url", data.main_url)>
+    <call TextInputTableRow (lang("topic.archive_url"), 40, 255, "archiv_url", data.archiv_url)>
 
           <td class="table-foot" colspan="2" align="right"> 
           <if data.new>
@@ -33,9 +33,9 @@
           </if> 
           </td>
         </tr>
-      </table>	  
+      </table>    
     </form>
-	<p><a class="link-box" href="${config.actionRoot}?module=Topics&do=list">[&lt;] ${lang("back")} </a> &nbsp;</p>
+  <p><a class="link-box" href="${config.actionRoot}?module=Topics&do=list">[&lt;] ${lang("back")} </a> &nbsp;</p>
     <include "foot.template">
   </body>
 </html>
diff --git a/templates/admin/topiclist.template b/templates/admin/topiclist.template
index 97bff9e7..21a3c584 100755
--- a/templates/admin/topiclist.template
+++ b/templates/admin/topiclist.template
@@ -7,32 +7,32 @@
   <body marginwidth="0" marginheight="0" topmargin="0" leftmargin="0">
 
 
-  	<include "FUNCTIONS.template">
+    <include "FUNCTIONS.template">
   
     <include "head.template">
 
-		<comment>configure this template here</comment>
-		<assign contentlist = data.contentlist>
-		<assign column_nr = 5>
-		<assign column_head_texts = [lang("topic.title"), lang("topic.description"), lang("topic.main_url"), lang("topic.archive_url")]>
-		<assign data_keys = ["title", "description", "main_url", "archiv_url"]>
-		<assign column_head_CSS = "table_head">
-		<assign listrow1CSS = "listrow1">
-		<assign listrow2CSS = "listrow2">
-		<assign footer_css = "table_foot">
-		<assign module_name = "Topics">
-		<assign module_jumpback = "Admin">
-		<assign do_jumpback = "superusermenu">
+    <comment>configure this template here</comment>
+    <assign contentlist = data.contentlist>
+    <assign column_nr = 5>
+    <assign column_head_texts = [lang("topic.title"), lang("topic.description"), lang("topic.main_url"), lang("topic.archive_url")]>
+    <assign data_keys = ["title", "description", "main_url", "archiv_url"]>
+    <assign column_head_CSS = "table_head">
+    <assign listrow1CSS = "listrow1">
+    <assign listrow2CSS = "listrow2">
+    <assign footer_css = "table_foot">
+    <assign module_name = "Topics">
+    <assign module_jumpback = "Admin">
+    <assign do_jumpback = "superusermenu">
 
     <if data.contentlist>
-		<call AddOrBack(module_name, module_jumpback, do_jumpback)>
-		<call ListTable(contentlist, data_keys, column_head_texts, column_head_CSS, listrow1CSS, listrow2CSS, footer_css, module_name)>	  
-		<call PrevNextPage(module_name)>	  
+    <call AddOrBack(module_name, module_jumpback, do_jumpback)>
+    <call ListTable(contentlist, data_keys, column_head_texts, column_head_CSS, listrow1CSS, listrow2CSS, footer_css, module_name)>   
+    <call PrevNextPage(module_name)>    
    <else>
-		<P align="center">${lang("no_matches_found")}</p>
+    <P align="center">${lang("no_matches_found")}</p>
     </if>
     
-	<call AddOrBack(module_name, module_jumpback, do_jumpback)>
+  <call AddOrBack(module_name, module_jumpback, do_jumpback)>
 
     <include "foot.template">
   
diff --git a/templates/admin/user.template b/templates/admin/user.template
index 1d27954c..ae0198ce 100755
--- a/templates/admin/user.template
+++ b/templates/admin/user.template
@@ -1,52 +1,52 @@
 <html>
 <head>
-	<title>${config["Mir.Name"]} | ${lang("user.htmltitle")}</title>
-	<link rel="stylesheet" type="text/css" href="${config.docRoot}/style/admin.css">
+  <title>${config["Mir.Name"]} | ${lang("user.htmltitle")}</title>
+  <link rel="stylesheet" type="text/css" href="${config.docRoot}/style/admin.css">
 <head>
 
 <body marginwidth="0" marginheight="0" topmargin="0" leftmargin="0">
-	
-	<include "FUNCTIONS.template">
-	<include "head.template">
+  
+  <include "FUNCTIONS.template">
+  <include "head.template">
 
 <form action="${config.actionRoot}" method="post">
-	<input type="hidden" name="module" value="Users">
-	<input type="hidden" name="id" value="${data.id}">
-	<if data.new>
-		<input type="hidden" name="do" value="insert">
-	<else>
-		<input type="hidden" name="do" value="update">
-	</if>
+  <input type="hidden" name="module" value="Users">
+  <input type="hidden" name="id" value="${data.id}">
+  <if data.new>
+    <input type="hidden" name="do" value="insert">
+  <else>
+    <input type="hidden" name="do" value="update">
+  </if>
 
-	<table border="0">
-		<call TextInputTableRow (lang("user.login"), 40, 40, "login", data.login)>
-		<call TextInputTableRow (lang("user.password"), 40, 40, "newpassword", "")>
-		<call TextInputTableRow (lang("user.password2"), 40, 40, "newpassword2", "")>
-		<tr>
-			<td align="right" class="table-left">
-				<b>${lang("user.admin")}:</b>
-			</td>
-			<td class="listrow2">
-				<input type="checkbox" name="is_admin" value="1"<if data.is_admin=="1"> checked</if>>
-			</td>
-		</tr>
-		<tr>
-		<td colspan="2" align="right" class="table-foot"> 
-			<span class="witetext">
-			<if data.new>
-				<input type="submit" name="save" value="${lang("insert")}">
-			<else>
-				<input type="submit" name="save" value="${lang("save")}">
-			</if> 
-			</span>
-		</td>
-		</tr>
-	</table>
+  <table border="0">
+    <call TextInputTableRow (lang("user.login"), 40, 40, "login", data.login)>
+    <call TextInputTableRow (lang("user.password"), 40, 40, "newpassword", "")>
+    <call TextInputTableRow (lang("user.password2"), 40, 40, "newpassword2", "")>
+    <tr>
+      <td align="right" class="table-left">
+        <b>${lang("user.admin")}:</b>
+      </td>
+      <td class="listrow2">
+        <input type="checkbox" name="is_admin" value="1"<if data.is_admin=="1"> checked</if>>
+      </td>
+    </tr>
+    <tr>
+    <td colspan="2" align="right" class="table-foot"> 
+      <span class="witetext">
+      <if data.new>
+        <input type="submit" name="save" value="${lang("insert")}">
+      <else>
+        <input type="submit" name="save" value="${lang("save")}">
+      </if> 
+      </span>
+    </td>
+    </tr>
+  </table>
 </form>
-	
-	<p><a class="link-box" href="${config.actionRoot}?module=Users&do=list">[&lt;] ${lang("back")} </a> &nbsp;</p>
-	
-	<include "foot.template">
+  
+  <p><a class="link-box" href="${config.actionRoot}?module=Users&do=list">[&lt;] ${lang("back")} </a> &nbsp;</p>
+  
+  <include "foot.template">
 
 </body>
 </html>
diff --git a/templates/admin/usererror.template b/templates/admin/usererror.template
index fc61c25c..4409c367 100755
--- a/templates/admin/usererror.template
+++ b/templates/admin/usererror.template
@@ -5,32 +5,32 @@
 <body>
 <include "templates/admin/head_nonavi.template">
 <table width="100%" border="0" align="center">
-	<tr bgcolor="#006600">
-		<td>
-			<div align="center"><h2><font color="Pink">${lang("usererror.title")}</font></h2>
-			</div>
-		</td>
-	</tr>
-	<tr>
-		<td>
-			<p>${lang("usererror.text")}
-		</td>
-	</tr>
-	<tr>
-		<td>
-			<p>
-			<p align="center"><font size="5" color="Red"><b> ${data.errorstring}</b></font>
+  <tr bgcolor="#006600">
+    <td>
+      <div align="center"><h2><font color="Pink">${lang("usererror.title")}</font></h2>
+      </div>
+    </td>
+  </tr>
+  <tr>
+    <td>
+      <p>${lang("usererror.text")}
+    </td>
+  </tr>
+  <tr>
+    <td>
+      <p>
+      <p align="center"><font size="5" color="Red"><b> ${data.errorstring}</b></font>
             <p>
-			<p> 
-		</td>
-	</tr>
-	<tr>
-		<td>
-			<p align="center"><font face="Verdana, Arial, Helvetica, sans-serif" size="-1">${lang("usererror.what_to_do")}
-			</a></font>
-			<p>
-		</td>
-	</tr>
+      <p> 
+    </td>
+  </tr>
+  <tr>
+    <td>
+      <p align="center"><font face="Verdana, Arial, Helvetica, sans-serif" size="-1">${lang("usererror.what_to_do")}
+      </a></font>
+      <p>
+    </td>
+  </tr>
 </table>
 <include "foot.template">
 </body>
diff --git a/templates/admin/userlist.template b/templates/admin/userlist.template
index 432c0aea..567dddfa 100755
--- a/templates/admin/userlist.template
+++ b/templates/admin/userlist.template
@@ -6,30 +6,30 @@
 
   <body marginwidth="0" marginheight="0" topmargin="0" leftmargin="0">
         
-		<include "FUNCTIONS.template">
-		<include "head.template">
-		
-		<assign contentlist = data.contentlist>
-		<assign column_nr = 3>
-		
-		<assign column_head_texts = [lang("user.login"), lang("user.admin")]>		
-		<assign data_keys = ["login","is_admin"]>
-		<assign column_head_CSS = "table_head">
-		<assign listrow1CSS = "listrow1">
-		<assign listrow2CSS = "listrow2">
-		<assign footer_css = "table_foot">
-		<assign module_name = "Users">
-		<assign module_jumpback = "Admin">
-		<assign do_jumpback = "superusermenu">
-	
+    <include "FUNCTIONS.template">
+    <include "head.template">
+    
+    <assign contentlist = data.contentlist>
+    <assign column_nr = 3>
+    
+    <assign column_head_texts = [lang("user.login"), lang("user.admin")]>   
+    <assign data_keys = ["login","is_admin"]>
+    <assign column_head_CSS = "table_head">
+    <assign listrow1CSS = "listrow1">
+    <assign listrow2CSS = "listrow2">
+    <assign footer_css = "table_foot">
+    <assign module_name = "Users">
+    <assign module_jumpback = "Admin">
+    <assign do_jumpback = "superusermenu">
+  
 
-	
-	<call AddOrBack(module_name, module_jumpback, do_jumpback)>
+  
+  <call AddOrBack(module_name, module_jumpback, do_jumpback)>
 
     <if data.contentlist>
-		<call ListTable(contentlist, data_keys, column_head_texts, column_head_CSS, listrow1CSS, listrow2CSS, footer_css, module_name)>
-		<call AddOrBack(module_name, module_jumpback, do_jumpback)>
-	<else>
+    <call ListTable(contentlist, data_keys, column_head_texts, column_head_CSS, listrow1CSS, listrow2CSS, footer_css, module_name)>
+    <call AddOrBack(module_name, module_jumpback, do_jumpback)>
+  <else>
       <P align="center">${lang("no_matches_found")}</p>
     </if>
     
diff --git a/templates/admin/video.template b/templates/admin/video.template
index 126bdf5b..7cd4fccf 100755
--- a/templates/admin/video.template
+++ b/templates/admin/video.template
@@ -15,22 +15,22 @@ function openWin(url) {
 
 <if data.new>
 <form action="${config.actionRoot}?module=Video&do=add" method="post">
-	<if data.articleid>
-		<input type="hidden" name="articleid" value="${data.articleid}">
-	</if>
-	<if data.commentid>
-		<input type="hidden" name="commentid" value="${data.commentid}">
-	</if>
-	<table border="0">
-		<tr>
-			<td align="right" class="table-left">
-				<b>${lang("media.nr_of_media")} :</b><br>
-			</td>
-			<td class="listrow2">
-				<input type="text" size="3" name="medianum" value="${medianum}">&nbsp;&nbsp;<input type="submit" value="${lang("media.nr_of_media.submit")}">
-			</td>
-		</tr>
-	</table>
+  <if data.articleid>
+    <input type="hidden" name="articleid" value="${data.articleid}">
+  </if>
+  <if data.commentid>
+    <input type="hidden" name="commentid" value="${data.commentid}">
+  </if>
+  <table border="0">
+    <tr>
+      <td align="right" class="table-left">
+        <b>${lang("media.nr_of_media")} :</b><br>
+      </td>
+      <td class="listrow2">
+        <input type="text" size="3" name="medianum" value="${medianum}">&nbsp;&nbsp;<input type="submit" value="${lang("media.nr_of_media.submit")}">
+      </td>
+    </tr>
+  </table>
 </form>
 </if>
 
@@ -42,86 +42,86 @@ function openWin(url) {
       <if data.commentid>
         <input type="hidden" name="commentid" value="${data.commentid}">
       </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">
+      <table border="0">
       
-      	<if !data.new>
-      	<tr>
-          	<td align="right" valign="top">
-      			<a href="${config.actionRoot}?module=Video&do=getMedia&id=${data.id}">
-      	  	  	<img src="${config.docRoot}/img/${data.big_icon}" border=0></a>&nbsp;&nbsp;
-      		</td>
-      		<td valign="bottom" class="small">
-      			${lang("media.created")}: ${data.webdb_create}
-      			<if data.webdb_lastchange>/ ${lang("media.changed")} ${data.webdb_lastchange}</if><br>
-      			<if data.is_published=="1">${lang("media.published")}: ${data.publish_date} / ${data.publish_server}${data.publish_path}<br></if>
-      			${lang("media.format")}: ${data.mimetype} / ${data.media_descr}<br>
-      			${lang("media.size")}: ${data.human_readable_size}<br>
-      			${lang("media.rights")}: <b>${data.rightsHashdata[to_rights]["name"]}</b><br>
-      		</td>
-        	</tr>
-      	</if>
+        <if !data.new>
+        <tr>
+            <td align="right" valign="top">
+            <a href="${config.actionRoot}?module=Video&do=getMedia&id=${data.id}">
+                <img src="${config.docRoot}/img/${data.big_icon}" border=0></a>&nbsp;&nbsp;
+          </td>
+          <td valign="bottom" class="small">
+            ${lang("media.created")}: ${data.webdb_create}
+            <if data.webdb_lastchange>/ ${lang("media.changed")} ${data.webdb_lastchange}</if><br>
+            <if data.is_published=="1">${lang("media.published")}: ${data.publish_date} / ${data.publish_server}${data.publish_path}<br></if>
+            ${lang("media.format")}: ${data.mimetype} / ${data.media_descr}<br>
+            ${lang("media.size")}: ${data.human_readable_size}<br>
+            ${lang("media.rights")}: <b>${data.rightsHashdata[to_rights]["name"]}</b><br>
+          </td>
+          </tr>
+        </if>
       
-      	<tr>
-      		<td align="right" class="table-left">
-      			<B>${lang("media.mediafolder")}:</B>
-      		</td>
-      		<td class="listrow2">
-      			<select name="to_media_folder">
-       			<list extra.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" class="table-left">
+            <B>${lang("media.mediafolder")}:</B>
+          </td>
+          <td class="listrow2">
+            <select name="to_media_folder">
+            <list extra.mediafolderPopupData as m>
+              <option value="${m.key}" <if m.key == data.to_media_folder>selected</if>>${m.value}</option>
+            </list>
+              </select>
+          </td>
+        </tr>
       
-      	<if !data.new>
-      	  <call TextInputTableRow (lang("media.title"), 40, 80, "title", data.title)>
-      	</if>
-      	<call TextInputTableRow (lang("media.date"), 8, 8, "date", data.date)>
-      	<call TextInputTableRow (lang("media.creator"), 40, 80, "creator", data.creator)>
-      	<call TextAreaTableRow  (lang("media.description"), "", 40, 2, "description", data.description)>
-      	<call TextAreaTableRow  (lang("media.comment"), "", 40, 2, "comment", data.comment)>
-      	<call TextInputTableRow (lang("media.source"), 40, 80, "source", data.source)>
-      	
-      	<tr><td colspan="2" class="x-small">&nbsp;</td></tr>
-      	
-      	
-      	<if data.new>
-        	<tr>
-        		<td align="right" class="table-left">
-        			${lang("media.is_published")} : 
-        		</td>
-        		<td class="listrow2" style='border: 1px solid #FF0000;'>
-        			<input type="checkbox" name="is_published" value="1"<if data.is_published!="0" && data.is_published!=""> checked</if>> 
-        		</td>
-        	</tr>
-        	<tr><td colspan="2" class="x-small">&nbsp;</td></tr>
-        	
-        	<list data.mediafields as m>
-        	<tr>
-        		<td align="right" class="table-left">
-        			<B>${lang("media.title")}:<B>
-        		 </td>
-        		<td class="listrow2">
-        			<input type="text" name="media_title${m}" size="40" maxlength="80" value="">
-        		</td>
-        	</tr>
-        	<tr>
-        		<td align="right">
-        			&nbsp;
-        		</td>
-        		<td class="listrow2">
-        			<input type="file" name="media${m}"><br>
-        		</td>
-        	</tr>
-        	</list>
-      	</if>
+        <if !data.new>
+          <call TextInputTableRow (lang("media.title"), 40, 80, "title", data.title)>
+        </if>
+        <call TextInputTableRow (lang("media.date"), 8, 8, "date", data.date)>
+        <call TextInputTableRow (lang("media.creator"), 40, 80, "creator", data.creator)>
+        <call TextAreaTableRow  (lang("media.description"), "", 40, 2, "description", data.description)>
+        <call TextAreaTableRow  (lang("media.comment"), "", 40, 2, "comment", data.comment)>
+        <call TextInputTableRow (lang("media.source"), 40, 80, "source", data.source)>
+        
+        <tr><td colspan="2" class="x-small">&nbsp;</td></tr>
+        
+        
+        <if data.new>
+          <tr>
+            <td align="right" class="table-left">
+              ${lang("media.is_published")} : 
+            </td>
+            <td class="listrow2" style='border: 1px solid #FF0000;'>
+              <input type="checkbox" name="is_published" value="1"<if data.is_published!="0" && data.is_published!=""> checked</if>> 
+            </td>
+          </tr>
+          <tr><td colspan="2" class="x-small">&nbsp;</td></tr>
+          
+          <list data.mediafields as m>
+          <tr>
+            <td align="right" class="table-left">
+              <B>${lang("media.title")}:<B>
+             </td>
+            <td class="listrow2">
+              <input type="text" name="media_title${m}" size="40" maxlength="80" value="">
+            </td>
+          </tr>
+          <tr>
+            <td align="right">
+              &nbsp;
+            </td>
+            <td class="listrow2">
+              <input type="file" name="media${m}"><br>
+            </td>
+          </tr>
+          </list>
+        </if>
       
         <td colspan="2" align="right" class="table-foot">
         <if data.new>
diff --git a/templates/admin/videolist.template b/templates/admin/videolist.template
index 1577587e..852fb6d1 100755
--- a/templates/admin/videolist.template
+++ b/templates/admin/videolist.template
@@ -1,6 +1,6 @@
 <html>
 <head>
-	<title>${config["Mir.Name"]} | ${lang("video.htmltitle")}</title>
+  <title>${config["Mir.Name"]} | ${lang("video.htmltitle")}</title>
         <link rel="stylesheet" type="text/css" href="${config.docRoot}/style/admin.css">
 </head>
 
-- 
2.11.0