config keys are now passed directly to the templates, so some variables ${config...

diff --git a/templates-dist/admin/commentlist.template b/templates-dist/admin/commentlist.template
index 5cd065a..c855672 100755 (executable)
--- a/templates-dist/admin/commentlist.template
+++ b/templates-dist/admin/commentlist.template
@@ -65,7 +65,7 @@
                                ${data.articleHash[entry.to_media]["title"]}<br>
                                <a href="${config.actionRoot}?module=Content&do=edit&id=${data.articleHash[entry.to_media]["id"]}">
                                edit</a> |
-                               <a href="${config.productionHost}${config.producerDocRoot}${data.articleHash[entry.to_media]["publish_path"]}${data.articleHash[entry.to_media]["id"]}.shtml">
+                               <a href="${config["Producer.ProductionHost"]}${config["Producer.DocRoot"]}${data.articleHash[entry.to_media]["publish_path"]}${data.articleHash[entry.to_media]["id"]}.shtml">
                                view</a>
                </td>
 

diff --git a/templates-dist/admin/foot.template b/templates-dist/admin/foot.template
index 31fb0a4..f88083e 100755 (executable)
--- a/templates-dist/admin/foot.template
+++ b/templates-dist/admin/foot.template
@@ -6,6 +6,6 @@
        <td align="left" bgcolor="#663399"><font face="Verdana, Arial, Helvetica, sans-serif" size="-1">
        <a href="#top"><font color="white"><b>${lang("foot.top")}</b></font></a></font></td>
        <td align="right"><font face="Verdana, Arial, Helvetica, sans-serif" size="-1">
-       <a href="mailto:${lang("imc.contact-email.address")}"><font color="#663399"><b>${lang("imc.shortname")}</b></font></a> - ${config.mirVersion}</font></td>
+       <a href="mailto:${config["Mir.Contact-email.address"]}"><font color="#663399"><b>${config["Mir.Shortname"]}</b></font></a> - ${config["Mir.Version"]}</font></td>
 </tr>
 </table>

diff --git a/templates-dist/admin/head.template b/templates-dist/admin/head.template
index b705a82..91e4ba3 100755 (executable)
--- a/templates-dist/admin/head.template
+++ b/templates-dist/admin/head.template
@@ -1,7 +1,7 @@
 <a name="top">
 <table width="100%" cellspacing="0" cellpadding="0">
 <tr bgcolor="#006600"><td><img src="${config.docRoot}/img/head_small.gif" border="0" align="middle">&nbsp;<font face="Verdana, Arial, Helvetica, sans-serif" size="-1" color="white">
-       <b>${lang("imc.name")}</b></font></td></tr>
+       <b>${config["Mir.Name"]}</b></font></td></tr>
 <tr><td align="right"><font face="Verdana, Arial, Helvetica, sans-serif" size="-1" color="#663399">
        <a href="${config.actionRoot}"><font color="#663399">${lang("head.start")}</font></a> |
        <a href="${config.actionRoot}?module=logout"><font color="#663399">${lang("head.logout")}</font></a> |

diff --git a/templates-dist/admin/head_nonavi.template b/templates-dist/admin/head_nonavi.template
index 9dd5106..894e940 100755 (executable)
--- a/templates-dist/admin/head_nonavi.template
+++ b/templates-dist/admin/head_nonavi.template
@@ -1,7 +1,7 @@
  <a name="top">
 <table width="100%" cellspacing="0" cellpadding="0">
 <tr bgcolor="#006600"><td><img src="${config.docRoot}/img/head_small.gif" border="0" align="middle">&nbsp;<font face="Verdana, Arial, Helvetica, sans-serif" size="-1" color="white">
-       <b>${lang("imc.name")}</b></font></td></tr>
+       <b>${config["Mir.Name"]}</b></font></td></tr>
 <if login_user><tr><td align="right"><font face="Verdana, Arial, Helvetica, sans-serif" size="-1" color="#006600">
        <b>${login_user.login}</b> ${lang("head.logged_in")} /
        <a href="${actionRoot}?module=logout">${lang("head.logout")}</a></font>

diff --git a/templates-dist/admin/login.template b/templates-dist/admin/login.template
index b127603..804cbd6 100755 (executable)
--- a/templates-dist/admin/login.template
+++ b/templates-dist/admin/login.template
@@ -15,10 +15,10 @@
     <center>
        <p><font face="Verdana, Arial, Helvetica, sans-serif" size="-1">
         ${lang("login.info")}
-        <a href="mailto:${lang("imc.contact-email.address")}"><font color="#663399">${lang("imc.contact-email.name")}</font></a>.
+        <a href="mailto:${config["Mir.Contact-email.address"]}"><font color="#663399">${config["Mir.Contact-email.name"]}</font></a>.
         </font></p>
        <hr>
-    <form method="post" action="${config.actionRootLogin}">
+    <form method="post" action="${config.actionRoot}">
        <input type="hidden" name="module" value="login">
                <table border="0" cellpadding="2" cellspacing="0" bgcolor="#006600">
                        <tr bgcolor="#663399">
@@ -52,9 +52,14 @@
                     <!-- this language selection should be solved better
                             - list all available languages
                     -->
-                                       <option value="en" label="english">${lang("login.language.english")}</option>
-                                       <option value="de" label="deutsch" selected>${lang("login.language.german")}</option>
-                                       <option value="es" label="castellano">${lang("login.language.spanish")}</option>
+                                       <option value="en">${lang("login.language.en")}</option>
+                                       <option value="de">${lang("login.language.de")}</option>
+                                       <option value="es">${lang("login.language.es")}</option>
+                    <option value="ay">${lang("login.language.ay")}</option>
+                    <option value="gn"">${lang("login.language.gn")}</option>
+                    <option value="qu"">${lang("login.language.qu")}</option>
+                    <option value="tr">${lang("login.language.tr")}</option>
+
                                        </select>
 
                                </td>

diff --git a/templates-dist/open/comment.template b/templates-dist/open/comment.template
index 7105365..3f4e9ba 100755 (executable)
--- a/templates-dist/open/comment.template
+++ b/templates-dist/open/comment.template
@@ -1,21 +1,21 @@
 <html>
-<head><title>${lang("open.comment.htmltitle")}</title></head>
+<head><title>${lang("comment.htmltitle")}</title></head>
 <body bgcolor="white" text="black" link="#006600" vlink="#009900" alink="red">
 
-<form action="${config.openAction}" method=post>
+<form action="${config["Producer.OpenAction"]}" method=post>
 <input type="hidden" name="do" value="inscomment">
 
 <table width="100%" border="0" cellspacing="0" cellpadding="4" bgcolor="silver">
        <tr>
                <td bgcolor="#663399" colspan="3">
-                       <font color="White"><b>${lang("open.comment.title")}</b></font>
+                       <font color="White"><b>${lang("comment.title")}</b></font>
                </td>
        </tr>
        <tr>
                <td bgcolor="#003300" colspan="3">
                        <p>
                                <font color="white"">
-                                       ${lang("open.comment.note")}
+                                       ${lang("comment.note")}
                                         <br>${data.passwd}
                                </font>
                        </p>
@@ -24,7 +24,7 @@
        </tr>
        <tr>
                <td bgcolor="#663399" colspan="3">
-                       <font face="Helvetica, Arial" color="white" size=+2><b>${lang("open.comment.formtitle")}</b></font>
+                       <font face="Helvetica, Arial" color="white" size=+2><b>${lang("comment.formtitle")}</b></font>
                </td>
        </tr>
        <tr>
@@ -33,67 +33,67 @@
        </tr>
        <tr>
                <td>
-                       <b>${lang("open.comment.title")}:</b>
+                       <b>${lang("comment.title")}:</b>
                </td>
                <td colspan="2">
-                       <input type="text" name="title" size="45" maxlength="45"> <font size="-1" color="#663399">(${lang("open.required")})</font>
+                       <input type="text" name="title" size="45" maxlength="45"> <font size="-1" color="#663399">(${lang("required")})</font>
                </td>
        </tr>
        <tr>
                <td>
-                       <b>${lang("open.comment.name")}:</b>
+                       <b>${lang("comment.name")}:</b>
                </td>
                <td colspan="2">
-                       <input type="text" name="creator" size="20" maxlength="45"> <font size="-1" color="#663399">(${lang("open.required")})</font>
+                       <input type="text" name="creator" size="20" maxlength="45"> <font size="-1" color="#663399">(${lang("required")})</font>
                </td>
        </tr>
        <tr>
                <td>
-                       ${lang("open.comment.email")}:
+                       ${lang("comment.email")}:
                </td>
                <td colspan="2">
-                       <input type="text" name="email" size="30" maxlength="80"> <font size="-1">(<i>${lang("open.optional")}</i>)</font>
+                       <input type="text" name="email" size="30" maxlength="80"> <font size="-1">(<i>${lang("optional")}</i>)</font>
                </td>
        </tr>
        <tr>
                <td>
-                       ${lang("open.comment.url")}:
+                       ${lang("comment.url")}:
                </td>
                <td colspan="2">
-                       <input type="text" name="main_url" size="40" maxlength="160" value="http://"> <font size="-1">(<i>${lang("open.optional")}</i>)</font>
+                       <input type="text" name="main_url" size="40" maxlength="160" value="http://"> <font size="-1">(<i>${lang("optional")}</i>)</font>
                </td>
        </tr>
        <tr>
                <td>
-                       ${lang("open.comment.phone")}:
+                       ${lang("comment.phone")}:
                </td>
                <td colspan="2">
-                       <input type="text" name="phone" size="30" maxlength="80"> <font size="-1">(<i>${lang("open.optional")}</i>)</font>
+                       <input type="text" name="phone" size="30" maxlength="80"> <font size="-1">(<i>${lang("optional")}</i>)</font>
                </td>
        </tr>
        <tr>
                <td>
-                       ${lang("open.comment.address")}:
+                       ${lang("comment.address")}:
                </td>
                <td colspan="2">
-                       <input type="text" name="address" size="40" maxlength="160"><font size="-1"> <i>(${lang("open.optional")})</i></font>
+                       <input type="text" name="address" size="40" maxlength="160"><font size="-1"> <i>(${lang("optional")})</i></font>
                </td>
        </tr>
        <tr>
                <td>
-                       ${lang("open.comment.language")}:
+                       ${lang("comment.language")}:
                </td>
                <td colspan="2">
                        <select name="to_language">
                                <option value="0">de</option>
                                <option value="1">en</option>
                        </select>
-                       <font size="-1"><i>(${lang("open.optional")})</i></font>
+                       <font size="-1"><i>(${lang("optional")})</i></font>
                </td>
        </tr>
        <tr>
                <td valign="top">
-                       <b>${lang("open.comment.text")}:</b>
+                       <b>${lang("comment.text")}:</b>
                </td>
                <td bgcolor="#003300" colspan="2">
                        &nbsp;<textarea name="description" rows="20" cols="60" wrap=virtual></textarea>
@@ -105,12 +105,12 @@
                </td>
                <td bgcolor="#663399" valign="top" align="center">
                        <br>
-                       &nbsp;<input type="submit" value="${lang("open.comment.submit")}"><br>
+                       &nbsp;<input type="submit" value="${lang("comment.submit")}"><br>
 
                </td>
                <td bgcolor="#003300" valign="top" align="center">
                        <br>
-                       &nbsp;<input type="reset" value="${lang("open.comment.reset")}"><br>
+                       &nbsp;<input type="reset" value="${lang("comment.reset")}"><br>
                        <input type="hidden" name="to_media" value="${data.aid}">
                        <br>
                </td>

diff --git a/templates-dist/open/comment_done.template b/templates-dist/open/comment_done.template
index c19210e..bf9d1ed 100755 (executable)
--- a/templates-dist/open/comment_done.template
+++ b/templates-dist/open/comment_done.template
@@ -2,7 +2,7 @@
 
 <html>
 <head>
-       <title>${lang("open.commentdone.htmltitle")}</title>
+       <title>${lang("commentdone.htmltitle")}</title>
 </head>
 
 <body bgcolor="White" text="Black" link="#006600" vlink="#009900" alink="Red">
@@ -10,25 +10,25 @@
 <table width="100%" border="0" cellspacing="0" cellpadding="10">
        <tr>
                <td valign="top" align="center" bgcolor="#663399">
-                       <font color="White"><b>${lang("open.commentdone.thanks")}</b></font
+                       <font color="White"><b>${lang("commentdone.thanks")}</b></font
                </td>
        </tr>
        <tr>
                <td bgcolor="#cccccc" align="center">
 
                                <br>
-                ${lang("open.commentdone.wait")}
+                ${lang("commentdone.wait")}
                                <br>
-                ${lang("open.commentdone.criteria")}
+                ${lang("commentdone.criteria")}
                                <br>
-                               <em>${lang("open.commentdone.stay_calm")}</em><br>
+                               <em>${lang("commentdone.stay_calm")}</em><br>
                                <br>
 
                </td>
        </tr>
        <tr>
                <td valign="top" align="center" bgcolor="#663399">
-                       <a href="javascript:history.go(-2)"><font color="White"><b>&gt;&gt; ${lang("open.commentdone.back")}</b></font></a>
+                       <a href="javascript:history.go(-2)"><font color="White"><b>&gt;&gt; ${lang("commentdone.back")}</b></font></a>
                </td>
        </tr>
 </table>

diff --git a/templates-dist/open/comment_dupe.template b/templates-dist/open/comment_dupe.template
index 38c5151..2e9ce66 100755 (executable)
--- a/templates-dist/open/comment_dupe.template
+++ b/templates-dist/open/comment_dupe.template
@@ -2,7 +2,7 @@
 
 <html>
 <head>
-       <title>${lang("open.commentdupe.htmltitle")}</title>
+       <title>${lang("commentdupe.htmltitle")}</title>
 </head>
 
 <body bgcolor="White" text="Black" link="white" vlink="#009900" alink="Red">
@@ -11,7 +11,7 @@
        <tr>
                <td valign="top" align="center" bgcolor="#663399">
                        <font color="White"><b>
-                               ${lang("open.commentdupe.title")}
+                               ${lang("commentdupe.title")}
                        </b></font
                </td>
        </tr>
@@ -19,16 +19,16 @@
                <td bgcolor="003300" width=70%>
                        <font color="White">
                                <br>
-                    ${lang("open.commentdupe.explanation")}
+                    ${lang("commentdupe.explanation")}
                                <br>
-                               <center><em>${lang("open.commentdupe.no_panic")}</em></center><br>
+                               <center><em>${lang("commentdupe.no_panic")}</em></center><br>
                                <br>
                        </font>
                </td>
        </tr>
        <tr>
                <td valign="top" align="center" bgcolor="#663399">
-                       <a href="javascript:history.go(-2)"><font color="White"><b>&gt;&gt; ${lang("open.commentdupe.back")}</b></font></a>
+                       <a href="javascript:history.go(-2)"><font color="White"><b>&gt;&gt; ${lang("commentdupe.back")}</b></font></a>
                </td>
        </tr>
 </table>

diff --git a/templates-dist/open/posting.template b/templates-dist/open/posting.template
index 6bd4b96..94c0795 100755 (executable)
--- a/templates-dist/open/posting.template
+++ b/templates-dist/open/posting.template
@@ -1,16 +1,16 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//DE">
 <html>
 <head>
-       <title>${lang("open.posting.htmltitle")}</title>
-       <meta name="description" content="${lang("open.posting.meta.description")}">
-       <meta name="author" content="${lang("open.posting.meta.author")}">
-       <meta name="keywords" content="${lang("open.posting.meta.keywords")}">
+       <title>${lang("posting.htmltitle")}</title>
+       <meta name="description" content="${lang("posting.meta.description")}">
+       <meta name="author" content="${lang("posting.meta.author")}">
+       <meta name="keywords" content="${lang("posting.meta.keywords")}">
        <!--<meta name="date" content="### Date ###Time">-->
        <meta http-equiv="Content-Type" content="text/html; charset=iso-8559-1">
        <meta name="robots" content="index">
        <meta name="robots" content="follow">
 
-       <link rel=stylesheet type="text/css" href="${config.productionHost}/style/formate.css">
+       <link rel=stylesheet type="text/css" href="${config["Producer.ProductionHost"]}/style/formate.css">
 </head>
 
 <body bgcolor="White" text="Black" link="#006600" vlink="#006600" alink="Red">
@@ -19,13 +19,13 @@
 <table width="99%" border="0" cellspacing="0" cellpadding="8" bgcolor="silver">
        <tr>
                <td align="left" bgcolor="#663399" colspan="3">
-                       <a href="#form"><font face="Verdana, Arial, Helvetica, sans-serif" size="-2" color="white"><b>&gt;&gt; ${lang("open.posting.jump_to_form")}</b></font></a>
+                       <a href="#form"><font face="Verdana, Arial, Helvetica, sans-serif" size="-2" color="white"><b>&gt;&gt; ${lang("posting.jump_to_form")}</b></font></a>
                <br>
                </td>
        </tr>
        <tr>
                <td align="center" colspan="3">
-                       <font size="+1" face="Verdana, Arial, Helvetica, sans-serif"><b>${lang("open.posting.title")}</b></font><br>
+                       <font size="+1" face="Verdana, Arial, Helvetica, sans-serif"><b>${lang("posting.title")}</b></font><br>
                </td>
        </tr>
        <tr>
@@ -37,19 +37,19 @@
 <a name="form"></a>
                </td>
        </tr>
-<form action="${config.openAction}?do=addposting" method="post">
+<form action="${config["Producer.OpenAction"]}?do=addposting" method="post">
        <tr>
-               <td><b>${lang("open.posting.nr_of_media")}</b> <br>
-               ${lang("open.posting.nr_of_media.info")}</td>
-               <td colspan="2"><input type="text" name="medianum" value="${medianum}">&nbsp;<input type="submit" value="${lang("open.posting.nr_of_media.submit")}">
+               <td><b>${lang("posting.nr_of_media")}</b> <br>
+               ${lang("posting.nr_of_media.info")}</td>
+               <td colspan="2"><input type="text" name="medianum" value="${medianum}">&nbsp;<input type="submit" value="${lang("posting.nr_of_media.submit")}">
        </tr>
 </form>
 
 
-<form enctype="multipart/form-data" action="${config.openAction}?do=insposting" method="post">
+<form enctype="multipart/form-data" action="${config["Producer.OpenAction"]}?do=insposting" method="post">
        <tr>
                <td bgcolor="#663399" colspan="3">
-                       <center><font size="+2" face="Helvetica, Arial,sans-serif" color="white"><b>${lang("open.posting.form.title")}</b></font></center>
+                       <center><font size="+2" face="Helvetica, Arial,sans-serif" color="white"><b>${lang("posting.form.title")}</b></font></center>
                </td>
        </tr>
         <tr>
@@ -58,17 +58,17 @@
        <tr>
        <tr>
                <td valign="top">
-                       ${lang("open.posting.title")}:<br>
-                       <font size="-2">${lang("open.posting.title.info")}</font>
+                       ${lang("posting.title")}:<br>
+                       <font size="-2">${lang("posting.title.info")}</font>
                </td>
                <td colspan="2" bgcolor="#003300">
-                       <input type="text" name="title" size="45" maxlength="45" value=""> <font size="-1" color="white"><br>(${lang("open.required")})</font>
+                       <input type="text" name="title" size="45" maxlength="45" value=""> <font size="-1" color="white"><br>(${lang("required")})</font>
                </td>
        </tr>
     <tr>
         <td valign="top">
-            ${lang("open.posting.topic")}:<br>
-       <font size="-2">${lang("open.posting.topic.info")}</font>
+            ${lang("posting.topic")}:<br>
+       <font size="-2">${lang("posting.topic.info")}</font>
         </td>
        <td colspan="2">
        <select name="data.to_topic" size="3" multiple>
@@ -76,69 +76,69 @@
        <option value="${t.key}" <list to_topic as to><if (t.key == to)>selected</if></list>>${t.value}</option>
        </list>
        </select>
-       &nbsp;&nbsp;<font size="-1">(<i>${lang("open.optional")}</i>)</font>
+       &nbsp;&nbsp;<font size="-1">(<i>${lang("optional")}</i>)</font>
        </td>
     </tr>
        <tr>
                <td valign="top">
-                       ${lang("open.posting.author")}:
+                       ${lang("posting.author")}:
                </td>
                <td colspan="2" bgcolor="#003300">
-                       <input type="text" name="creator" size="45" maxlength="45"> <font size="-1" color="white"><br>${lang("open.required")}</font>
+                       <input type="text" name="creator" size="45" maxlength="45"> <font size="-1" color="white"><br>${lang("required")}</font>
                </td>
        </tr>
        <tr>
                <td valign="top">
-                       ${lang("open.posting.abstract")}:</b> <br>
-                       <font size="-2">${lang("open.posting.abstract.info")}</font>
+                       ${lang("posting.abstract")}:</b> <br>
+                       <font size="-2">${lang("posting.abstract.info")}</font>
                </td>
                <td colspan="2" bgcolor="#003300">
                        <textarea name="description" rows="6" cols="55" wrap=virtual></textarea>
-                       <font size="-1" color="white"><br>${lang("open.posting.abstract.constraint")}</font>
+                       <font size="-1" color="white"><br>${lang("posting.abstract.constraint")}</font>
                </td>
        </tr>
        <tr>
                <td colspan="3" bgcolor="#FFFFFF">
                <font face="Helvetica, Arial, sans-serif" size=-1 color="#222222">
-               ${lang("open.posting.contact.info")}
+               ${lang("posting.contact.info")}
                </font>
                </td>
        </tr>
 
        <tr>
                <td>
-                       ${lang("open.posting.email")}:
+                       ${lang("posting.email")}:
                </td>
                <td colspan="2">
                        <input type="text" name="creator_email" size="55" maxlength="80" value=""><br>
-                                        <font size="-1">(<i>${lang("open.optional")}</i>)</font>
+                                        <font size="-1">(<i>${lang("optional")}</i>)</font>
                </td>
        </tr>
        <tr>
                <td>
-                       ${lang("open.posting.url")}:
+                       ${lang("posting.url")}:
                </td>
                <td colspan="2">
                <input type="text" name="creator_main_url" size="55" maxlength="160" value="http://"><br>
-                <font size="-1">(<i>${lang("open.optional")}</i>)</font>
+                <font size="-1">(<i>${lang("optional")}</i>)</font>
                </td>
        </tr>
        <tr>
                <td>
-                       ${lang("open.posting.address")}:
+                       ${lang("posting.address")}:
                </td>
                <td colspan="2">
                        <input type="text" name="creator_address" size="55" maxlength="160" value=""><br>
-                               <font size="-1"> <i>(${lang("open.optional")})</i></font>
+                               <font size="-1"> <i>(${lang("optional")})</i></font>
                </td>
        </tr>
        <tr>
                <td>
-                       ${lang("open.posting.phone")}:
+                       ${lang("posting.phone")}:
                </td>
                <td colspan="2">
                        <input type="text" name="creator_phone" size="20" maxlength="20" value=""><br>
-                       <font size="-1">(<i>${lang("open.optional")}</i>)</font>
+                       <font size="-1">(<i>${lang("optional")}</i>)</font>
                </td>
        </tr>
 
@@ -148,7 +148,7 @@
 
        <tr>
                <td>
-                       ${lang("open.posting.language")}:
+                       ${lang("posting.language")}:
                </td>
                <td colspan="2">
                        <select name="to_language">
@@ -156,13 +156,13 @@
                                <option value="${l.key}">${l.value}</option>
                                </list>
                        </select>
-                       &nbsp;&nbsp;<font size="-1"><i>(${lang("open.optional")})</i></font>
+                       &nbsp;&nbsp;<font size="-1"><i>(${lang("optional")})</i></font>
                </td>
        </tr>
        <tr>
                <td valign="top">
-                       ${lang("open.posting.text")}:<br>
-                       <font size="-2">${lang("open.posting.text.info")}</font>
+                       ${lang("posting.text")}:<br>
+                       <font size="-2">${lang("posting.text.info")}</font>
                </td>
                <td bgcolor="#003300" colspan="2">
                        &nbsp; <textarea name="content_data" rows="20" cols="55" wrap="soft"></textarea>
@@ -172,24 +172,24 @@
 
        <tr>
                <td>
-                       <b>${lang("open.posting.media")}:</b>
+                       <b>${lang("posting.media")}:</b>
                </td>
                <td colspan="2">
-                       ${lang("open.posting.media.info")}<br>
-                       <font size="-2">${lang("open.posting.media.howto")}</font>
+                       ${lang("posting.media.info")}<br>
+                       <font size="-2">${lang("posting.media.howto")}</font>
                </td>
        </tr>
 <list data.mediafields as m>
        <tr>
-               <td>${lang("open.posting.media.media")} ${m}</td>
+               <td>${lang("posting.media.media")} ${m}</td>
                <td colspan="2">
                        <INPUT TYPE="file" NAME="media${m}">
-                       <br><font size="-1">(<i>${lang("open.optional")}</i>)</font>
+                       <br><font size="-1">(<i>${lang("optional")}</i>)</font>
                </td>
        </tr>
        <tr>
                <td>
-               ${lang("open.posting.media.title")} ${m}:
+               ${lang("posting.media.title")} ${m}:
                </td>
                <td colspan="2">
                        <input type="text" name="media_title${m}" size="40" maxlength="80" value=""><br>
@@ -205,18 +205,18 @@
                <td align="left" valign="center">
 
             <!-- text -->
-            ${lang("open.posting.submit.info")}
+            ${lang("posting.submit.info")}
 
                        <br>
-                       ${lang("open.posting.criteria")}<br>
+                       ${lang("posting.criteria")}<br>
 
                </td>
                <td bgcolor="#663399" valign="center" align="center">
-       <input type="submit" value="${lang("open.posting.submit")}">
+       <input type="submit" value="${lang("posting.submit")}">
 
                </td>
                <td bgcolor="#003300" valign="center" align="center">
-                       <input type="reset" value="${lang("open.posting.reset")}">
+                       <input type="reset" value="${lang("posting.reset")}">
                </td>
        </tr>
 </form>

diff --git a/templates-dist/open/posting_done.template b/templates-dist/open/posting_done.template
index 6613859..1aa3d08 100755 (executable)
--- a/templates-dist/open/posting_done.template
+++ b/templates-dist/open/posting_done.template
@@ -2,7 +2,7 @@
 
 <html>
 <head>
-       <title>${lang("open.postingdone.htmltitle")}</title>
+       <title>${lang("postingdone.htmltitle")}</title>
 </head>
 
 <body bgcolor="White" text="Black" link="#006600" vlink="#666666" alink="Red">
@@ -10,16 +10,16 @@
 <table width="100%" border="0" cellspacing="0" cellpadding="4" bgcolor="#cccccc">
        <tr>
                <td align="center" bgcolor="#666666">
-               <font color="White">${lang("open.postingdone.title")}</font></td>
+               <font color="White">${lang("postingdone.title")}</font></td>
        </tr>
        <tr>
                <td bgcolor="#eeeeee"><font color="#000000">
 
 
 <br>
-${lang("open.postingdone.info")}
+${lang("postingdone.info")}
 <br><br>
-<center><EM>${lang("open.postingdone.stay_calm")}</EM></center><br><br>
+<center><EM>${lang("postingdone.stay_calm")}</EM></center><br><br>
 
        </font>
        </td>
@@ -27,7 +27,7 @@ ${lang("open.postingdone.info")}
 
 <tr>
        <td valign="top" align="center" bgcolor="#666666">
-       <a href="javascript:history.go(-2)"><font color="White"><b>&gt;&gt; ${lang("open.postingdone.back")}</b></font></a>
+       <a href="javascript:history.go(-2)"><font color="White"><b>&gt;&gt; ${lang("postingdone.back")}</b></font></a>
                </td>
        </tr>
 </table>

diff --git a/templates-dist/open/posting_dupe.template b/templates-dist/open/posting_dupe.template
index e1d10fd..acaf870 100755 (executable)
--- a/templates-dist/open/posting_dupe.template
+++ b/templates-dist/open/posting_dupe.template
@@ -2,7 +2,7 @@
 
 <html>
 <head>
-       <title>${lang("open.postingdupe.htmltitle")}</title>
+       <title>${lang("postingdupe.htmltitle")}</title>
 </head>
 
 <body bgcolor="White" text="Black" link="white" vlink="#009900" alink="Red">
@@ -11,7 +11,7 @@
        <tr>
                <td valign="top" align="center" bgcolor="#663399">
                        <font color="White"><b>
-                               ${lang("open.postingdupe.title")}
+                               ${lang("postingdupe.title")}
                        </b></font
                </td>
        </tr>
@@ -19,16 +19,16 @@
                <td bgcolor="003300" width=70%>
                        <font color="White">
                                <br>
-                    ${lang("open.postingdupe.explanation")}
+                    ${lang("postingdupe.explanation")}
                                <br>
-                               <center><em>${lang("open.postingdupe.no_panic")}</em></center><br>
+                               <center><em>${lang("postingdupe.no_panic")}</em></center><br>
                                <br>
                        </font>
                </td>
        </tr>
        <tr>
                <td valign="top" align="center" bgcolor="#663399">
-                       <a href="javascript:history.go(-2)"><font color="White"><b>&gt;&gt; ${lang("open.postingdupe.back")}</b></font></a>
+                       <a href="javascript:history.go(-2)"><font color="White"><b>&gt;&gt; ${lang("postingdupe.back")}</b></font></a>
                </td>
        </tr>
 </table>

diff --git a/templates-dist/producer/config.template b/templates-dist/producer/config.template
index 8b35c72..b1daee4 100755 (executable)
--- a/templates-dist/producer/config.template
+++ b/templates-dist/producer/config.template
@@ -1,8 +1,8 @@
     <config>
                        <docroot>${config.docroot}</docroot>
-                       <openaction>${config.openaction}</openaction>
+                       <openaction>${config["Producer.OpenAction"]}</openaction>
                        <storageroot>${config.storageroot}</storageroot>
-                       <productionhost>${config.productionhost}</productionhost>
+                       <productionhost>${config["Producer.ProductionHost"]}</productionhost>
       <productiondate>${now}</productiondate>
       <videohost>${videoHost}</videohost>
       <audiohost>${audioHost}</audiohost>

diff --git a/templates-dist/producer/content.template b/templates-dist/producer/content.template
index a91c42e..3d19ebb 100755 (executable)
--- a/templates-dist/producer/content.template
+++ b/templates-dist/producer/content.template
@@ -24,7 +24,7 @@
       <table width="150" border="0" cellspacing="0" cellpadding="0">
         <tr>
           <td width="140">
-            <a href="${config.productionHost}${config.producerDocRoot}/">
+            <a href="${config["Producer.ProductionHost"]}${config["Producer.DocRoot"]}/">
              <img src="/images/mirlogo.jpg" width="150" height="205" border="0">
             </a>
           </td>
@@ -67,7 +67,7 @@
          <if config.generatePDF=="yes">
            <a href="${data.content.id}.pdf">Print this article</a>
           <else>
-            <a href="${config.openAction}?do=getpdf&id=${data.content.id}">Print this article</a>
+            <a href="${config["Producer.OpenAction"]}?do=getpdf&id=${data.content.id}">Print this article</a>
          </if>
          </td></tr>
        </if>
@@ -143,7 +143,7 @@
                     </tr>
                     <tr><td>&nbsp;</td></tr>
                     <tr>
-                      <td><a href="${config.openAction}?do=addcomment&aid=${data.content.id}">
+                      <td><a href="${config["Producer.OpenAction"]}?do=addcomment&aid=${data.content.id}">
                           ${lang("producer.content.comment")}</a>
                       </td>
                     </tr>

diff --git a/templates-dist/producer/featuresRSS.template b/templates-dist/producer/featuresRSS.template
index 42d1c4b..9100011 100755 (executable)
--- a/templates-dist/producer/featuresRSS.template
+++ b/templates-dist/producer/featuresRSS.template
@@ -7,9 +7,9 @@
  xmlns:syn="http://purl.org/rss/1.0/modules/syndication/"
 >
 
-<channel rdf:about="${config.productionHost}">
+<channel rdf:about="${config["Producer.ProductionHost"]}">
 <title>Indymedia-XX</title>
-<link>${config.productionHost}</link>
+<link>${config["Producer.ProductionHost"]}</link>
 <description>Highlights from Indymedia-XX, a revolutionary expirement in democratic media</description>
 <dc:publisher>IMC Features Working Group &amp;lt;features@someindymedia.org&amp;gt;</dc:publisher>
 <dc:rights>Open Content License, http://www.opencontent.org</dc:rights>
@@ -17,26 +17,26 @@
 <items>
  <rdf:Seq>
   <list data.startspecial as s> 
-    <rdf:li rdf:resource="${config.productionHost}${config.docRoot}${s.publish_path}${s.id}.shtml" />
+    <rdf:li rdf:resource="${config["Producer.ProductionHost"]}${config.docRoot}${s.publish_path}${s.id}.shtml" />
   </list>
   <list data.features as i>    
-  <rdf:li rdf:resource="${config.productionHost}${config.docRoot}${i.publish_path}${i.id}.shtml" />
+  <rdf:li rdf:resource="${config["Producer.ProductionHost"]}${config.docRoot}${i.publish_path}${i.id}.shtml" />
   </list>
  </rdf:Seq>
 </items>
 </channel>
 <list data.startspecial as s>          
-<item rdf:about="${config.productionHost}${config.docRoot}${s.publish_path}${s.id}.shtml">
+<item rdf:about="${config["Producer.ProductionHost"]}${config.docRoot}${s.publish_path}${s.id}.shtml">
 <title>${s.title}</title>
-<link>${config.productionHost}${config.docRoot}${s.publish_path}${s.id}.shtml</link>
+<link>${config["Producer.ProductionHost"]}${config.docRoot}${s.publish_path}${s.id}.shtml</link>
 <description>${s.description_sentence}</description>
 <dc:date>${s.webdb_create_dc}+0200</dc:date>
 </item>
 </list>
 <list data.features as i>              
-<item rdf:about="${config.productionHost}${config.docRoot}${i.publish_path}${i.id}.shtml">
+<item rdf:about="${config["Producer.ProductionHost"]}${config.docRoot}${i.publish_path}${i.id}.shtml">
 <title>${i.title}</title>
-<link>${config.productionHost}${config.docRoot}${i.publish_path}${i.id}.shtml</link>
+<link>${config["Producer.ProductionHost"]}${config.docRoot}${i.publish_path}${i.id}.shtml</link>
 <description>${i.description_sentence}</description>
 <dc:date>${i.webdb_create_dc}+0200</dc:date>
 </item>

diff --git a/templates-dist/producer/navigation.template b/templates-dist/producer/navigation.template
index 07c11cf..3df71d3 100755 (executable)
--- a/templates-dist/producer/navigation.template
+++ b/templates-dist/producer/navigation.template
@@ -2,7 +2,7 @@
                     <!-- topiclist --> 
                     <list data.topics as t> 
                     <br>
-                    <a href="${config.producerDocRoot}/${t.filename}.shtml"><b>${t.title}</b></a> 
+                    <a href="${config["Producer.DocRoot"]}/${t.filename}.shtml"><b>${t.title}</b></a>
                     </list> 
                     <!-- topiclist --> 
                   </p>
@@ -11,7 +11,7 @@
                     <a href="/cgi-bin/cvsweb/mir/">cvsweb</a><br>
                        <a href="/mir/javadoc/">java-doc</a><br>
                     <a href="https://prod.indymedia.nl/mantis/">bug-tracker</a><br>
-                    <a href="${config.openAction}?do=addposting">publish</a><br>
+                    <a href="${config["Producer.OpenAction"]}?do=addposting">publish</a><br>
                     <a href="/download">download</a>
                   </p>
                   <hr noshade width="146" size="1" align="left"> 

diff --git a/templates-dist/producer/openposting.template b/templates-dist/producer/openposting.template
index 595f9cc..d022a89 100755 (executable)
--- a/templates-dist/producer/openposting.template
+++ b/templates-dist/producer/openposting.template
@@ -12,7 +12,7 @@
       <table width="150" border="0" cellspacing="0" cellpadding="0">
         <tr> 
           <td width="140">
-             <a href="${config.productionHost}${config.producerDocRoot}">
+             <a href="${config["Producer.ProductionHost"]}${config["Producer.DocRoot"]}">
              <img src="images/mirlogo.jpg" width="150" height="205" border="0">
              </a>
           </td>
@@ -75,7 +75,7 @@
                             border=0 alt="${i.to_media_images[0]["title"]}">
                         </if> 
                          ${i.description}</p>
-                        <p align="right">[<a href="${config.producerDocRoot}${i.publish_path}${i.id}.shtml">read</a>]</p>
+                        <p align="right">[<a href="${config["Producer.DocRoot"]}${i.publish_path}${i.id}.shtml">read</a>]</p>
                       </td>
                     </tr>
                   </table>

diff --git a/templates-dist/producer/printablecontent.template b/templates-dist/producer/printablecontent.template
index 4ca37b6..d7d4833 100755 (executable)
--- a/templates-dist/producer/printablecontent.template
+++ b/templates-dist/producer/printablecontent.template
@@ -141,7 +141,7 @@ an attribution of copyright/left rights, etc.  the possibilities are endless.
                 text-align="justify">
        ${data.content.content_data_parsed}
         <list data.content.to_media_images as media>
-       <fo:external-graphic  src="file:${config.imagePath}/${media["publish_path"]}"  />
+       <fo:external-graphic  src="file:${config["Producer.Image.Path"]}/${media["publish_path"]}"  />
             ${media["description"]}
         </list>
       </fo:block>

diff --git a/templates-dist/producer/startpage.template b/templates-dist/producer/startpage.template
index f738c49..abd53fd 100755 (executable)
--- a/templates-dist/producer/startpage.template
+++ b/templates-dist/producer/startpage.template
@@ -74,7 +74,7 @@
                             border=0 alt="${s.to_media_images[0]["title"]}">
                         </if> 
                        ${s.description_parsed} </p>
-                        <p align="right">[<a href="${config.producerDocRoot}${s.publish_path}${s.id}.shtml">read</a>]</p>
+                        <p align="right">[<a href="${config["Producer.DocRoot"]}${s.publish_path}${s.id}.shtml">read</a>]</p>
                       </td>
                     </tr>
                   </table>
@@ -106,7 +106,7 @@
                             border=0 alt="${i.to_media_images[0]["title"]}">
                         </if> 
                           ${i.description_parsed} </p>
-                        <p align="right">[<a href="${config.producerDocRoot}${i.publish_path}${i.id}.shtml">read</a>]</p>
+                        <p align="right">[<a href="${config["Producer.DocRoot"]}${i.publish_path}${i.id}.shtml">read</a>]</p>
                       </td>
                     </tr>
                   </table>
@@ -129,7 +129,7 @@
                    <list data.newswire as n>
                    <img alt=${n.to_media_icon["icon_alt"]} border="0" height="10"
 src="${n.to_media_icon["tiny_icon"]}" width="12"> 
-                    <a href="${config.producerDocRoot}${n.publish_path}${n.id}.shtml"><b>${n.title}</b></a><br>
+                    <a href="${config["Producer.DocRoot"]}${n.publish_path}${n.id}.shtml"><b>${n.title}</b></a><br>
                     <font size="-2"><b></b>${n.webdb_create_formatted}</font><br>
                     <br>
                     </list> 

diff --git a/templates-dist/producer/topiclist.template b/templates-dist/producer/topiclist.template
index 1da84cd..99709d1 100755 (executable)
--- a/templates-dist/producer/topiclist.template
+++ b/templates-dist/producer/topiclist.template
@@ -12,7 +12,7 @@
       <table width="150" border="0" cellspacing="0" cellpadding="0">
         <tr> 
           <td width="140">
-             <a href="${config.productionHost}${config.producerDocRoot}/">
+             <a href="${config["Producer.ProductionHost"]}${config["Producer.DocRoot"]}/">
              <img src="images/mirlogo.jpg" width="150" height="205" border="0">
              </a>
           </td>
@@ -75,7 +75,7 @@
                             border=0 alt="${data.special.to_media_images[0]["title"]}">
                         </if> 
                           ${data.special.description_parsed} </p>
-                        <p align="right">[<a href="${config.producerDocroot}${data.special.publish_path}${data.special.id}.shtml">read</a>]</p>
+                        <p align="right">[<a href="${config["Producer.DocRoot"]}${data.special.publish_path}${data.special.id}.shtml">read</a>]</p>
                       </td>
                     </tr>
                   </table>
@@ -106,7 +106,7 @@
                             border=0 alt="${i.to_media_images[0]["title"]}">
                         </if> 
                          ${i.description_parsed}</p>
-                        <p align="right">[<a href="${config.producerDocroot}${i.publish_path}${i.id}.shtml">read</a>]</p>
+                        <p align="right">[<a href="${config["Producer.DocRoot"]}${i.publish_path}${i.id}.shtml">read</a>]</p>
                       </td>
                     </tr>
                   </table>