diff --git a/lam/templates/pdfedit/pdfpage.php b/lam/templates/pdfedit/pdfpage.php
index dd040f42..53d51d27 100644
--- a/lam/templates/pdfedit/pdfpage.php
+++ b/lam/templates/pdfedit/pdfpage.php
@@ -153,15 +153,6 @@ elseif(isset($_GET['add_new_field'])) {
// Insert new entry before closing section tag
array_splice($_SESSION['currentPDFStructure'],$pos,0,array($field));
}
-// Change section headline
-elseif(isset($_GET['change'])) {
- $alter = explode('_',$_GET['change']);
- $newvalue = $_GET['section_' . $alter[0]];
- if (isset($alter[1]) && ($alter[1] == 'item') && ($newvalue[0] != '_')) {
- $newvalue = '_' . $newvalue;
- }
- $_SESSION['currentPDFStructure'][$alter[0]]['attributes']['NAME'] = $newvalue;
-}
// Remove section, static text or value entry from structure
elseif(isset($_GET['remove'])) {
$start = 0;
@@ -324,6 +315,15 @@ elseif(isset($_GET['down'])) {
}
}
+// Change section headline
+foreach ($_GET as $key => $value) {
+ if(strpos($key, 'change_') === 0) {
+ $alter = explode('_', $key);
+ $newvalue = $_GET['section_' . $alter[1]];
+ $_SESSION['currentPDFStructure'][$alter[1]]['attributes']['NAME'] = $newvalue;
+ }
+}
+
// Load PDF structure from file if it is not defined in session
if(!isset($_SESSION['currentPDFStructure'])) {
// Load structure file to be edit
@@ -378,12 +378,6 @@ foreach($sortedModules as $module => $title) {
}
$modules = join(',',$modules);
-$logoFiles = getAvailableLogos();
-$logos = '\n";
-foreach($logoFiles as $logoFile) {
- $logos .= "\n";
-}
-
// print header
include '../main_header.php';
@@ -395,89 +389,77 @@ if (sizeof($saveErrors) > 0) {
echo "
\n";
}
+$newFieldFieldElements = array();
+foreach($sortedModules as $module => $title) {
+ $fields = $_SESSION['availablePDFFields'][$module];
+ if (isset($fields) && is_array($fields) && (sizeof($fields) > 0)) {
+ $moduleFields = array();
+ foreach ($fields as $field => $fieldLabel) {
+ $moduleFields[$fieldLabel] = $module . "_" . $field;
+ }
+ $newFieldFieldElements[$title] = $moduleFields;
+ }
+}
+
+// structure name
+$structureName = '';
+if (isset($_GET['edit'])) {
+ $structureName = $_GET['edit'];
+}
+elseif (isset($_GET['pdfname'])) {
+ $structureName = $_GET['pdfname'];
+}
+else if (isset($_POST['pdfname'])) {
+ $structureName = $_POST['pdfname'];
+}
+// headline
+$headline = 'LDAP Account Manager';
+if (isset($_SESSION['currentPageDefinitions']['headline'])) {
+ $headline = $_SESSION['currentPageDefinitions']['headline'];
+}
+// logo
+$logoFiles = getAvailableLogos();
+$logos = array(_('No logo') => 'none');
+foreach($logoFiles as $logoFile) {
+ $logos[$logoFile['filename'] . ' (' . $logoFile['infos'][0] . ' x ' . $logoFile['infos'][1] . ")"] = $logoFile['filename'];
+}
+$selectedLogo = array('printLogo.jpg');
+if (isset($_SESSION['currentPageDefinitions']['filename'])) {
+ $selectedLogo = array($_SESSION['currentPageDefinitions']['filename']);
+}
+
?>