X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=source%2Fdefault.properties;h=cc015f1f4fc2f3c712b85f9608a03cb5b04ac905;hb=f2c82f962d2da630470760b0cadbcef91dec680d;hp=5b6d841536c586a8a427c7482a2356e9b1e55f44;hpb=9469c65a08993aaed9c22c77a2d1adf5d032a041;p=mir.git

diff --git a/source/default.properties b/source/default.properties
index 5b6d8415..cc015f1f 100755
--- a/source/default.properties
+++ b/source/default.properties
@@ -1,6 +1,10 @@
 #
 # GENERAL SETUP
 #
+# This is a full list of defaults options. To configure your site
+# do NOT change this file. You can override all of these values in
+# your etc/config.properties
+#
 
 ### mir/imc information
 Mir.Name=mir.indymedia.org
@@ -13,7 +17,6 @@ Mir.Public-email.address=mir-coders@lists.indymedia.org
 Mir.Public-email.name=mir-coders mailinglist
 
 Mir.Version=1.1.0rc0
-DirectOpenposting=yes
 
 # The name of the abuse config file (relative to the WEB-INF dir)
 Abuse.Config=abuse.properties
@@ -82,7 +85,7 @@ Mir.Localizer.OpenPosting.GeneratorLibrary= default=freemarker(etc/open/)
 # be presented?
 # 0 = links, 1 = checkboxes, 2 = a listbox
 Mir.Localizer.Admin.ListOperationsFlavor=2
-                            
+
 # Article previews, a comma seperated list of name = generator
 Mir.Localizer.Admin.ArticlePreview = \
   default = preview::article.template
@@ -184,6 +187,11 @@ Producer.ActionServlet=/servlet/Mir
 # will be linked to.
 Producer.ImageRoot=/img
 
+# path to ImageMagick executables. Default is "" (nothing), which
+# means executables will be searched using the default system PATH
+# example:Producer.Image.ImageMagickPath=/usr/local/ImageMagick/bin
+#
+Producer.Image.ImageMagickPath=
 
 # the url of the video-server
 Producer.Video.Host=http://indy.code-fu.de/video
@@ -385,7 +393,7 @@ Mir.DefaultDateTimeFormat = yyyy-MM-dd HH:mm
 Localizer.OpenSession.PersistentUploadedFiles = 0
 
 # Should support for ftp-like uploads (uploads done
-# outside of mir, but included into postings) be 
+# outside of mir, but included into postings) be
 # supported at all?
 Localizer.OpenSession.AllowFTPUploads = 0
 
@@ -421,6 +429,7 @@ Localizer.OpenSession.email.PrepareTemplate = preparemail.template
 Localizer.OpenSession.email.MailTemplate = email_article.template
 Localizer.OpenSession.email.DoneTemplate =/sent_mail.template
 
+Localizer.HTML.Whitelist=a;img;h1;h2;h3;h4;h5;h6;br;form;input;hr;strong;font;b;i;em;p;table;tr;td;th;ul;ol;li
 
 
 #
@@ -520,6 +529,7 @@ ServletModule.MediaType.DeleteConfirmationTemplate=confirm.template
 ServletModule.MediaType.EditTemplate=mediatype.template
 ServletModule.MediaType.ListTemplate=mediatypelist.template
 
+
 #
 # Object store configuration
 #
@@ -528,8 +538,8 @@ StoreContainer.EntityDefaultSize= 45
 StoreContainer.EntityListDefaultSize= 15
 StorableObjectEntity.Entity.DefaultSize= 300
 StorableObjectEntity.EntityList.DefaultSize= 100
-EntityTopics.Entity.DefaultSize=              200
-EntityTopics.EntityList.DefaultSize=          20
+EntityTopics.Entity.DefaultSize=200
+EntityTopics.EntityList.DefaultSize=20
 
 
 
@@ -538,8 +548,10 @@ EntityTopics.EntityList.DefaultSize=          20
 
 #
 # config for abuse
-ServletModule.Abuse.EditFilter.Template = abuse.filter.template
-ServletModule.Abuse.ListFilters.Template = abuse.filters.template
+ServletModule.Abuse.EditFilter.Template = filter.template
+ServletModule.Abuse.ListFilters.Template = filterlist.template
+ServletModule.Abuse.EditFilterGroup.Template = filtergroup.template
+ServletModule.Abuse.ListFilterGroups.Template = filtergrouplist.template
 ServletModule.Abuse.ViewLog.Template = abuse.log.template
 ServletModule.Abuse.Main.Template = abuse.template