From ef7981af75ad3b177e10f1435234bd483a060908 Mon Sep 17 00:00:00 2001
From: alpcentaur <luca@cannabinieri.de>
Date: Mon, 29 Aug 2022 22:02:24 +0200
Subject: [PATCH] update form.php

added a line to do not have double header access, and changed echo variable syntax, more stable on multiple os
---
 form.php | 81 +++++++++++++++++++++++++++-----------------------------
 1 file changed, 39 insertions(+), 42 deletions(-)

diff --git a/form.php b/form.php
index 4b7b5eb..8622205 100644
--- a/form.php
+++ b/form.php
@@ -1,9 +1,9 @@
 <h1>
-	<?php echo _($localeYaml['mainheader'][$loc])?>
+	<?php echo $localeYaml['mainheader'][$loc]?>
 </h1>
 <p>
-	<?php echo _($localeYaml['mainheader_subtext_1'][$loc])?><BR>
-	<?php echo _($localeYaml['mainheader_subtext_2'][$loc])?><BR><BR>
+	<?php echo $localeYaml['mainheader_subtext_1'][$loc]?><BR>
+	<?php echo $localeYaml['mainheader_subtext_2'][$loc]?><BR><BR>
 <?php
 	$ct = @file_get_contents( "./locale/$loc/h1.php"); 
 	if ($ct==false)
@@ -16,42 +16,40 @@
 
 <form data-kube="kaform" name="theform" id="theform" action="submit.php" method="POST">
 
-	<fieldset> <legend><?php echo _($localeYaml['form_1_header'][$loc])?></legend>
+	<fieldset> <legend><?php echo $localeYaml['form_1_header'][$loc]?></legend>
 
 		<div class="is-row">
 			<div class="is-col"> 
 				<input required type="input"
 					   size="32" id="projectid" name="project"
-					   placeholder="<?php echo _($localeYaml['form_1_placeholder_1'][$loc])?>" />
+					   placeholder="<?php echo $localeYaml['form_1_placeholder_1'][$loc]?>" />
 			</div>
 		</div>
 
-		<div class="is-row">
+                <div class="is-row">
 			<div class="is-col"> 
 				<input required type="input" size="32"
