shared/Lock.pm: fixed a small bug (now returns 0 if occupied)

[selfforum.git] / selfforum-cgi / user / config / fo_posting.xml

diff --git a/selfforum-cgi/user/config/fo_posting.xml b/selfforum-cgi/user/config/fo_posting.xml
index fd6e4fc6eb31ea8bfbe48801c0a63accba6af9d5..dc93824ddd0977f18fc342668f6ffb2e78540f71 100644 (file)
--- a/selfforum-cgi/user/config/fo_posting.xml
+++ b/selfforum-cgi/user/config/fo_posting.xml
@@ -13,12 +13,17 @@
         <Variable name="docFatal">DOC_FATAL</Variable>
         <Variable name="errorMessage">_ERR_MESS</Variable>
         <Variable name="charNum">_NUM</Variable>
-        <Variable name="wrongPar">_MANIPULATED</Variable>
-        <Variable name="wrongCode">_ENCODING</Variable>
+
+        <Variable name="missing_key">_MANIPULATED</Variable>
+        <Variable name="unexpected_key">_MANIPULATED</Variable>
+        <Variable name="unknown_followup">_MANIPULATED</Variable>
+        <Variable name="unknown_encoding">_ENCODING</Variable>
         <Variable name="occupied">_OCCUPIED</Variable>
-        <Variable name="noReply">_NOREPLY</Variable>
+        <Variable name="master_lock">_MASTERLOCK</Variable>
+        <Variable name="no_reply">_NOREPLY</Variable>
         <Variable name="dupe">_DUPE</Variable>
-        <Variable name="unknownError">_UNKNOWN</Variable>
+        <Variable name="not_saved">_NOT_SAVED</Variable>
+        <Variable name="unknown_error">_UNKNOWN</Variable>
 
         <Variable name="cssFile">_CSS_FILE</Variable>
 
@@ -69,6 +74,8 @@
             <ListItem>posterName</ListItem>
             <ListItem>posterEmail</ListItem>
             <ListItem>posterBody</ListItem>
+            <ListItem>posterCategory</ListItem>
+            <ListItem>posterSubject</ListItem>
           </List>
         </Property>
 
@@ -77,56 +84,60 @@
             <Property name="assign">
               <Variable name="name">_FORM_FUP_NAME</Variable>
               <Variable name="value">_FORM_FUP_VALUE</Variable>
-              <Variable name="tooLong">_MANIPULATED</Variable>
+              <Variable name="too_long">_MANIPULATED</Variable>
             </Property>
 
             <Variable name="name">fup</Variable>
             <Variable name="maxlength">20</Variable>
             <Variable name="errorType">fatal</Variable>
+            <Variable name="type">internal</Variable>
           </Property>
 
           <Property name="userID">
             <Property name="assign">
               <Variable name="name">_FORM_UID_NAME</Variable>
               <Variable name="value">_FORM_UID_VALUE</Variable>
-              <Variable name="tooLong">_MANIPULATED</Variable>
+              <Variable name="too_long">_MANIPULATED</Variable>
             </Property>
 
             <Variable name="name">userid</Variable>
             <Variable name="maxlength">40</Variable>
             <Variable name="errorType">fatal</Variable>
+            <Variable name="type">internal</Variable>
           </Property>
 
           <Property name="uniqueID">
             <Property name="assign">
               <Variable name="name">_FORM_UNID_NAME</Variable>
               <Variable name="value">_FORM_UNID_VALUE</Variable>
-              <Variable name="tooLong">_MANIPULATED</Variable>
+              <Variable name="too_long">_MANIPULATED</Variable>
             </Property>
 
             <Variable name="name">unid</Variable>
             <Variable name="maxlength">40</Variable>
             <Variable name="errorType">fatal</Variable>
+            <Variable name="type">internal</Variable>
           </Property>
 
           <Property name="quoteChar">
             <Property name="assign">
               <Variable name="name">_FORM_QCHAR_NAME</Variable>
               <Variable name="value">_FORM_QCHAR_VALUE</Variable>
-              <Variable name="tooLong">_MANIPULATED</Variable>
+              <Variable name="too_long">_MANIPULATED</Variable>
             </Property>
 
             <Variable name="name">qchar</Variable>
             <Variable name="maxlength">20</Variable>
             <Variable name="errorType">fatal</Variable>
+            <Variable name="type">internal</Variable>
           </Property>
 
           <Property name="posterName">
             <Property name="assign">
               <Variable name="name">_FORM_NAME_NAME</Variable>
               <Variable name="value">_FORM_NAME_VALUE</Variable>
-              <Variable name="tooLong">_NAME_TOO_LONG</Variable>
-              <Variable name="tooShort">_NAME_TOO_SHORT</Variable>
+              <Variable name="too_long">_NAME_TOO_LONG</Variable>
+              <Variable name="too_short">_NAME_TOO_SHORT</Variable>
             </Property>
 
             <Variable name="name">name</Variable>
@@ -139,9 +150,9 @@
             <Property name="assign">
               <Variable name="name">_FORM_MAIL_NAME</Variable>
               <Variable name="value">_FORM_MAIL_VALUE</Variable>
