From 89c2b548894d687695942d6131e9c3b6452997e7 Mon Sep 17 00:00:00 2001
From: Clemens Schwaighofer <clemens.schwaighofer@egplusww.com>
Date: Tue, 28 May 2019 13:22:18 +0900
Subject: [PATCH] Some post fixes for edit_base and core libs update

- edit order template indent fix
- Form/Generate init had wrong check on array for load list query
- ACL for group level was still using old session name
---
 www/includes/edit_base.inc                  |  1 +
 www/includes/templates/admin/edit_order.tpl | 26 ++++++++++-----------
 www/lib/CoreLibs/Output/Form/Generate.inc   |  6 ++---
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/www/includes/edit_base.inc b/www/includes/edit_base.inc
index 3f9a3eae..3906da6c 100644
--- a/www/includes/edit_base.inc
+++ b/www/includes/edit_base.inc
@@ -18,6 +18,7 @@
 *********************************************************************/
 
 $DEBUG_ALL = 1;
+$PRINT_ALL = 1;
 $DB_DEBUG = 1;
 
 // TODO: only extract _POST data that is needed
diff --git a/www/includes/templates/admin/edit_order.tpl b/www/includes/templates/admin/edit_order.tpl
index 51cbd854..e121447e 100644
--- a/www/includes/templates/admin/edit_order.tpl
+++ b/www/includes/templates/admin/edit_order.tpl
@@ -32,15 +32,15 @@
 <!-- BODY START //-->
 <tr>
   <td class="edit_bgcolor">
-	 <table width="100%" border="0" cellpadding="2" cellspacing="1">
-	 <!-- ANFANG Neu //-->
-	 <form method="post" enctype="multipart/form-data">
-	 <tr>
+	<table width="100%" border="0" cellpadding="2" cellspacing="1">
+	<!-- ANFANG Neu //-->
+	<form method="post" enctype="multipart/form-data">
+	<tr>
 		<td class="edit_fgcolor_alt" class="normal" colspan="2">
 			Order
 		</td>
-	 </tr>
-	 <tr>
+	</tr>
+	<tr>
 		<td class="edit_fgcolor" class="normal" width="80%">
 			<select name="position[]" size="20" multiple>
 				{html_options values=$options_id output=$options_name selected=$options_selected}
@@ -65,15 +65,15 @@
 			<input type="hidden" name="where_string" value="{$where_string}">
 			<!-- single hiddens //-->
 		</td>
-	 </tr>
-	 <tr>
+	</tr>
+	<tr>
 		<td class="edit_fgcolor_alt" class="normal" colspan="2">
-			<input type="button" name="close" value="Close" OnClick="self.close();"> 
+			<input type="button" name="close" value="Close" OnClick="self.close();">
 		</td>
-	 </tr>
-	 </form>
-	 <!-- ENDE FOOTER //-->
-	 </table>
+	</tr>
+	</form>
+<!-- ENDE FOOTER //-->
+	</table>
   </td>
 </tr>
 <!-- BODY END //-->
diff --git a/www/lib/CoreLibs/Output/Form/Generate.inc b/www/lib/CoreLibs/Output/Form/Generate.inc
index 2f113726..9926ea7b 100644
--- a/www/lib/CoreLibs/Output/Form/Generate.inc
+++ b/www/lib/CoreLibs/Output/Form/Generate.inc
@@ -282,7 +282,7 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
 		if (isset($config_array['show_fields']) && is_array($config_array['show_fields'])) {
 			$this->field_array = $config_array['show_fields'];
 		}
-		if (isset($config_array['load_query']) && is_array($config_array['load_query'])) {
+		if (isset($config_array['load_query']) && $config_array['load_query']) {
 			$this->load_query = $config_array['load_query'];
 		}
 		$this->archive_pk_name = 'a_'.$this->pk_name;
@@ -313,7 +313,7 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
 		$this->remove_button = $_POST['remove_button'];
 
 		// security settings
-		$this->group_level_user = $_SESSION['GROUP_LEVEL'];
+		$this->group_level_user = isset($_SESSION['GROUP_ACL_LEVEL']) ? $_SESSION['GROUP_ACL_LEVEL'] : 0;
 		// security levels for buttons/actions
 		// if array does not exists create basic
 		if (!is_array($config_array['security_level']) || count($config_array['security_level']) < 4) {
@@ -565,7 +565,7 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
 		if ($this->group_level_user <= $this->security_level['load']) {
 			$t_pk_name = $this->archive_pk_name;
 
-			// lade liste
+			// load list data
 			$this->dbExec($this->load_query);
 			while ($res = $this->dbFetchArray()) {
 				$pk_ids[] = $res[$this->int_pk_name];