-			`		id="realname"	name="realname" placeholder="<?php echo _($localeYaml['form_1_placeholder_2'][$loc])?>" />
+			`		id="realname"	name="realname" placeholder="<?php echo $localeYaml['form_1_placeholder_2'][$loc]?>" />
 			</div>
 			<div class="is-col"> 
 				<input type="input" size="32"
 			`		id="wmdecontact"	name="wmdecontact" 
-						placeholder="<?= _($localeYaml['form_1_placeholder_3'][$loc])?>" />
+						placeholder="<?= $localeYaml['form_1_placeholder_3'][$loc]?>" />
 			</div>
 		</div>
-
 		<div class="is-row">
 			<div class="is-col"> 
 				<input type="tel" size="32" 
 					id="phone" name="phone"
-					placeholder="<?= _($localeYaml['form_1_placeholder_4'][$loc])?>" />
+					placeholder="<?= $localeYaml['form_1_placeholder_4'][$loc]?>" />
 			</div>
 			<div class="is-col"> 
 			</div>
 		</div>
-
 		<div class="is-row">
 			<div class="is-col"> 
 				<input required type="email" size="32" id="email"
-						name="email" placeholder="<?= _($localeYaml['form_1_placeholder_5'][$loc])?>" />
+						name="email" placeholder="<?= $localeYaml['form_1_placeholder_5'][$loc]?>" />
 			</div>
 			<div class="is-col"> 
 			</div>
@@ -61,14 +59,14 @@
 			<div class="is-col"> 
 
 				<nav class="tabs" data-kube="tabs" data-equal="false">
-					<a href="#bank-eu" class="is-active"><?=_($localeYaml['form_1_SEPA'][$loc])?></a>
-					<a href="#bank-noneu"><?=_($localeYaml['form_1_noSEPA'][$loc])?></a>
+					<a href="#bank-eu" class="is-active"><?=$localeYaml['form_1_SEPA'][$loc]?></a>
+					<a href="#bank-noneu"><?=$localeYaml['form_1_noSEPA'][$loc]?></a>
 				</nav>
 
 				<section id="bank-eu">
 					<div class="is-row">
 						<div class="is-col">
-							<input type="input" size="32" name="sepa_owner" placeholder="<?=_($localeYaml['form_1_SEPA_placeholder_1'][$loc])?>" />
+							<input type="input" size="32" name="sepa_owner" placeholder="<?=$localeYaml['form_1_SEPA_placeholder_1'][$loc]?>" />
 						</div>
 						<div class="is-col">
 						</div>
@@ -76,14 +74,14 @@
 
 					<div class="is-row">
 						<div class="is-col">
-							<input type="input" size="32" id="iban" name="iban" placeholder="<?=_($localeYaml['form_1_SEPA_placeholder_2'][$loc])?>" />
+							<input type="input" size="32" id="iban" name="iban" placeholder="<?=$localeYaml['form_1_SEPA_placeholder_2'][$loc]?>" />
 						</div>
 						<div class="is-col">
-							<input type="input" size="32" id="bic" name="bic" placeholder="<?=_($localeYaml['form_1_SEPA_placeholder_3'][$loc])?>" />
+							<input type="input" size="32" id="bic" name="bic" placeholder="<?=$localeYaml['form_1_SEPA_placeholder_3'][$loc]?>" />
 						</div>
 					</div>
 					<textarea  id="comments" name="comments" style="resize:none;" cols="32" rows="4" 
-						placeholder="<?=_($localeYaml['form_1_SEPA_placeholder_4'][$loc])?>"></textarea >
+						placeholder="<?=$localeYaml['form_1_SEPA_placeholder_4'][$loc]?>"></textarea >
 
 				</section>
 
@@ -91,35 +89,35 @@
 				<section id="bank-noneu">
 					<div class="is-row">
 						<div class="is-col">
-							<input type="input" size="32" name="non_sepa_owner" placeholder="<?=_($localeYaml['form_1_noSEPA_placeholder_1'][$loc])?>" />
+							<input type="input" size="32" name="non_sepa_owner" placeholder="<?=$localeYaml['form_1_noSEPA_placeholder_1'][$loc]?>" />
 						</div>
 						<div class="is-col">
-							<input type="input" size="32" id="n_bic" name="n_bic" placeholder="<?=_($localeYaml['form_1_noSEPA_placeholder_2'][$loc])?>" />
+							<input type="input" size="32" id="n_bic" name="n_bic" placeholder="<?=$localeYaml['form_1_noSEPA_placeholder_2'][$loc]?>" />
 						</div>
 					</div>
 
 					<div class="is-row">
 						<div class="is-col">
-							<input type="input" size="32" id="n_iban" name="n_iban" placeholder="<?=_($localeYaml['form_1_noSEPA_placeholder_3'][$loc])?>" />
+							<input type="input" size="32" id="n_iban" name="n_iban" placeholder="<?=$localeYaml['form_1_noSEPA_placeholder_3'][$loc]?>" />
 						</div>
 						<div class="is-col">
-							<input type="input" size="32" id="n_routing" name="n_routing" placeholder="<?=_($localeYaml['form_1_noSEPA_placeholder_4'][$loc])?>" />
+							<input type="input" size="32" id="n_routing" name="n_routing" placeholder="<?=$localeYaml['form_1_noSEPA_placeholder_4'][$loc]?>" />
 						</div>
 					</div>
 					<input class="EU nonEU" type="input" size="32" id="n_bank" name="n_bankname" placeholder="<?=$localeYaml['form_1_noSEPA_placeholder_5'][$loc]?>" />
 
 					<textarea  class="nonEU" name="n_bankaddress" id="n_bankaddress" style="resize:both;" cols="32" rows="4" 
-						placeholder="<?=_($localeYaml['form_1_noSEPA_placeholder_6'][$loc])?>"></textarea>
+						placeholder="<?=$localeYaml['form_1_noSEPA_placeholder_6'][$loc]?>"></textarea>
 					<br>
 					<textarea name="n_address" lang="de" class="nonEU" id="n_address" style="resize:both;" cols="32" rows="4" 
-						placeholder="<?=_($localeYaml['form_1_noSEPA_placeholder_7'][$loc])?>"></textarea>
+						placeholder="<?=$localeYaml['form_1_noSEPA_placeholder_7'][$loc]?>"></textarea>
 					<br>
 
 
 
 					<textarea  id="n_comments" name="n_comments"
 							style="resize:both;" cols="32" rows="4" 
-							placeholder="<?=_($localeYaml['form_1_noSEPA_placeholder_8'][$loc])?>"></textarea>
+							placeholder="<?=$localeYaml['form_1_noSEPA_placeholder_8'][$loc]?>"></textarea>
 
 				</section>
 
@@ -129,10 +127,10 @@
 	</fieldset>
 
 
-	<fieldset id="fieldset2"> <legend><?=_($localeYaml['form_2_header'][$loc])?></legend>
+	<fieldset id="fieldset2"> <legend><?=$localeYaml['form_2_header'][$loc]?></legend>
 		<div class="is-row">
 			<div class="is-col">
-				<?=_($localeYaml['form_2_currency'][$loc])?>
+				<?=$localeYaml['form_2_currency'][$loc]?>
 			</div>
 			<div class="is-col">
 				<select onchange="renumberTableRows()" name='currency' id="currency"  >
@@ -149,13 +147,13 @@
 		<table id="tabtab" class="is-responsive is-bordered is-striped">
 			<thead>
 				<tr>
-					<th><?=_($localeYaml['form_2_table_1'][$loc])?></th>
-					<th><?=_($localeYaml['form_2_table_2'][$loc])?></th>
-					<th><?=_($localeYaml['form_2_table_3'][$loc])?></th>
-					<th><?=_($localeYaml['form_2_table_4'][$loc])?></th>
-					<th><?=_($localeYaml['form_2_table_5'][$loc])?></th>
-					<th><?=_($localeYaml['form_2_table_6'][$loc])?></th>
-					<th><?=_($localeYaml['form_2_table_7'][$loc])?></th>
+					<th><?=$localeYaml['form_2_table_1'][$loc]?></th>
+					<th><?=$localeYaml['form_2_table_2'][$loc]?></th>
+					<th><?=$localeYaml['form_2_table_3'][$loc]?></th>
+					<th><?=$localeYaml['form_2_table_4'][$loc]?></th>
+					<th><?=$localeYaml['form_2_table_5'][$loc]?></th>
+					<th><?=$localeYaml['form_2_table_6'][$loc]?></th>
+					<th><?=$localeYaml['form_2_table_7'][$loc]?></th>
 				</tr>
 			</thead>
 			<tbody id="tabbody">
@@ -163,15 +161,15 @@
 		</table>
 		<div class="is-col">
 			<button id="add_issue" type="button" onclick="addRow();" 
-			class="button is-green"><?=_($localeYaml['form_2_button'][$loc])?></button>
+			class="button is-green"><?=$localeYaml['form_2_button'][$loc]?></button>
 		</div>
 
 	</fieldset>
 	<br>
-	<fieldset> <legend><?=_($localeYaml['form_3_header'][$loc])?></legend>
+	<fieldset> <legend><?=$localeYaml['form_3_header'][$loc]?></legend>
 		<div class="is-row">
 			<div class="is-col valign="center"">
-					<?=_($localeYaml['form_3_subtext_1'][$loc])?>
+					<?=$localeYaml['form_3_subtext_1'][$loc]?>
 			</div>
 			<div class="is-col">
 				<input input name="advance" id="advance" type="text" placeholder="0,00 EUR"/>
@@ -180,7 +178,7 @@
 
 		<div class="is-row">
 			<div class="is-col valign="center"">
-				<?=_($localeYaml['form_3_subtext_2'][$loc])?>*
+				<?=$localeYaml['form_3_subtext_2'][$loc]?>*
 			</div>
 			<div class="is-col">
 				<input id="agree" type="checkbox" />
@@ -190,12 +188,12 @@
 		<div class="is-row">
 			<div class="is-col">
 				<button type="button" onclick="downloadDocument(false);"
-				class="button is-orange"><?=_($localeYaml['form_3_button_1'][$loc])?></button>
+				class="button is-orange"><?=$localeYaml['form_3_button_1'][$loc]?></button>
 			</div>
 
 			<div class="is-col">
 				<button type="button" onclick="downloadDocument(true);"
-				class="button is-green"><?=_($localeYaml['form_3_button_2'][$loc])?></button>
+				class="button is-green"><?=$localeYaml['form_3_button_2'][$loc]?></button>
 			</div>
 	
 		</div>
@@ -209,5 +207,4 @@
 
 
 </form>
-<?php
-
+<?php
\ No newline at end of file