-              <Variable name="tooLong">_MAIL_TOO_LONG</Variable>
-              <Variable name="tooShort">_MAIL_TOO_SHORT</Variable>
-              <Variable name="wrong">_MAIL_WRONG</Variable>
+              <Variable name="too_long">_MAIL_TOO_LONG</Variable>
+              <Variable name="too_short">_MAIL_TOO_SHORT</Variable>
+              <Variable name="wrong_mail">_MAIL_WRONG</Variable>
             </Property>
 
             <Variable name="name">email</Variable>
@@ -155,15 +166,16 @@
             <Property name="assign">
               <Variable name="name">_FORM_CAT_NAME</Variable>
               <Variable name="value">_CATLIST</Variable>
-              <Variable name="tooLong">_CAT_WRONG</Variable>
-              <Variable name="tooShort">_CAT_WRONG</Variable>
-              <Variable name="notSelected">_CAT_WRONG</Variable>
+              <Variable name="too_long">_CAT_WRONG</Variable>
+              <Variable name="too_short">_CAT_WRONG</Variable>
+              <Variable name="no_option">_CAT_WRONG</Variable>
             </Property>
 
             <Variable name="name">category</Variable>
             <Variable name="maxlength">18</Variable>
             <Variable name="minlength">3</Variable>
-            <Variable name="errorType">repeat</Variable>
+            <Variable name="errorType">fetch</Variable>
+            <Variable name="header">category</Variable>
             <List name="values">
               <ListItem>ASP</ListItem>
               <ListItem>BROWSER</ListItem>
@@ -172,7 +184,7 @@
               <ListItem>DATENBANK</ListItem>
               <ListItem>DESIGN</ListItem>
               <ListItem>DHTML</ListItem>
-              <ListItem>E_MAIL</ListItem>
+              <ListItem>E-MAIL</ListItem>
               <ListItem>FTP</ListItem>
               <ListItem>GRAFIK</ListItem>
               <ListItem>HTML</ListItem>
@@ -203,52 +215,60 @@
             <Property name="assign">
               <Variable name="name">_FORM_SUBJECT_NAME</Variable>
               <Variable name="value">_FORM_SUBJECT_VALUE</Variable>
-              <Variable name="tooLong">_SUB_TOO_LONG</Variable>
-              <Variable name="tooShort">_SUB_TOO_SHORT</Variable>
+              <Variable name="too_long">_SUB_TOO_LONG</Variable>
+              <Variable name="too_short">_SUB_TOO_SHORT</Variable>
             </Property>
             <Variable name="name">subject</Variable>
             <Variable name="maxlength">64</Variable>
             <Variable name="minlength">4</Variable>
-            <Variable name="errorType">repeat</Variable>
+            <Variable name="errorType">fetch</Variable>
+            <Variable name="header">subject</Variable>
           </Property>
 
           <Property name="posterBody">
             <Property name="assign">
               <Variable name="name">_FORM_BODY_NAME</Variable>
               <Variable name="value">_FORM_BODY_VALUE</Variable>
-              <Variable name="tooLong">_BODY_TOO_LONG</Variable>
-              <Variable name="tooShort">_BODY_TOO_SHORT</Variable>
+              <Variable name="too_long">_BODY_TOO_LONG</Variable>
+              <Variable name="too_short">_BODY_TOO_SHORT</Variable>
             </Property>
             <Variable name="name">body</Variable>
             <Variable name="maxlength">12288</Variable>
             <Variable name="minlength">10</Variable>
             <Variable name="errorType">repeat</Variable>
+            <Variable name="type">multiline-text</Variable>
           </Property>
 
           <Property name="posterSignature">
-            <Variable name="assignValue">_FORM_SIGN_VALUE</Variable>
+            <Property name="assign">
+              <Variable name="value">_FORM_SIGN_VALUE</Variable>
+            </Property>
           </Property>
 
           <Property name="posterURL">
             <Property name="assign">
               <Variable name="name">_FORM_URL_NAME</Variable>
               <Variable name="value">_FORM_URL_VALUE</Variable>
-              <Variable name="tooLong">_URL_TOO_LONG</Variable>
+              <Variable name="too_long">_URL_TOO_LONG</Variable>
             </Property>
             <Variable name="name">url</Variable>
             <Variable name="maxlength">1024</Variable>
-            <Variable name="errorType">repeat</Variable>
+            <Variable name="type">http-url</Variable>
+            <Variable name="errorType">kill</Variable>
+            <Variable name="default">http://</Variable>
           </Property>
 
           <Property name="posterImage">
             <Property name="assign">
               <Variable name="name">_FORM_IMG_NAME</Variable>
               <Variable name="value">_FORM_IMG_VALUE</Variable>
-              <Variable name="tooLong">_IMG_TOO_LONG</Variable>
+              <Variable name="too_long">_IMG_TOO_LONG</Variable>
             </Property>
             <Variable name="name">image</Variable>
             <Variable name="maxlength">1024</Variable>
-            <Variable name="errorType">repeat</Variable>
+            <Variable name="type">http-url</Variable>
+            <Variable name="errorType">kill</Variable>
+            <Variable name="default">http://</Variable>
           </Property>
 
         </Property>