diff --git a/lam/templates/login.php b/lam/templates/login.php
index 071621da..431ef70c 100644
--- a/lam/templates/login.php
+++ b/lam/templates/login.php
@@ -33,7 +33,6 @@ include_once("../lib/status.inc");
 
 // check if PHP >= 5.1
 if (version_compare(phpversion(), '5.1.0') < 0) {
-	echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
 	echo "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">\n\n";
 	echo "<html>\n<head>\n";
 	echo "<meta http-equiv=\"content-type\" content=\"text/html; charset=UTF-8\">\n";
@@ -93,7 +92,6 @@ if (isset($memLimit) && ($memLimit != '') && (substr(strtoupper($memLimit), strl
 }
 // stop login if critical errors occured
 if (sizeof($criticalErrors) > 0) {
-	echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
 	echo "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">\n\n";
 	echo "<html>\n<head>\n";
 	echo "<meta http-equiv=\"content-type\" content=\"text/html; charset=UTF-8\">\n";
@@ -145,8 +143,7 @@ function display_LoginPage($config_object) {
 	$_SESSION['language'] = $config_object->get_defaultLanguage();
 
 	$current_language = explode(":",$_SESSION['language']);
-	$_SESSION['header'] = "<?xml version=\"1.0\" encoding=\"" . $current_language[1] . "\"?>\n";
-	$_SESSION['header'] .= "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">\n\n";
+	$_SESSION['header'] = "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">\n\n";
 	$_SESSION['header'] .= "<html>\n<head>\n";
 	$_SESSION['header'] .= "<meta http-equiv=\"content-type\" content=\"text/html; charset=" . $current_language[1] . "\">\n";
 	$_SESSION['header'] .= "<meta http-equiv=\"pragma\" content=\"no-cache\">\n		<meta http-equiv=\"cache-control\" content=\"no-cache\">";
@@ -413,8 +410,7 @@ if(!empty($_POST['checklogin']))
 			$_SESSION['loggedIn'] = true;
 			$_SESSION['language'] = $_POST['language']; // Write selected language in session
 			$current_language = explode(":",$_SESSION['language']);
-			$_SESSION['header'] = "<?xml version=\"1.0\" encoding=\"" . $current_language[1] . "\"?>\n";
-			$_SESSION['header'] .= "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">\n\n";
+			$_SESSION['header'] = "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">\n\n";
 			$_SESSION['header'] .= "<html>\n<head>\n";
 			$_SESSION['header'] .= "<meta http-equiv=\"content-type\" content=\"text/html; charset=" . $current_language[1] . "\">\n";
 			$_SESSION['header'] .= "<meta http-equiv=\"pragma\" content=\"no-cache\">\n		<meta http-equiv=\"cache-control\" content=\"no-cache\">";
diff --git a/lam/templates/main.php b/lam/templates/main.php
index 3686fc51..e2d35e1a 100644
--- a/lam/templates/main.php
+++ b/lam/templates/main.php
@@ -58,7 +58,6 @@ for ($i = 0; $i < sizeof($types); $i++) {
 $lang = explode(":",$_SESSION['language']);
 $lang = $lang[1];
 
-echo "<?xml version=\"1.0\" encoding=\"$lang\"?>\n";
 echo "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Frameset//EN\" \"http://www.w3.org/TR/html4/frameset.dtd\">\n";
 echo "<html>\n";
 echo "<head>\n";
diff --git a/lam/templates/pdfedit/pdfpage.php b/lam/templates/pdfedit/pdfpage.php
index 6b5b88a9..a96a7cf6 100644
--- a/lam/templates/pdfedit/pdfpage.php
+++ b/lam/templates/pdfedit/pdfpage.php
@@ -417,6 +417,7 @@ echo $_SESSION['header'];
 							<table>
 <?php
 $sections = '<option value="0">' . _('Beginning') . "</option>\n";
+$nonTextSections = '';
 // Print every entry in the current structure
 foreach($_SESSION['currentPDFStructure'] as $key => $entry) {
 	// Create the up/down/remove links
@@ -438,6 +439,13 @@ foreach($_SESSION['currentPDFStructure'] as $key => $entry) {
 	// We have a new section to start
 	if($entry['tag'] == "SECTION" && $entry['type'] == "open") {
 		$name = $entry['attributes']['NAME'];
+		if(preg_match("/^_[a-zA-Z_]+/",$name)) {
+			$section_headline = substr($name,1);
+		}
+		else {
+			$section_headline = $name;
+		}
+		$nonTextSections .= '<option value="' . $key . '">' . $section_headline . "</option>\n";
 		?>
 								<tr>
 									<td width="20" align="left">
@@ -449,7 +457,6 @@ foreach($_SESSION['currentPDFStructure'] as $key => $entry) {
 		if(preg_match("/^_[a-zA-Z_]+/",$name)) {
 			?>
 										<select name="section_<?php echo $key;?>">
-											<!-- <?php echo $section_items;?> -->
 			<?php
 			foreach($section_items_array as $item) {
 				?>
@@ -464,7 +471,7 @@ foreach($_SESSION['currentPDFStructure'] as $key => $entry) {
 		// Section headline is a user text
 		else {
 			?>
-										<input type="text" name="section_<?php echo $key;?>" value="<?php echo $name;?>">&nbsp;&nbsp;<button type="submit" name="change" value="<?php echo $key;?>"><?php echo _('Change');?></button>
+										<input type="text" name="section_<?php echo $key;?>" value="<?php echo $section_headline;?>">&nbsp;&nbsp;<button type="submit" name="change" value="<?php echo $key;?>"><?php echo _('Change');?></button>
 			<?php
 		}
 		?>
@@ -692,6 +699,19 @@ foreach($_SESSION['availablePDFFields'] as $module => $fields) {
 							</fieldset>
 					</td>
 				</tr>
+				<tr>
+					<td colspan="3">
+							<fieldset class="<?php echo $_GET['type']; ?>edit">
+								<legend>
+									<b><?php echo _('New field');?></b>
+								</legend><BR>
+								<B><?php echo _('Position');?>: </B>
+								<select name="add_text_position">
+									<?php echo $nonTextSections;?>
+								</select>
+								<input type="submit" name="add_field" value="<?php echo _('Add');?>">
+					</td>
+				</tr>
 				<tr>
 					<td colspan="3">
 						<fieldset class="<?php echo $_GET['type']; ?>edit">
diff --git a/lam/templates/tree/tree_view.php b/lam/templates/tree/tree_view.php
index 66a96af6..d49bf5a8 100644
--- a/lam/templates/tree/tree_view.php
+++ b/lam/templates/tree/tree_view.php
@@ -64,7 +64,6 @@ if (! isset($_SESSION['tree'])) {
 	$_SESSION['tree_icons'] = $tree_icons;
 }
 
-echo "<?xml version=\"1.0\" encoding=\"$lang\"?>";
 echo "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Frameset//EN\" \"http://www.w3.org/TR/html4/frameset.dtd\">";
 echo "<html>";
 echo "<head>";

@@ -449,7 +457,6 @@ foreach($_SESSION['currentPDFStructure'] as $key => $entry) { if(preg_match("/^_[a-zA-Z_]+/",$name)) { ?> + @@ -692,6 +699,19 @@ foreach($_SESSION['availablePDFFields'] as $module => $fields) {
+ + + + + : + + +
diff --git a/lam/templates/tree/tree_view.php b/lam/templates/tree/tree_view.php index 66a96af6..d49bf5a8 100644 --- a/lam/templates/tree/tree_view.php +++ b/lam/templates/tree/tree_view.php @@ -64,7 +64,6 @@ if (! isset($_SESSION['tree'])) { $_SESSION['tree_icons'] = $tree_icons; } -echo ""; echo ""; echo ""; echo "";