From 70d51025f82720fb3a44d615da5b8b118d4f47da Mon Sep 17 00:00:00 2001 From: Clemens Schwaighofer Date: Tue, 28 May 2019 12:54:17 +0900 Subject: [PATCH] Merge edit_order into edit_base, core libs update edit_order.php is merged into includes/edit_base and changed to symlink In the CoreLibs Output/Form/Generate - switch all " to ' in strings - add not set init config_array parts if loaded with no includes/table_arrays/ file DB/Extended/ArrayIO - switch all " to ' in strings ACL/Login - swich all missing " strings to ' - not TEMPLATE part is deprecated (but leave load in) --- www/admin/edit_order.php | 208 +---- www/includes/admin_set_paths.inc | 1 - www/includes/edit_base.inc | 513 ++++++----- www/includes/templates/admin/edit_order.tpl | 2 +- www/lib/CoreLibs/ACL/Login.inc | 147 ++-- www/lib/CoreLibs/DB/Extended/ArrayIO.inc | 206 ++--- www/lib/CoreLibs/Output/Form/Generate.inc | 913 ++++++++++---------- 7 files changed, 962 insertions(+), 1028 deletions(-) mode change 100644 => 120000 www/admin/edit_order.php diff --git a/www/admin/edit_order.php b/www/admin/edit_order.php deleted file mode 100644 index cc532fb9..00000000 --- a/www/admin/edit_order.php +++ /dev/null @@ -1,207 +0,0 @@ -dbExec("SET search_path TO ".LOGIN_DB_SCHEMA); -$smarty = new CoreLibs\Template\SmartyExtend($lang); -if (TARGET == 'live' || TARGET == 'remote') { - // login - $login->debug_output_all = DEBUG ? 1 : 0; - $login->echo_output_all = 0; - $login->print_output_all = DEBUG ? 1 : 0; - // form - $db->debug_output_all = DEBUG ? 1 : 0; - $db->echo_output_all = 0; - $db->print_output_all = DEBUG ? 1 : 0; -} -// set the template dir -if (defined('LAYOUT')) { - $smarty->setTemplateDir(LAYOUT.DEFAULT_TEMPLATE.TEMPLATES); - $DATA['css'] = LAYOUT.DEFAULT_TEMPLATE.CSS; - $DATA['js'] = LAYOUT.DEFAULT_TEMPLATE.JS; -} else { - $smarty->setTemplateDir(TEMPLATES.DEFAULT_TEMPLATE); - $DATA['css'] = CSS.DEFAULT_TEMPLATE; - $DATA['js'] = JS.DEFAULT_TEMPLATE; -} - -// order name is _always_ order_number for the edit interface - -// follwing arrays do exist here: -// $position ... has the positions of the array (0..max), cause in a + // I can't put an number into the array field, in this array, + // there are the POSITION stored, that should CHANGE there order (up/down) + // $row_data_id ... has ALL ids from the sorting part + // $row_data_order ... has ALL order positions from the soirting part + if (!is_array($position)) { + $position = array (); + } + if (count($position)) { + $original_id = $row_data_id; -$DATA['table_width'] = $table_width; + // FIRST u have to put right sort, then read again ... + // hast to be >0 or the first one is selected and then there is no move + if ($up && $position[0] > 0) { + for ($i = 0; $i < count($position); $i++) { + // change position order + // this gets temp, id before that, gets actual (moves one "down") + // this gets the old before (moves one "up") + // is done for every element in row + // echo "A: ".$row_data_id[$position[$i]]." (".$row_data_order[$position[$i]].") -- ".$row_data_id[$position[$i]-1]." (".$row_data_order[$position[$i]-1].")
"; + $temp_id = $row_data_id[$position[$i]]; + $row_data_id[$position[$i]] = $row_data_id[$position[$i]-1]; + $row_data_id[$position[$i]-1] = $temp_id; + // echo "A: ".$row_data_id[$position[$i]]." (".$row_data_order[$position[$i]].") -- ".$row_data_id[$position[$i]-1]." (".$row_data_order[$position[$i]-1].")
"; + } // for + } // if up -// write out error / status messages -$messages[] = $form->formPrintMsg(); -$DATA['form_error_msg'] = $messages; + // the last position id from position array is not to be the count-1 of row_data_id array, or it is the last element + if ($down && ($position[count($position) - 1] != (count($row_data_id) - 1))) { + for ($i = count($position) - 1; $i >= 0; $i --) { + // same as up, just up in other way, starts from bottom (last element) and moves "up" + // element before actuel gets temp, this element, becomes element after this, + // element after this, gets this + $temp_id = $row_data_id[$position[$i] + 1]; + $row_data_id[$position[$i] + 1] = $row_data_id[$position[$i]]; + $row_data_id[$position[$i]] = $temp_id; + } // for + } // if down -// MENU START -// request some session vars -if (!$HEADER_COLOR) { - $DATA['HEADER_COLOR'] = "#E0E2FF"; + // write data ... (which has to be abstrackt ...) + if (($up && $position[0] > 0) || ($down && ($position[count($position) - 1]!=(count($row_data_id) - 1)))) { + for ($i = 0; $i < count($row_data_id); $i ++) { + $q = "UPDATE ".$table_name." SET order_number = ".$row_data_order[$i]." WHERE ".$table_name."_id = ".$row_data_id[$i]; + $q = $form->dbExec($q); + } // for all article ids ... + } // if write + } // if there is something to move + + // get ... + $q = "SELECT ".$table_name."_id, name, order_number FROM ".$table_name." "; + if ($where_string) { + $q .= "WHERE $where_string "; + } + $q .= "ORDER BY order_number"; + + while ($res = $form->dbReturn($q)) { + $row_data[] = array ( + "id" => $res[$table_name."_id"], + "name" => $res["name"], + "order" => $res["order_number"] + ); + } // while read data ... + + // define all needed smarty stuff for the general HTML/page building + $HEADER['CSS'] = CSS; + $HEADER['DEFAULT_ENCODING'] = DEFAULT_ENCODING; + $HEADER['JS'] = JS; + $HEADER['STYLESHEET'] = $EDIT_STYLESHEET; + $HEADER['JAVASCRIPT'] = $EDIT_JAVASCRIPT; + // html title + $HEADER['HTML_TITLE'] = (!$L_TITLE) ? $smarty->l10n->__($G_TITLE) : $smarty->l10n->__($L_TITLE); + + // error msg + if ($error) { + $messages[] = array('msg' => $msg, 'class' => 'error', 'width' => '100%'); + } + $DATA['form_error_msg'] = $messages; + + // all the row data + $options_id = array (); + $options_name = array (); + $options_selected = array (); + if (!is_array($row_data)) { + $row_data = array (); + } + for ($i = 0; $i < count($row_data); $i ++) { + $options_id[] = $i; + $options_name[] = $row_data[$i]["name"]; + // list of points to order + for ($j = 0; $j < count($position); $j++) { + // if matches, put into select array + if ($original_id[$position[$j]] == $row_data[$i]["id"]) { + $options_selected[] = $i; + } + } + } + $DATA['options_id'] = $options_id; + $DATA['options_name'] = $options_name; + $DATA['options_selected'] = $options_selected; + + // hidden list for the data (id, order number) + $row_data_id = array (); + $row_data_order = array (); + for ($i = 0; $i < count($row_data); $i++) { + $row_data_id[] = $row_data[$i]["id"]; + $row_data_order[] = $row_data[$i]["order"]; + } + $DATA['row_data_id'] = $row_data_id; + $DATA['row_data_order'] = $row_data_order; + + // hidden names for the table & where string + $DATA['table_name'] = $table_name; + $DATA['where_string'] = $where_string; + + $EDIT_TEMPLATE = 'edit_order.tpl'; } else { - $DATA['HEADER_COLOR'] = $_SESSION['HEADER_COLOR']; -} -$DATA['USER_NAME'] = $_SESSION["USER_NAME"]; -$DATA['EUID'] = $_SESSION["EUID"]; -$DATA['GROUP_NAME'] = $_SESSION["GROUP_NAME"]; -$DATA['GROUP_LEVEL'] = $_SESSION["GROUP_LEVEL"]; -$PAGES = $_SESSION["PAGES"]; + $form->formProcedureLoad(${$form->archive_pk_name}); + $form->formProcedureNew(); + $form->formProcedureSave(); + $form->formProcedureDelete(); + $form->formProcedureDeleteFromElementList($element_list, $remove_name); -//$form->debug('menu', $form->printAr($PAGES)); + // define all needed smarty stuff for the general HTML/page building + $HEADER['CSS'] = CSS; + $HEADER['DEFAULT_ENCODING'] = DEFAULT_ENCODING; + $HEADER['JS'] = JS; + $HEADER['STYLESHEET'] = $EDIT_STYLESHEET; + $HEADER['JAVASCRIPT'] = $EDIT_JAVASCRIPT; -// build nav from $PAGES ... -if (!is_array($PAGES)) { - $PAGES = array (); -} -for ($i = 0, $i_max = count($PAGES); $i < $i_max; $i ++) { - if ($PAGES[$i]["menu"] && $PAGES[$i]["online"]) { - $menuarray[] = $PAGES[$i]; - } -} + $DATA['table_width'] = $table_width; -// split point for nav points -$COUNT_NAV_POINTS = count($menuarray); -$SPLIT_FACTOR = 3; -$START_SPLIT_COUNT = 3; -// WTF ?? I dunno what I am doing here ... -for ($i = 9; $i < $COUNT_NAV_POINTS; $i += $START_SPLIT_COUNT) { - if ($COUNT_NAV_POINTS > $i) { - $SPLIT_FACTOR += 1; - } -} + // write out error / status messages + $messages[] = $form->formPrintMsg(); + $DATA['form_error_msg'] = $messages; -for ($i = 1; $i <= count($menuarray); $i ++) { - // do that for new array - $j = $i - 1; - $menu_data[$j]['pagename'] = htmlentities($menuarray[($i-1)]["page_name"]); - $menu_data[$j]['filename'] = $menuarray[($i-1)]["filename"].$menuarray[($i-1)]["query_string"]; - if ($i == 1 || !(($i - 1) % $SPLIT_FACTOR)) { - $menu_data[$j]['splitfactor_in'] = 1; - } - if ($menuarray[($i - 1)]["filename"] == $form->getPageName()) { - $position = $i - 1; - $menu_data[$j]['position'] = 1; + // MENU START + // request some session vars + if (!$HEADER_COLOR) { + $DATA['HEADER_COLOR'] = "#E0E2FF"; } else { - // add query stuff - // HAS TO DONE LATER ... set urlencode, etc ... - // check if popup needed - if ($menuarray[($i - 1)]["popup"]) { - $menu_data[$j]['popup'] = 1; - $menu_data[$j]['rand'] = uniqid(rand()); - $menu_data[$j]['width'] = $menuarray[($i-1)]["popup_x"]; - $menu_data[$j]['height'] = $menuarray[($i-1)]["popup_y"]; - } // popup or not - } // highlight or not - if (!($i % $SPLIT_FACTOR) || (($i + 1) > count($menuarray))) { - $menu_data[$j]['splitfactor_out'] = 1; - } // split -} // for -$DATA['menu_data'] = $menu_data; -$DATA['page_name'] = $menuarray[$position]["page_name"]; -$L_TITLE = $DATA['page_name']; -// html title -$HEADER['HTML_TITLE'] = ((!$L_TITLE) ? $form->l->__($G_TITLE) : $form->l->__($L_TITLE)); -// END MENU -// LOAD AND NEW -$DATA['load'] = $form->formCreateLoad(); -$DATA['new'] = $form->formCreateNew(); -// SHOW DATA PART -if ($form->yes) { - $DATA['form_yes'] = $form->yes; - $DATA['form_my_page_name'] = $form->my_page_name; - - // depending on the "getPageName()" I show different stuff - switch ($form->my_page_name) { - case "edit_users": - $elements[] = $form->formCreateElement("login_error_count"); - $elements[] = $form->formCreateElement("login_error_date_last"); - $elements[] = $form->formCreateElement("login_error_date_first"); - $elements[] = $form->formCreateElement("enabled"); - $elements[] = $form->formCreateElement("protected"); - $elements[] = $form->formCreateElement("username"); - $elements[] = $form->formCreateElement("password"); - $elements[] = $form->formCreateElement("password_change_interval"); - $elements[] = $form->formCreateElement("email"); - $elements[] = $form->formCreateElement("last_name"); - $elements[] = $form->formCreateElement("first_name"); - $elements[] = $form->formCreateElement("edit_group_id"); - $elements[] = $form->formCreateElement("edit_access_right_id"); - $elements[] = $form->formCreateElement("strict"); - $elements[] = $form->formCreateElement("locked"); - $elements[] = $form->formCreateElement("admin"); - $elements[] = $form->formCreateElement("debug"); - $elements[] = $form->formCreateElement("db_debug"); - $elements[] = $form->formCreateElement("edit_language_id"); - $elements[] = $form->formCreateElement("edit_scheme_id"); - $elements[] = $form->formCreateElementListTable("edit_access_user"); - break; - case "edit_schemes": - $elements[] = $form->formCreateElement("enabled"); - $elements[] = $form->formCreateElement("name"); - $elements[] = $form->formCreateElement("header_color"); - $elements[] = $form->formCreateElement("template"); - break; - case "edit_pages": - if (!$form->table_array["edit_page_id"]["value"]) { - $q = "DELETE FROM temp_files"; - $form->dbExec($q); - // gets all files in the current dir ending with .php - $crap = exec("ls *.php", $output, $status); - // now get all that are NOT in de DB - $q = "INSERT INTO temp_files VALUES "; - for ($i = 0; $i < count($output); $i ++) { - $t_q = "('".$form->dbEscapeString($output[$i])."')"; - $form->dbExec($q.$t_q, 'NULL'); - } - $elements[] = $form->formCreateElement("filename"); - } else { - // show file menu - // just show name of file ... - $DATA['filename_exist'] = 1; - $DATA['filename'] = $form->table_array["filename"]["value"]; - } // File Name View IF - $elements[] = $form->formCreateElement("name"); - // $elements[] = $form->formCreateElement("tag"); - // $elements[] = $form->formCreateElement("min_acl"); - $elements[] = $form->formCreateElement("order_number"); - $elements[] = $form->formCreateElement("online"); - $elements[] = $form->formCreateElement("menu"); - $elements[] = $form->formCreateElementListTable("edit_query_string"); - $elements[] = $form->formCreateElement("popup"); - $elements[] = $form->formCreateElement("popup_x"); - $elements[] = $form->formCreateElement("popup_y"); - $elements[] = $form->formCreateElementReferenceTable("edit_visible_group"); - $elements[] = $form->formCreateElementReferenceTable("edit_menu_group"); - break; - case "edit_languages": - $elements[] = $form->formCreateElement("enabled"); - $elements[] = $form->formCreateElement("short_name"); - $elements[] = $form->formCreateElement("long_name"); - $elements[] = $form->formCreateElement("iso_name"); - break; - case "edit_groups": - $elements[] = $form->formCreateElement("enabled"); - $elements[] = $form->formCreateElement("name"); - $elements[] = $form->formCreateElement("edit_access_right_id"); - $elements[] = $form->formCreateElement("edit_scheme_id"); - $elements[] = $form->formCreateElementListTable("edit_page_access"); - break; - case "edit_visible_group": - $elements[] = $form->formCreateElement("name"); - $elements[] = $form->formCreateElement("flag"); - break; - case "edit_menu_group": - $elements[] = $form->formCreateElement("name"); - $elements[] = $form->formCreateElement("flag"); - $elements[] = $form->formCreateElement("order_number"); - break; - case "edit_access": - $elements[] = $form->formCreateElement("name"); - $elements[] = $form->formCreateElement("enabled"); - $elements[] = $form->formCreateElement("protected"); - $elements[] = $form->formCreateElement("color"); - $elements[] = $form->formCreateElement("description"); - // add name/value list here - $elements[] = $form->formCreateElementListTable("edit_access_data"); - break; - default: - print "[No valid page definition given]"; - break; + $DATA['HEADER_COLOR'] = $_SESSION['HEADER_COLOR']; } -// $form->debug('edit', "Elements:
".$form->printAr($elements));
-	$DATA['elements'] = $elements;
-	$DATA['hidden'] = $form->formCreateHiddenFields();
-	$DATA['save_delete'] = $form->formCreateSaveDelete();
+	$DATA['USER_NAME'] = $_SESSION["USER_NAME"];
+	$DATA['EUID'] = $_SESSION["EUID"];
+	$DATA['GROUP_NAME'] = $_SESSION["GROUP_NAME"];
+	$DATA['GROUP_LEVEL'] = $_SESSION["GROUP_LEVEL"];
+	$PAGES = $_SESSION["PAGES"];
+
+	//$form->debug('menu', $form->printAr($PAGES));
+
+	// build nav from $PAGES ...
+	if (!is_array($PAGES)) {
+		$PAGES = array ();
+	}
+	for ($i = 0, $i_max = count($PAGES); $i < $i_max; $i ++) {
+		if ($PAGES[$i]["menu"] && $PAGES[$i]["online"]) {
+			$menuarray[] = $PAGES[$i];
+		}
+	}
+
+	// split point for nav points
+	$COUNT_NAV_POINTS = count($menuarray);
+	$SPLIT_FACTOR = 3;
+	$START_SPLIT_COUNT = 3;
+	// WTF ?? I dunno what I am doing here ...
+	for ($i = 9; $i < $COUNT_NAV_POINTS; $i += $START_SPLIT_COUNT) {
+		if ($COUNT_NAV_POINTS > $i) {
+			$SPLIT_FACTOR += 1;
+		}
+	}
+
+	for ($i = 1; $i <= count($menuarray); $i ++) {
+		// do that for new array
+		$j = $i - 1;
+		$menu_data[$j]['pagename'] = htmlentities($menuarray[($i-1)]["page_name"]);
+		$menu_data[$j]['filename'] = $menuarray[($i-1)]["filename"].$menuarray[($i-1)]["query_string"];
+		if ($i == 1 || !(($i - 1) % $SPLIT_FACTOR)) {
+			$menu_data[$j]['splitfactor_in'] = 1;
+		}
+		if ($menuarray[($i - 1)]["filename"] == $form->getPageName()) {
+			$position = $i - 1;
+			$menu_data[$j]['position'] = 1;
+		} else {
+			// add query stuff
+			// HAS TO DONE LATER ... set urlencode, etc ...
+			// check if popup needed
+			if ($menuarray[($i - 1)]["popup"]) {
+				$menu_data[$j]['popup'] = 1;
+				$menu_data[$j]['rand'] = uniqid(rand());
+				$menu_data[$j]['width'] = $menuarray[($i-1)]["popup_x"];
+				$menu_data[$j]['height'] = $menuarray[($i-1)]["popup_y"];
+			} // popup or not
+		} // highlight or not
+		if (!($i % $SPLIT_FACTOR) || (($i + 1) > count($menuarray))) {
+			$menu_data[$j]['splitfactor_out'] = 1;
+		} // split
+	} // for
+	$DATA['menu_data'] = $menu_data;
+	$DATA['page_name'] = $menuarray[$position]["page_name"];
+	$L_TITLE = $DATA['page_name'];
+	// html title
+	$HEADER['HTML_TITLE'] = ((!$L_TITLE) ? $form->l->__($G_TITLE) : $form->l->__($L_TITLE));
+	// END MENU
+	// LOAD AND NEW
+	$DATA['load'] = $form->formCreateLoad();
+	$DATA['new'] = $form->formCreateNew();
+	// SHOW DATA PART
+	if ($form->yes) {
+		$DATA['form_yes'] = $form->yes;
+		$DATA['form_my_page_name'] = $form->my_page_name;
+
+		// depending on the "getPageName()" I show different stuff
+		switch ($form->my_page_name) {
+			case "edit_users":
+				$elements[] = $form->formCreateElement("login_error_count");
+				$elements[] = $form->formCreateElement("login_error_date_last");
+				$elements[] = $form->formCreateElement("login_error_date_first");
+				$elements[] = $form->formCreateElement("enabled");
+				$elements[] = $form->formCreateElement("protected");
+				$elements[] = $form->formCreateElement("username");
+				$elements[] = $form->formCreateElement("password");
+				$elements[] = $form->formCreateElement("password_change_interval");
+				$elements[] = $form->formCreateElement("email");
+				$elements[] = $form->formCreateElement("last_name");
+				$elements[] = $form->formCreateElement("first_name");
+				$elements[] = $form->formCreateElement("edit_group_id");
+				$elements[] = $form->formCreateElement("edit_access_right_id");
+				$elements[] = $form->formCreateElement("strict");
+				$elements[] = $form->formCreateElement("locked");
+				$elements[] = $form->formCreateElement("admin");
+				$elements[] = $form->formCreateElement("debug");
+				$elements[] = $form->formCreateElement("db_debug");
+				$elements[] = $form->formCreateElement("edit_language_id");
+				$elements[] = $form->formCreateElement("edit_scheme_id");
+				$elements[] = $form->formCreateElementListTable("edit_access_user");
+				break;
+			case "edit_schemes":
+				$elements[] = $form->formCreateElement("enabled");
+				$elements[] = $form->formCreateElement("name");
+				$elements[] = $form->formCreateElement("header_color");
+				$elements[] = $form->formCreateElement("template");
+				break;
+			case "edit_pages":
+				if (!$form->table_array["edit_page_id"]["value"]) {
+					$q = "DELETE FROM temp_files";
+					$form->dbExec($q);
+					// gets all files in the current dir ending with .php
+					$crap = exec("ls *.php", $output, $status);
+					// now get all that are NOT in de DB
+					$q = "INSERT INTO temp_files VALUES ";
+					for ($i = 0; $i < count($output); $i ++) {
+						$t_q = "('".$form->dbEscapeString($output[$i])."')";
+						$form->dbExec($q.$t_q, 'NULL');
+					}
+					$elements[] = $form->formCreateElement("filename");
+				} else {
+					// show file menu
+					// just show name of file ...
+					$DATA['filename_exist'] = 1;
+					$DATA['filename'] = $form->table_array["filename"]["value"];
+				} // File Name View IF
+				$elements[] = $form->formCreateElement("name");
+				// $elements[] = $form->formCreateElement("tag");
+				// $elements[] = $form->formCreateElement("min_acl");
+				$elements[] = $form->formCreateElement("order_number");
+				$elements[] = $form->formCreateElement("online");
+				$elements[] = $form->formCreateElement("menu");
+				$elements[] = $form->formCreateElementListTable("edit_query_string");
+				$elements[] = $form->formCreateElement("popup");
+				$elements[] = $form->formCreateElement("popup_x");
+				$elements[] = $form->formCreateElement("popup_y");
+				$elements[] = $form->formCreateElementReferenceTable("edit_visible_group");
+				$elements[] = $form->formCreateElementReferenceTable("edit_menu_group");
+				break;
+			case "edit_languages":
+				$elements[] = $form->formCreateElement("enabled");
+				$elements[] = $form->formCreateElement("short_name");
+				$elements[] = $form->formCreateElement("long_name");
+				$elements[] = $form->formCreateElement("iso_name");
+				break;
+			case "edit_groups":
+				$elements[] = $form->formCreateElement("enabled");
+				$elements[] = $form->formCreateElement("name");
+				$elements[] = $form->formCreateElement("edit_access_right_id");
+				$elements[] = $form->formCreateElement("edit_scheme_id");
+				$elements[] = $form->formCreateElementListTable("edit_page_access");
+				break;
+			case "edit_visible_group":
+				$elements[] = $form->formCreateElement("name");
+				$elements[] = $form->formCreateElement("flag");
+				break;
+			case "edit_menu_group":
+				$elements[] = $form->formCreateElement("name");
+				$elements[] = $form->formCreateElement("flag");
+				$elements[] = $form->formCreateElement("order_number");
+				break;
+			case "edit_access":
+				$elements[] = $form->formCreateElement("name");
+				$elements[] = $form->formCreateElement("enabled");
+				$elements[] = $form->formCreateElement("protected");
+				$elements[] = $form->formCreateElement("color");
+				$elements[] = $form->formCreateElement("description");
+				// add name/value list here
+				$elements[] = $form->formCreateElementListTable("edit_access_data");
+				break;
+			default:
+				print "[No valid page definition given]";
+				break;
+		}
+		// $form->debug('edit', "Elements: 
".$form->printAr($elements));
+		$DATA['elements'] = $elements;
+		$DATA['hidden'] = $form->formCreateHiddenFields();
+		$DATA['save_delete'] = $form->formCreateSaveDelete();
+	}
+	$EDIT_TEMPLATE = 'edit_body.tpl';
 }
 
 // debug data, if DEBUG flag is on, this data is print out
@@ -319,7 +444,7 @@ if (is_dir(BASE.TEMPLATES_C)) {
 if (is_dir(BASE.CACHE)) {
 	$smarty->setCacheDir(BASE.CACHE);
 }
-$smarty->display('edit_body.tpl');
+$smarty->display($EDIT_TEMPLATE, $lang, $lang);
 
 // debug output
 echo $login->printErrorMsg();
diff --git a/www/includes/templates/admin/edit_order.tpl b/www/includes/templates/admin/edit_order.tpl
index a0d453d2..51cbd854 100644
--- a/www/includes/templates/admin/edit_order.tpl
+++ b/www/includes/templates/admin/edit_order.tpl
@@ -23,7 +23,7 @@
 	{/if}
 
 
-
+
{foreach from=$form_error_msg item=element key=key name=loop} {include file="edit_error_msg.tpl"} diff --git a/www/lib/CoreLibs/ACL/Login.inc b/www/lib/CoreLibs/ACL/Login.inc index a49c69db..34f2154b 100644 --- a/www/lib/CoreLibs/ACL/Login.inc +++ b/www/lib/CoreLibs/ACL/Login.inc @@ -114,25 +114,25 @@ class Login extends \CoreLibs\DB\IO // create db connection and init base class if (!parent::__construct($db_config, $debug, $db_debug, $echo, $print)) { - echo "Could not connect to DB
"; + echo 'Could not connect to DB
'; // if I can't connect to the DB to auth exit hard. No access allowed exit; } // no session could be found at all if (!session_id()) { - echo "Session not started!
Use 'session_start();'.
"; - echo "For less problems with other session, you can set a session name with 'session_name(\"name\");'.
"; + echo 'Session not started!
Use \'session_start();\'.
'; + echo 'For less problems with other session, you can set a session name with \'session_name("name");\'.
'; exit; } // pre-check that password min/max lengths are inbetween 1 and 255; if ($this->password_max_length > 255) { - echo "Settings problem PMaL
"; + echo 'Settings problem PMaL
'; exit; } if ($this->password_min_length < 1) { - echo "Settings problem PMiL
"; + echo 'Settings problem PMiL
'; exit; } @@ -212,11 +212,11 @@ class Login extends \CoreLibs\DB\IO $this->lock_deny_users = array ('admin'); // internal - $this->class_info["login"] = array( - "class_name" => "Login", - "class_version" => "5.0.0", - "class_created" => "2000-06-01", - "class_author" => "Clemens Schwaighofer" + $this->class_info['login'] = array( + 'class_name' => 'Login', + 'class_version' => '5.0.0', + 'class_created' => '2000-06-01', + 'class_author' => 'Clemens Schwaighofer' ); // init default ACL list array @@ -378,7 +378,7 @@ class Login extends \CoreLibs\DB\IO // - encrypted password matches // - plain password matches - if (!$res["enabled"]) { + if (!$res['enabled']) { // user is enabled $this->login_error = 104; } elseif ($res['locked']) { @@ -396,25 +396,26 @@ class Login extends \CoreLibs\DB\IO } // normal user processing // set class var and session var - $_SESSION["EUID"] = $this->euid = $res["edit_user_id"]; + $_SESSION['EUID'] = $this->euid = $res['edit_user_id']; // check if user is okay $this->loginCheckPermissions(); if (!$this->login_error) { // now set all session vars and read page permissions - $GLOBALS["DEBUG_ALL"] = $_SESSION["DEBUG_ALL"] = $res["debug"]; - $GLOBALS["DB_DEBUG"] = $_SESSION["DB_DEBUG"] = $res["db_debug"]; - $_SESSION["USER_NAME"] = $res["username"]; - $_SESSION["ADMIN"] = $res["admin"]; - $_SESSION["GROUP_NAME"] = $res["edit_group_name"]; - $_SESSION["USER_ACL_LEVEL"] = $res["user_level"]; - $_SESSION["USER_ACL_TYPE"] = $res["user_type"]; - $_SESSION["GROUP_ACL_LEVEL"] = $res["group_level"]; - $_SESSION["GROUP_ACL_TYPE"] = $res["group_type"]; - $_SESSION["TEMPLATE"] = ($res["template"]) ? $res["template"] : DEFAULT_TEMPLATE; - $_SESSION["HEADER_COLOR"] = ($res["second_header_color"]) ? $res["second_header_color"] : $res["first_header_color"]; - $_SESSION["LANG"] = $res["lang_short"]; - $_SESSION["DEFAULT_CHARSET"] = $res["lang_iso"]; - $_SESSION["DEFAULT_LANG"] = $res["lang_short"].'_'.strtolower(str_replace('-', '', $res["lang_iso"])); + $GLOBALS['DEBUG_ALL'] = $_SESSION['DEBUG_ALL'] = $res['debug']; + $GLOBALS['DB_DEBUG'] = $_SESSION['DB_DEBUG'] = $res['db_debug']; + $_SESSION['USER_NAME'] = $res['username']; + $_SESSION['ADMIN'] = $res['admin']; + $_SESSION['GROUP_NAME'] = $res['edit_group_name']; + $_SESSION['USER_ACL_LEVEL'] = $res['user_level']; + $_SESSION['USER_ACL_TYPE'] = $res['user_type']; + $_SESSION['GROUP_ACL_LEVEL'] = $res['group_level']; + $_SESSION['GROUP_ACL_TYPE'] = $res['group_type']; + // deprecated TEMPLATE setting + $_SESSION['TEMPLATE'] = ($res['template']) ? $res['template'] : ''; + $_SESSION['HEADER_COLOR'] = ($res['second_header_color']) ? $res['second_header_color'] : $res['first_header_color']; + $_SESSION['LANG'] = $res['lang_short']; + $_SESSION['DEFAULT_CHARSET'] = $res['lang_iso']; + $_SESSION['DEFAULT_LANG'] = $res['lang_short'].'_'.strtolower(str_replace('-', '', $res['lang_iso'])); // reset any login error count for this user if ($res['login_error_count'] > 0) { $q = "UPDATE edit_user "; @@ -436,22 +437,22 @@ class Login extends \CoreLibs\DB\IO $edit_page_ids[] = $res['edit_page_id']; // create the array for pages array_push($pages, array ( - "edit_page_id" => $res["edit_page_id"], - "filename" => $res["filename"], - "page_name" => $res["edit_page_name"], - "order" => $res['edit_page_order'], - "menu" => $res["menu"], - "popup" => $res["popup"], - "popup_x" => $res["popup_x"], - "popup_y" => $res["popup_y"], - "online" => $res["online"], - "acl_level" => $res["level"], - "acl_type" => $res["type"], - "query" => array (), - "visible" => array () + 'edit_page_id' => $res['edit_page_id'], + 'filename' => $res['filename'], + 'page_name' => $res['edit_page_name'], + 'order' => $res['edit_page_order'], + 'menu' => $res['menu'], + 'popup' => $res['popup'], + 'popup_x' => $res['popup_x'], + 'popup_y' => $res['popup_y'], + 'online' => $res['online'], + 'acl_level' => $res['level'], + 'acl_type' => $res['type'], + 'query' => array (), + 'visible' => array () )); // make reference filename -> level - $pages_acl[$res["filename"]] = $res["level"]; + $pages_acl[$res['filename']] = $res['level']; } // for each page // get the visible groups for all pages and write them to the pages $_edit_page_id = 0; @@ -478,14 +479,14 @@ class Login extends \CoreLibs\DB\IO $_edit_page_id = $res['edit_page_id']; } $pages[$pos[0]]['query'][] = array ( - "name" => $res['name'], - "value" => $res['value'], - "dynamic" => $res['dynamic'] + 'name' => $res['name'], + 'value' => $res['value'], + 'dynamic' => $res['dynamic'] ); } - $_SESSION["PAGES"] = $pages; - $_SESSION["PAGES_ACL_LEVEL"] = $pages_acl; + $_SESSION['PAGES'] = $pages; + $_SESSION['PAGES_ACL_LEVEL'] = $pages_acl; // load the edit_access user rights $q = "SELECT ea.edit_access_id, level, type, ea.name, ea.color, ea.uid, edit_default "; $q .= "FROM edit_access_user eau, edit_access_right ear, edit_access ea "; @@ -504,25 +505,25 @@ class Login extends \CoreLibs\DB\IO } // build master unit array $unit_access[$res['edit_access_id']] = array ( - "id" => $res['edit_access_id'], - "acl_level" => $res["level"], - "acl_type" => $res["type"], - "name" => $res["name"], - "uid" => $res['uid'], - "color" => $res["color"], - "default" => $res["edit_default"], + 'id' => $res['edit_access_id'], + 'acl_level' => $res['level'], + 'acl_type' => $res['type'], + 'name' => $res['name'], + 'uid' => $res['uid'], + 'color' => $res['color'], + 'default' => $res['edit_default'], 'data' => $ea_data ); // set the default unit if ($res['edit_default']) { - $_SESSION["UNIT_DEFAULT"] = $res['edit_access_id']; + $_SESSION['UNIT_DEFAULT'] = $res['edit_access_id']; } // sub arrays for simple access array_push($eauid, $res['edit_access_id']); $unit_acl[$res['edit_access_id']] = $res['level']; } - $_SESSION["UNIT"] = $unit_access; - $_SESSION["UNIT_ACL_LEVEL"] = $unit_acl; + $_SESSION['UNIT'] = $unit_access; + $_SESSION['UNIT_ACL_LEVEL'] = $unit_acl; $_SESSION['EAID'] = $eauid; } // user has permission to THIS page } // user was not enabled or other login error @@ -571,7 +572,7 @@ class Login extends \CoreLibs\DB\IO // unset mem limit if debug is set to 1 // if (($GLOBALS["DEBUG_ALL"] || $GLOBALS["DB_DEBUG"] || $_SESSION["DEBUG_ALL"] || $_SESSION["DB_DEBUG"]) && ini_get('memory_limit') != -1) // ini_set('memory_limit', -1); - if ($res["filename"] == $this->page_name) { + if ($res['filename'] == $this->page_name) { $this->permission_okay = 1; } else { $this->login_error = 103; @@ -591,20 +592,20 @@ class Login extends \CoreLibs\DB\IO { if ($this->logout || $this->login_error) { // unregister and destroy session vars - unset($_SESSION["EUID"]); - unset($_SESSION["GROUP_LEVEL"]); - unset($_SESSION["PAGES"]); - unset($_SESSION["USER_NAME"]); - unset($_SESSION["UNIT"]); - unset($_SESSION["DEBUG_ALL"]); - unset($_SESSION["DB_DEBUG"]); - unset($GLOBALS["DEBUG_ALL"]); - unset($GLOBALS["DB_DEBUG"]); - unset($_SESSION["LANG"]); - unset($_SESSION["DEFAULT_CHARSET"]); - unset($_SESSION["DEFAULT_LANG"]); - unset($_SESSION["GROUP_NAME"]); - unset($_SESSION["HEADER_COLOR"]); + unset($_SESSION['EUID']); + unset($_SESSION['GROUP_LEVEL']); + unset($_SESSION['PAGES']); + unset($_SESSION['USER_NAME']); + unset($_SESSION['UNIT']); + unset($_SESSION['DEBUG_ALL']); + unset($_SESSION['DB_DEBUG']); + unset($GLOBALS['DEBUG_ALL']); + unset($GLOBALS['DB_DEBUG']); + unset($_SESSION['LANG']); + unset($_SESSION['DEFAULT_CHARSET']); + unset($_SESSION['DEFAULT_LANG']); + unset($_SESSION['GROUP_NAME']); + unset($_SESSION['HEADER_COLOR']); session_destroy(); // then prints the login screen again $this->permission_okay = 0; @@ -939,11 +940,11 @@ class Login extends \CoreLibs\DB\IO $password = ''; // set event if ($this->login) { - $event = "Login"; + $event = 'Login'; } elseif ($this->logout) { - $event = "Logout"; + $event = 'Logout'; } else { - $event = "No Permission"; + $event = 'No Permission'; } // prepare for log if ($this->euid) { diff --git a/www/lib/CoreLibs/DB/Extended/ArrayIO.inc b/www/lib/CoreLibs/DB/Extended/ArrayIO.inc index 3c64c4cf..f70abbb1 100644 --- a/www/lib/CoreLibs/DB/Extended/ArrayIO.inc +++ b/www/lib/CoreLibs/DB/Extended/ArrayIO.inc @@ -60,26 +60,26 @@ class ArrayIO extends \CoreLibs\DB\IO // instance db_io class parent::__construct($db_config, $debug, $db_debug, $echo, $print); // more error vars for this class - $this->error_string["21"] = "No Primary Key given"; - $this->error_string["22"] = "Could not run Array Query"; + $this->error_string['21'] = 'No Primary Key given'; + $this->error_string['22'] = 'Could not run Array Query'; $this->table_array = $table_array; $this->table_name = $table_name; // set primary key for given table_array - if ($this->table_array) { - foreach ($table_array as $key => $value) { - if ($value["pk"]) { + if (is_array($this->table_array)) { + foreach ($this->table_array as $key => $value) { + if ($value['pk']) { $this->pk_name = $key; } } } // set pk_name IF table_array was given // internal - $this->class_info["db_array_io"] = array( - "class_name" => "DB Array IO", - "class_version" => "1.0.0", - "class_created" => "2002/12/17", - "class_author" => "Clemens Schwaighofer" + $this->class_info['db_array_io'] = array( + 'class_name' => 'DB Array IO', + 'class_version' => '1.0.0', + 'class_created' => '2002/12/17', + 'class_author' => 'Clemens Schwaighofer' ); } @@ -135,7 +135,7 @@ class ArrayIO extends \CoreLibs\DB\IO reset($this->table_array); $string = ''; foreach ($this->table_array as $column => $data_array) { - $string .= "".$column." -> ".$data_array["value"]."
"; + $string .= ''.$column.' -> '.$data_array['value'].'
'; } // add output to internal error_msg if ($write) { @@ -153,10 +153,10 @@ class ArrayIO extends \CoreLibs\DB\IO { // if pk_id is set, overrule ... if ($this->pk_id) { - $this->table_array[$this->pk_name]["value"] = $this->pk_id; + $this->table_array[$this->pk_name]['value'] = $this->pk_id; } // if not set ... produce error - if (!$this->table_array[$this->pk_name]["value"]) { + if (!$this->table_array[$this->pk_name]['value']) { // if no PK found, error ... $this->error_id = 21; $this->__dbError(); @@ -175,10 +175,10 @@ class ArrayIO extends \CoreLibs\DB\IO { reset($this->table_array); foreach ($this->table_array as $column => $data_array) { - if (!$this->table_array[$column]["pk"]) { - unset($this->table_array[$column]["value"]); + if (!$this->table_array[$column]['pk']) { + unset($this->table_array[$column]['value']); } elseif ($reset_pk) { - unset($this->table_array[$column]["value"]); + unset($this->table_array[$column]['value']); } } } @@ -197,37 +197,37 @@ class ArrayIO extends \CoreLibs\DB\IO return $this->table_array; } // delete query - $q = "DELETE FROM ".$this->table_name." WHERE "; - $q .= $this->pk_name." = ".$this->table_array[$this->pk_name]["value"]." "; + $q = 'DELETE FROM '.$this->table_name.' WHERE '; + $q .= $this->pk_name.' = '.$this->table_array[$this->pk_name]['value'].' '; // delete files and build FK query reset($this->table_array); $q_where = ''; foreach ($this->table_array as $column => $data_array) { // suchen nach bildern und lschen ... - if ($this->table_array[$column]["file"] && file_exists($this->table_array[$column]["url"].$this->table_array[$column]["value"])) { - if (file_exists($this->table_array[$column]["path"].$this->table_array[$column]["value"])) { - unlink($this->table_array[$column]["path"].$this->table_array[$column]["value"]); + if ($this->table_array[$column]['file'] && file_exists($this->table_array[$column]['url'].$this->table_array[$column]['value'])) { + if (file_exists($this->table_array[$column]['path'].$this->table_array[$column]['value'])) { + unlink($this->table_array[$column]['path'].$this->table_array[$column]['value']); } - $file_name = str_replace("_tn", "", $this->table_array[$column]["value"]); - if (file_exists($this->table_array[$column]["path"].$file_name)) { - unlink($this->table_array[$column]["path"].$file_name); + $file_name = str_replace('_tn', '', $this->table_array[$column]['value']); + if (file_exists($this->table_array[$column]['path'].$file_name)) { + unlink($this->table_array[$column]['path'].$file_name); } } // if we have a foreign key - if ($this->table_array[$column]["fk"]) { + if ($this->table_array[$column]['fk']) { // create FK constraint checks if ($q_where) { - $q_where .= " AND "; + $q_where .= ' AND '; } - $q_where .= $column." = ".$this->table_array[$column]["value"]; + $q_where .= $column.' = '.$this->table_array[$column]['value']; } // allgemeines zurcksetzen des arrays - unset($this->table_array[$column]["value"]); + unset($this->table_array[$column]['value']); } // attach fk row if there ... if ($q_where) { - $q .= " AND ".$q_where; + $q .= ' AND '.$q_where; } // if 0, error unset($this->pk_id); @@ -258,25 +258,25 @@ class ArrayIO extends \CoreLibs\DB\IO // create select part & addition FK part foreach ($this->table_array as $column => $data_array) { if ($q_select) { - $q_select .= ", "; + $q_select .= ', '; } $q_select .= $column; // check FK ... - if ($this->table_array[$column]["fk"] && $this->table_array[$column]["value"]) { + if ($this->table_array[$column]['fk'] && $this->table_array[$column]['value']) { if ($q_where) { - $q_where .= " AND "; + $q_where .= ' AND '; } - $q_where .= $column .= " = ".$this->table_array[$column]["value"]; + $q_where .= $column .= ' = '.$this->table_array[$column]['value']; } } - $q = "SELECT "; + $q = 'SELECT '; $q .= $q_select; - $q .= " FROM ".$this->table_name." WHERE "; - $q .= $this->pk_name." = ".$this->table_array[$this->pk_name]["value"]." "; + $q .= ' FROM '.$this->table_name.' WHERE '; + $q .= $this->pk_name.' = '.$this->table_array[$this->pk_name]['value'].' '; if ($q_where) { - $q .= " AND ".$q_where; + $q .= ' AND '.$q_where; } // if query was executed okay, else set error @@ -286,21 +286,21 @@ class ArrayIO extends \CoreLibs\DB\IO foreach ($this->table_array as $column => $data_array) { // wenn "edit" dann gib daten wie in DB zurck, ansonten aufbereiten fr ausgabe // ?? sollte das nicht drauen ??? man weis ja net was da drin steht --> is noch zu berlegen - // echo "EDIT: $edit | Spalte: $column | type: ".$this->table_array[$column]["type"]." | Res: ".$res[$column]."
"; + // echo 'EDIT: $edit | Spalte: $column | type: '.$this->table_array[$column]['type'].' | Res: '.$res[$column].'
'; if ($edit) { - $this->table_array[$column]["value"] = $res[$column]; + $this->table_array[$column]['value'] = $res[$column]; // if password, also write to hidden - if ($this->table_array[$column]["type"] == "password") { - $this->table_array[$column]["HIDDEN_value"] = $res[$column]; + if ($this->table_array[$column]['type'] == 'password') { + $this->table_array[$column]['HIDDEN_value'] = $res[$column]; } } else { - $this->table_array[$column]["value"] = $this->convertData(nl2br($res[$column])); + $this->table_array[$column]['value'] = $this->convertData(nl2br($res[$column])); // had to put out the htmlentities from the line above as it breaks japanese characters } } } // possible dbFetchArray errors ... - $this->pk_id = $this->table_array[$this->pk_name]["value"]; + $this->pk_id = $this->table_array[$this->pk_name]['value']; } else { $this->error_id = 22; $this->__dbError(); @@ -323,7 +323,7 @@ class ArrayIO extends \CoreLibs\DB\IO // $this->table_array[$this->pk_name]["value"]=$this->pk_id; // } // checken ob PKs gesetzt, wenn alle -> update, wenn keiner -> insert, wenn ein paar -> ERROR! - if (!$this->table_array[$this->pk_name]["value"]) { + if (!$this->table_array[$this->pk_name]['value']) { $insert = 1; } else { $insert = 0; @@ -336,47 +336,47 @@ class ArrayIO extends \CoreLibs\DB\IO foreach ($this->table_array as $column => $data_array) { /********************************* START FILE *************************************/ // file upload - if ($this->table_array[$column]["file"]) { + if ($this->table_array[$column]['file']) { // falls was im tmp drinnen, sprich ein upload, datei kopieren, Dateinamen in db schreiben // falls datei schon am server (physischer pfad), dann einfach url in db schreiben (update) - // falls in "delete" "ja" dann loeschen (und gibts eh nur beim update) - if ($this->table_array[$column]["delete"]) { - unset($this->table_array[$column]["delete"]); - if (file_exists($this->table_array[$column]["path"].$this->table_array[$column]["value"])) { - unlink($this->table_array[$column]["path"].$this->table_array[$column]["value"]); + // falls in 'delete' 'ja' dann loeschen (und gibts eh nur beim update) + if ($this->table_array[$column]['delete']) { + unset($this->table_array[$column]['delete']); + if (file_exists($this->table_array[$column]['path'].$this->table_array[$column]['value'])) { + unlink($this->table_array[$column]['path'].$this->table_array[$column]['value']); } - $file_name = str_replace("_tn", "", $this->table_array[$column]["value"]); - if (file_exists($this->table_array[$column]["path"].$file_name)) { - unlink($this->table_array[$column]["path"].$file_name); + $file_name = str_replace('_tn', '', $this->table_array[$column]['value']); + if (file_exists($this->table_array[$column]['path'].$file_name)) { + unlink($this->table_array[$column]['path'].$file_name); } - $this->table_array[$column]["value"] = ""; + $this->table_array[$column]['value'] = ''; } else { - if ($this->table_array[$column]["tmp"] != "none" && $this->table_array[$column]["tmp"]) { + if ($this->table_array[$column]['tmp'] != 'none' && $this->table_array[$column]['tmp']) { // Dateiname zusammenbasteln: org-name + _pkid liste + .ext - list($name, $ext) = explode(".", $this->table_array[$column]["dn"]); + list($name, $ext) = explode('.', $this->table_array[$column]['dn']); // mozilla, patch - $fn_name = explode("/", $this->table_array[$column]["dn"]); - $this->table_array[$column]["dn"] = $fn_name[count($fn_name)-1]; - $filename_parts = explode(".", $this->table_array[$column]["dn"]); + $fn_name = explode('/', $this->table_array[$column]['dn']); + $this->table_array[$column]['dn'] = $fn_name[count($fn_name)-1]; + $filename_parts = explode('.', $this->table_array[$column]['dn']); $ext = end($filename_parts); array_splice($filename_parts, -1, 1); - $name = str_replace(" ", "_", implode(".", $filename_parts)); - $file_name = $name.".".$ext; - //echo "Dn: $file_name"; - copy($this->table_array[$column]["tmp"], $this->table_array[$column]["path"].$file_name); + $name = str_replace(' ', '_', implode('.', $filename_parts)); + $file_name = $name.'.'.$ext; + //echo 'Dn: $file_name'; + copy($this->table_array[$column]['tmp'], $this->table_array[$column]['path'].$file_name); // automatisch thumbnail generieren, geht nur mit convert (ImageMagic!!!), aber nur bei bild .. - if (strtolower($ext) == "jpeg" || strtolower($ext) == "jpg" || strtolower($ext) == "gif" || strtolower($ext) == "png") { - $file_name_tn = $name."_tn.".$ext; - $eingang = $this->table_array[$column]["path"].$file_name; - $ausgang = $this->table_array[$column]["path"].$file_name_tn; - $com = "convert -geometry 115 $eingang $ausgang"; + if (strtolower($ext) == 'jpeg' || strtolower($ext) == 'jpg' || strtolower($ext) == 'gif' || strtolower($ext) == 'png') { + $file_name_tn = $name.'_tn.'.$ext; + $input = $this->table_array[$column]['path'].$file_name; + $output = $this->table_array[$column]['path'].$file_name_tn; + $com = 'convert -geometry 115 '.$input.' '.$output; exec($com); - $this->table_array[$column]["value"] = $file_name_tn; + $this->table_array[$column]['value'] = $file_name_tn; } else { - $this->table_array[$column]["value"] = $file_name; + $this->table_array[$column]['value'] = $file_name; } - } elseif (file_exists($this->table_array[$column]["path"].$this->table_array[$column]["value"])) { + } elseif (file_exists($this->table_array[$column]['path'].$this->table_array[$column]['value'])) { // mach gar nix, wenn bild schon da ??? } } // delete or upload @@ -384,43 +384,43 @@ class ArrayIO extends \CoreLibs\DB\IO /********************************* END FILE **************************************/ // do not write 'pk' (primary key) or 'view' values - if (!$this->table_array[$column]["pk"] && $this->table_array[$column]['type'] != 'view' && strlen($column) > 0) { + if (!$this->table_array[$column]['pk'] && $this->table_array[$column]['type'] != 'view' && strlen($column) > 0) { // for password use hidden value if main is not set - if ($this->table_array[$column]["type"] == "password" && !$this->table_array[$column]["value"]) { - $this->table_array[$column]["value"] = $this->table_array[$column]["HIDDEN_value"]; + if ($this->table_array[$column]['type'] == 'password' && !$this->table_array[$column]['value']) { + $this->table_array[$column]['value'] = $this->table_array[$column]['HIDDEN_value']; } if (!$insert) { if (strlen($q_data)) { - $q_data .= ", "; + $q_data .= ', '; } - $q_data .= $column." = "; + $q_data .= $column.' = '; } else { // this is insert if (strlen($q_data)) { - $q_data .= ", "; + $q_data .= ', '; } if ($q_vars) { - $q_vars .= ", "; + $q_vars .= ', '; } $q_vars .= $column; } // integer is different - if ($this->table_array[$column]["int"] || $this->table_array[$column]["int_null"]) { - $this->debug('write_check', "[$column][".$this->table_array[$column]["value"]."] Foo: ".isset($this->table_array[$column]["value"])." | ".$this->table_array[$column]["int_null"]); - if (!$this->table_array[$column]["value"] && $this->table_array[$column]["int_null"]) { + if ($this->table_array[$column]['int'] || $this->table_array[$column]['int_null']) { + $this->debug('write_check', '[$column]['.$this->table_array[$column]['value'].'] Foo: '.isset($this->table_array[$column]['value']).' | '.$this->table_array[$column]['int_null']); + if (!$this->table_array[$column]['value'] && $this->table_array[$column]['int_null']) { $_value = 'NULL'; - } elseif (!isset($this->table_array[$column]["value"])) { + } elseif (!isset($this->table_array[$column]['value'])) { $_value = 0; } else { - $_value = $this->table_array[$column]["value"]; + $_value = $this->table_array[$column]['value']; } $q_data .= $_value; } elseif ($this->table_array[$column]['bool']) { // boolean storeage (reverse check on ifset) - $q_data .= "'".$this->dbBoolean($this->table_array[$column]["value"], true)."'"; + $q_data .= "'".$this->dbBoolean($this->table_array[$column]['value'], true)."'"; } elseif ($this->table_array[$column]["interval"]) { // for interval we check if no value, then we set null - if (!$this->table_array[$column]["value"]) { + if (!$this->table_array[$column]['value']) { $_value = 'NULL'; } $q_data .= $_value; @@ -429,9 +429,9 @@ class ArrayIO extends \CoreLibs\DB\IO $q_data .= "'"; // if add slashes do convert & add slashes else write AS is if ($addslashes) { - $q_data .= $this->dbEscapeString($this->convertEntities($this->table_array[$column]["value"])); + $q_data .= $this->dbEscapeString($this->convertEntities($this->table_array[$column]['value'])); } else { - $q_data .= $this->dbEscapeString($this->table_array[$column]["value"]); + $q_data .= $this->dbEscapeString($this->table_array[$column]['value']); } $q_data .= "'"; } @@ -444,39 +444,39 @@ class ArrayIO extends \CoreLibs\DB\IO // create select part & addition FK part foreach ($this->table_array as $column => $data_array) { // check FK ... - if ($this->table_array[$column]["fk"] && $this->table_array[$column]["value"]) { + if ($this->table_array[$column]['fk'] && $this->table_array[$column]['value']) { if ($q_where) { - $q_where .= " AND "; + $q_where .= ' AND '; } - $q_where .= $column .= " = ".$this->table_array[$column]["value"]; + $q_where .= $column .= ' = '.$this->table_array[$column]['value']; } } // if no PK set, then get max ID from DB if (!$this->table_array[$this->pk_name]["value"]) { // max id, falls INSERT - $q = "SELECT MAX(".$this->pk_name.") + 1 AS pk_id FROM ".$this->table_name; + $q = 'SELECT MAX('.$this->pk_name.') + 1 AS pk_id FROM '.$this->table_name; $res = $this->dbReturnRow($q); - if (!$res["pk_id"]) { - $res["pk_id"] = 1; + if (!$res['pk_id']) { + $res['pk_id'] = 1; } - $this->table_array[$this->pk_name]["value"] = $res["pk_id"]; + $this->table_array[$this->pk_name]['value'] = $res['pk_id']; } if (!$insert) { - $q = "UPDATE ".$this->table_name." SET "; + $q = 'UPDATE '.$this->table_name.' SET '; $q .= $q_data; - $q .= " WHERE "; - $q .= $this->pk_name." = ".$this->table_array[$this->pk_name]["value"]." "; + $q .= ' WHERE '; + $q .= $this->pk_name.' = '.$this->table_array[$this->pk_name]['value'].' '; if ($q_where) { - $q .= " AND ".$q_where; + $q .= ' AND '.$q_where; } // set pk_id ... if it has changed or so - $this->pk_id = $this->table_array[$this->pk_name]["value"]; + $this->pk_id = $this->table_array[$this->pk_name]['value']; } else { - $q = "INSERT INTO ".$this->table_name." "; - $q .= "(".$q_vars.") "; - $q .= "VALUES (".$q_data.")"; + $q = 'INSERT INTO '.$this->table_name.' '; + $q .= '('.$q_vars.') '; + $q .= 'VALUES ('.$q_data.')'; // write primary key too // if ($q_data) // $q .= ", "; @@ -490,7 +490,7 @@ class ArrayIO extends \CoreLibs\DB\IO } // set primary key if ($insert) { - $this->table_array[$this->pk_name]["value"] = $this->insert_id; + $this->table_array[$this->pk_name]['value'] = $this->insert_id; $this->ok = $this->insert_id; } // return the table if needed diff --git a/www/lib/CoreLibs/Output/Form/Generate.inc b/www/lib/CoreLibs/Output/Form/Generate.inc index 481fab36..2f113726 100644 --- a/www/lib/CoreLibs/Output/Form/Generate.inc +++ b/www/lib/CoreLibs/Output/Form/Generate.inc @@ -16,73 +16,73 @@ * description of the variables && arrays that have to be set ... * $name_u_choose=array( * # this is the description of ALL fields in the main table -* "table_array" => array( -* "name_of_col_in_table" => array( -* "value" => $name_of_col_in_table", -* "pk" => 1/0 - sets the primary key (only one) -* "fk" => 1/0 - sets the foreign key (do not use at the moment ... buggy ;) -* "mandatory" => 1/0 - triggers * in output, but nor error check -* "output_name" => "text" - text put as label for the element -* "type" => "view/text/textarea/date/drop_down_db/drop_down_array/drop_down_db_input/drop_down_db_same_db/radio_array/binary/hidden/file/password" +* 'table_array' => array( +* 'name_of_col_in_table' => array( +* 'value' => $name_of_col_in_table', +* 'pk' => 1/0 - sets the primary key (only one) +* 'fk' => 1/0 - sets the foreign key (do not use at the moment ... buggy ;) +* 'mandatory' => 1/0 - triggers * in output, but nor error check +* 'output_name' => 'text' - text put as label for the element +* 'type' => 'view/text/textarea/date/drop_down_db/drop_down_array/drop_down_db_input/drop_down_db_same_db/radio_array/binary/hidden/file/password' * View is special, it just prints out the data as is, will not be saved * 1) more will come -* 2) keep in mind that binary will not be checked, as it is always set to a value (default is "no") +* 2) keep in mind that binary will not be checked, as it is always set to a value (default is 'no') * ---- the next four fields are only NECESSARY (!!!) for drop_down_db_input -* "table_name" => the name of the table for the drop down -* "pk_name" => the pk_name of the table for the drop down -* "input_name" => the text field name in the table for the drop down -* "input_value" => the $name of input_name (must be same) -* "order_by" => "order bY" string for drop_down_db(_input) if no query given but fields set -* "query" => for drop_down_db/array if no outer query given -* "preset" => value to preset when array is unset (available for all types) -* "element_list" => array ( "true", "false") - MUST (!) be set for binary -* "length" => "nr" - only available for "text" (maxlength) -* "size" => "nr" - only available for "text" (size of input field) -* "rows" => "nr" - only available for "textarea" -* "cols" => "nr" - only available for "textarea" -* "error_check" => "custom/email/date/number/unique" - 1) more will come -* "error_regex" => "regex" - if error_check is custom regex here -* "error_example" => "text" - example input text for error_check (only custom right now) -* "empty" => "value/text" - ONLY for view. If no data found, set this value +* 'table_name' => the name of the table for the drop down +* 'pk_name' => the pk_name of the table for the drop down +* 'input_name' => the text field name in the table for the drop down +* 'input_value' => the $name of input_name (must be same) +* 'order_by' => 'order bY' string for drop_down_db(_input) if no query given but fields set +* 'query' => for drop_down_db/array if no outer query given +* 'preset' => value to preset when array is unset (available for all types) +* 'element_list' => array ( 'true', 'false') - MUST (!) be set for binary +* 'length' => 'nr' - only available for 'text' (maxlength) +* 'size' => 'nr' - only available for 'text' (size of input field) +* 'rows' => 'nr' - only available for 'textarea' +* 'cols' => 'nr' - only available for 'textarea' +* 'error_check' => 'custom/email/date/number/unique' - 1) more will come +* 'error_regex' => 'regex' - if error_check is custom regex here +* 'error_example' => 'text' - example input text for error_check (only custom right now) +* 'empty' => 'value/text' - ONLY for view. If no data found, set this value * --- file: -* "save_dir" => "directory where it should be saved to -* "accept_type" => "mime types accepted (mime/text,mime/jpeg ... etc)" +* 'save_dir' => 'directory where it should be saved to +* 'accept_type' => 'mime types accepted (mime/text,mime/jpeg ... etc)' * ), * ... * ), * # all reference tables (n<->n) -* "reference_array" => array( -* "name_u_choose" => array( -* "table_name" => "table_u_choose_for_n_to_n_table", -* "other_table_pk" => "primary_key_name_of_reference_table", -* "output_name" => "Printed out next to multiple select field", -* "mandatory" => 1/0 for must be selected, -* "select_size" => size of multiple select field, -* "query" => "the query to load the multiple select field -* (select id, concat_ws(" ",name_a, name_b) from reference_table)", -* "selected" => $var_name for name="xx" in multiple select +* 'reference_array' => array( +* 'name_u_choose' => array( +* 'table_name' => 'table_u_choose_for_n_to_n_table', +* 'other_table_pk' => 'primary_key_name_of_reference_table', +* 'output_name' => 'Printed out next to multiple select field', +* 'mandatory' => 1/0 for must be selected, +* 'select_size' => size of multiple select field, +* 'query' => 'the query to load the multiple select field +* (select id, concat_ws(' ',name_a, name_b) from reference_table)', +* 'selected' => $var_name for name='xx' in multiple select * ), * ... * ), * # fields that should be shown from the load_query and with what aditions -* "show_fields" => array( +* 'show_fields' => array( * array( -* "name" => "name_of_col_in_query" - col from the query that should be shown -* "before_value" => "text" - if set this text will be put in FRONT of the value from the col -* "binary" => array ("true","false") - for 1/0 fields in DB changes it int human readable format +* 'name' => 'name_of_col_in_query' - col from the query that should be shown +* 'before_value' => 'text' - if set this text will be put in FRONT of the value from the col +* 'binary' => array ('true','false') - for 1/0 fields in DB changes it int human readable format * ), * ... * ), * # the laod query -* "load_query" => "query", - query for generting the list in "load" function +* 'load_query' => 'query', - query for generting the list in 'load' function * # the name of the main table -* "table_name" => "table_name" - the exakt name of the table ... +* 'table_name' => 'table_name' - the exakt name of the table ... * # security levels for load ... usefull is delete with a low number and load with a high -* "security_level" => -* "load" => ... for load to appear -* "new" => 1... - security level minimum required for new part to appear (goes in hadn with save) -* "save" => ... - should be same level as new [or its a bit useless] -* "delete" => ... - for delete +* 'security_level' => +* 'load' => ... for load to appear +* 'new' => 1... - security level minimum required for new part to appear (goes in hadn with save) +* 'save' => ... - should be same level as new [or its a bit useless] +* 'delete' => ... - for delete * * example for a page: * @@ -95,7 +95,7 @@ * $form->form_create_new(); * if ($form->yes) * { -* $from->form_create_element("element_name"); +* $from->form_create_element('element_name'); * $from->form_create_hidden_fields(); * $form->form_creae_save_delete(); * } @@ -123,7 +123,7 @@ * returns the HTML part for creating a new table_row * form_create_save_delete () [form_delete_save()] * returns the HTML part for saveing and deleteing one table_row -* form_create_element ($element_name, $query="") +* form_create_element ($element_name, $query='') * creates and HTML element based on the description in the table_array array, second parameter is for drop_down fields, either a query for _db or an array for _array * form_error_check() * checks on errors after submit based on the settings in the table_array array @@ -132,7 +132,7 @@ * form_unset_table_array() * unsets the table_array value fields for new entries * form_create_hidden_fields($hidden_array) -* outputs a string with the HTML hidden fields (array must be $name["hidden_name"]=$hidden_value) +* outputs a string with the HTML hidden fields (array must be $name['hidden_name']=$hidden_value) * form_create_element_reference_table($table_name) [form_show_reference_table()] * creates and table tr part for the reference table name given * form_load_table_array($pk_id=0) @@ -159,17 +159,17 @@ * 2005/03/31 (cs) fixed the class call with all debug vars * 2004/11/10 (cs) fix bug with preset: don't check if set, check if variable is set at all * 2004/09/30 (cs) layout change -* 2003-06-13: error with "protected" flag, fixed and added error msg, if protected flag is detected during +* 2003-06-13: error with 'protected' flag, fixed and added error msg, if protected flag is detected during * delete * 2003-06-12: adapted class to register_global_vars off -* 2003-06-10: in procedure_delete function I added "protected" variable clause, so if this field exists +* 2003-06-10: in procedure_delete function I added 'protected' variable clause, so if this field exists * in the DB and is set, you are not able to delete [at the moment used for admin edit user * in DB] * 2003-05-30: _temp for drop_down_db was added always and not only for same_db * 2003-05-28: added drop_down_db_same_db for drop down/input combinations going into the same DB. * WARNING!!! please be careful that input_value var name MUST have the ending _temp * This might get change in future -* added a "where" field to the field list, this is only used for the drop_down for selecting +* added a 'where' field to the field list, this is only used for the drop_down for selecting * only a certain field list. If where is filled out and used in combination with insert (not same_db) * then this key will be SET when inserted into the DB !!! * 2003-04-09: added open_dir for download of file (URL), save_dir is only for upload (absolute path) @@ -245,7 +245,7 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO // METHOD: constructor // PARAMS: $db_config -> connect to DB - // $lang -> language code ("en", "ja", etc) + // $lang -> language code ('en', 'ja', etc) // $table_width -> width of table // $db_debug -> turns db_io debug on/off (DB_DEBUG as global var does the same) public function __construct($db_config, $lang, $table_width = 750, $debug = 0, $db_debug = 0, $echo = 1, $print = 0) @@ -258,29 +258,44 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO // WARNING: auto spl load does not work with this as it is an array and not a function/object // check if this is the old path or the new path if (is_dir(TABLE_ARRAYS)) { - include(TABLE_ARRAYS."array_".$this->my_page_name.".inc"); + if (is_file(TABLE_ARRAYS.'array_'.$this->my_page_name.'.inc')) { + include(TABLE_ARRAYS.'array_'.$this->my_page_name.'.inc'); + } } else { - include(BASE.INCLUDES.TABLE_ARRAYS.'array_'.$this->my_page_name.'.inc'); + if (is_file(BASE.INCLUDES.TABLE_ARRAYS.'array_'.$this->my_page_name.'.inc')) { + include(BASE.INCLUDES.TABLE_ARRAYS.'array_'.$this->my_page_name.'.inc'); + } + } + if (is_array(${$this->my_page_name})) { + $config_array = ${$this->my_page_name}; + } else { + // dummy created + $config_array = array ( + 'table_array' => array (), + 'table_name' => '', + ); } - $config_array = ${$this->my_page_name}; // start the array_io class which will start db_io ... - parent::__construct($db_config, $config_array["table_array"], $config_array["table_name"], $debug, $db_debug, $echo, $print); + parent::__construct($db_config, $config_array['table_array'], $config_array['table_name'], $debug, $db_debug, $echo, $print); // here should be a check if the config_array is correct ... - // - $this->field_array = $config_array["show_fields"]; - $this->load_query = $config_array["load_query"]; - $this->archive_pk_name = "a_".$this->pk_name; - $this->col_name = str_replace("_id", "", $this->pk_name); + 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'])) { + $this->load_query = $config_array['load_query']; + } + $this->archive_pk_name = 'a_'.$this->pk_name; + $this->col_name = str_replace('_id', '', $this->pk_name); $this->int_pk_name = $this->pk_name; // check if reference_arrays are given and proceed them - if (is_array($config_array["reference_arrays"])) { - foreach ($config_array["reference_arrays"] as $key => $value) { + if (isset($config_array['reference_arrays']) && is_array($config_array['reference_arrays'])) { + foreach ($config_array['reference_arrays'] as $key => $value) { $this->reference_array[$key] = $value; } } - if (is_array($config_array["element_list"])) { - foreach ($config_array["element_list"] as $key => $value) { + if (isset($config_array['element_list']) && is_array($config_array['element_list'])) { + foreach ($config_array['element_list'] as $key => $value) { $this->element_list[$key] = $value; } } @@ -289,30 +304,30 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO $this->table_width = $table_width; // set button vars - $this->archive = $_POST["archive"]; - $this->new = $_POST["new"]; - $this->really_new = $_POST["really_new"]; - $this->delete = $_POST["delete"]; - $this->really_delete = $_POST["really_delete"]; - $this->save = $_POST["save"]; - $this->remove_button = $_POST["remove_button"]; + $this->archive = $_POST['archive']; + $this->new = $_POST['new']; + $this->really_new = $_POST['really_new']; + $this->delete = $_POST['delete']; + $this->really_delete = $_POST['really_delete']; + $this->save = $_POST['save']; + $this->remove_button = $_POST['remove_button']; // security settings - $this->group_level_user = $_SESSION["GROUP_LEVEL"]; + $this->group_level_user = $_SESSION['GROUP_LEVEL']; // 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) { - $config_array["security_level"] = array("load" => 100, "new" => 100, "save" => 100, "delete" => 100); + if (!is_array($config_array['security_level']) || count($config_array['security_level']) < 4) { + $config_array['security_level'] = array('load' => 100, 'new' => 100, 'save' => 100, 'delete' => 100); } // write array to class var - $this->security_level = $config_array["security_level"]; + $this->security_level = $config_array['security_level']; // internal - $this->class_info["form"] = array( - "class_name" => "Form create", - "class_version" => "3.0.0", - "class_created" => "2002-10-22", - "class_author" => "Clemens Schwaighofer" + $this->class_info['form'] = array( + 'class_name' => 'Form create', + 'class_version' => '3.0.0', + 'class_created' => '2002-10-22', + 'class_author' => 'Clemens Schwaighofer' ); } @@ -323,9 +338,9 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO $this->table_array = array (); } reset($this->table_array); - $string = "TABLE ARRAY DUMP: ".$this->table_name."
"; + $string = 'TABLE ARRAY DUMP: '.$this->table_name.'
'; foreach ($this->table_array as $key => $value) { - $string .= "$key: ".$value["value"]."
"; + $string .= ''.$key.': '.$value['value'].'
'; } return $string; } @@ -346,7 +361,7 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO // RETURN: the value of the $want_key array field // works only with fields that appear only ONCE // if multiple gets only FIRST - public function formGetColNameFromKey($want_key, $key_value = "") + public function formGetColNameFromKey($want_key, $key_value = '') { if (!is_array($this->table_array)) { $this->table_array = array (); @@ -366,7 +381,7 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO // PARAMS: $want_key: the key where u want the data from // $key_value: if set searches for special right value // RETURN: array of fields - public function formGetColNameArrayFromKey($want_key, $key_value = "") + public function formGetColNameArrayFromKey($want_key, $key_value = '') { $key_array = array(); if (!is_array($this->table_array)) { @@ -391,10 +406,10 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO public function formPrintMsg() { if ($this->error) { - $class = "error"; + $class = 'error'; } if ($this->warning) { - $class = "warning"; + $class = 'warning'; } return array('msg' => $this->msg, 'width' => $this->table_width, 'class' => $class); } @@ -407,7 +422,7 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO // DESC : default load procedure public function formProcedureLoad($archive_id) { - if ($this->archive && $archive_id && $this->group_level_user <= $this->security_level["load"]) { + if ($this->archive && $archive_id && $this->group_level_user <= $this->security_level['load']) { $this->formLoadTableArray($archive_id); $this->yes = 1; } @@ -420,11 +435,11 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO // DESC : default new procedure public function formProcedureNew() { - if ($this->new && $this->group_level_user <= $this->security_level["new"]) { - if ($this->really_new == "yes") { + if ($this->new && $this->group_level_user <= $this->security_level['new']) { + if ($this->really_new == 'yes') { $this->formUnsetTablearray(); } else { - $this->msg .= $this->l->__("You have to select the Checkbox for New!
"); + $this->msg .= $this->l->__('You have to select the Checkbox for New!
'); $this->error = 2; } $this->yes = 1; @@ -438,7 +453,7 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO // DESC : default save procedure public function formProcedureSave() { - if ($this->save && $this->group_level_user <= $this->security_level["save"]) { + if ($this->save && $this->group_level_user <= $this->security_level['save']) { $this->formErrorCheck(); if (!$this->error) { $this->formSaveTableArray(); @@ -454,16 +469,16 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO // DESC : default delete procedure public function formProcedureDelete() { - // delete is also by "protected" - if ($this->delete && $this->group_level_user <= $this->security_level["delete"] && !$this->table_array["protected"]["value"]) { - if ($this->table_array["protected"]["value"]) { - $this->msg .= $this->l->__("Cannot delete this Dataset, because it is internaly protected!"); + // delete is also by 'protected' + if ($this->delete && $this->group_level_user <= $this->security_level['delete'] && !$this->table_array['protected']['value']) { + if ($this->table_array['protected']['value']) { + $this->msg .= $this->l->__('Cannot delete this Dataset, because it is internaly protected!'); $this->error = 2; } - if ($this->really_delete == "yes") { + if ($this->really_delete == 'yes') { $this->formDeleteTableArray(); } else { - $this->msg .= $this->l->__("You have to select the Checkbox for Delete!
"); + $this->msg .= $this->l->__('You have to select the Checkbox for Delete!
'); $this->error = 2; $this->yes = 1; } @@ -478,57 +493,57 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO public function formProcedureDeleteFromElementList($element_list, $remove_name) { // only do if the user is allowed to delete - if ($this->group_level_user <= $this->security_level["delete"] && !$this->table_array["protected"]["value"] && !$this->error) { + if ($this->group_level_user <= $this->security_level['delete'] && !$this->table_array['protected']['value'] && !$this->error) { if (!is_array($element_list)) { $element_list = array (); } for ($i = 0, $i_max = count($element_list); $i < $i_max; $i ++) { - // $this->debug('form_error', "Array: ".is_array($this->element_list[$element_list[$i]]["read_data"])." | ".$this->element_list[$element_list[$i]]["delete"]); + // $this->debug('form_error', 'Array: '.is_array($this->element_list[$element_list[$i]]['read_data']).' | '.$this->element_list[$element_list[$i]]['delete']); // if prefix, set it - $prfx = ($this->element_list[$element_list[$i]]["prefix"]) ? $this->element_list[$element_list[$i]]["prefix"]."_" : ''; + $prfx = ($this->element_list[$element_list[$i]]['prefix']) ? $this->element_list[$element_list[$i]]['prefix'].'_' : ''; // get the primary key - foreach ($this->element_list[$element_list[$i]]["elements"] as $el_name => $data) { - if ($data["pk_id"]) { + foreach ($this->element_list[$element_list[$i]]['elements'] as $el_name => $data) { + if ($data['pk_id']) { $pk_name = $el_name; } } // which key should be deleted $id = $remove_name[$i]; - if (($this->element_list[$element_list[$i]]["delete_name"] || $this->element_list[$element_list[$i]]["delete"]) && - !$this->element_list[$element_list[$i]]["enable_name"] + if (($this->element_list[$element_list[$i]]['delete_name'] || $this->element_list[$element_list[$i]]['delete']) && + !$this->element_list[$element_list[$i]]['enable_name'] ) { // flag var name - $flag = $remove_name[$i]."_flag"; - if ($_POST[$flag] == "true") { - $q = "DELETE FROM ".$element_list[$i]." WHERE ".$pk_name." = ".$_POST[$id]; + $flag = $remove_name[$i].'_flag'; + if ($_POST[$flag] == 'true') { + $q = 'DELETE FROM '.$element_list[$i].' WHERE '.$pk_name.' = '.$_POST[$id]; $this->dbExec($q); - $this->msg .= $this->l->__("Removed entry from list
"); + $this->msg .= $this->l->__('Removed entry from list
'); $this->warning = 1; } // post okay true -> delete - } elseif (is_array($this->element_list[$element_list[$i]]["read_data"]) && !$this->element_list[$element_list[$i]]["delete"]) { + } elseif (is_array($this->element_list[$element_list[$i]]['read_data']) && !$this->element_list[$element_list[$i]]['delete']) { if (!is_array($_POST[$id])) { $_POST[$id] = array (); } for ($j = 0, $j_max = count($_POST[$id]); $j < $j_max; $j ++) { // if it is not activated if (!$_POST[$remove_name[$i]][$j]) { - $q = "UPDATE ".$element_list[$i]." WHERE ".$pk_name." = ".$_POST[$prfx.$pk_name][$j]; - // $this->debug('edit_db', "UP: $q"); + $q = 'UPDATE '.$element_list[$i].' WHERE '.$pk_name.' = '.$_POST[$prfx.$pk_name][$j]; + // $this->debug('edit_db', 'UP: $q'); // $this->dbExec($q); - $this->msg .= $this->l->__("Disabled deselected entries from list
"); + $this->msg .= $this->l->__('Disabled deselected entries from list
'); $this->warning = 1; } } - } elseif (is_array($this->element_list[$element_list[$i]]["read_data"]) && $this->element_list[$element_list[$i]]["delete"]) { - // $this->debug('form_clean', "ID [$id] [$prfx.$pk_name]"); - // $this->debug('form_clean', "ID arr: ".$this->printAr($_POST[$id])); - // $this->debug('form_clean', "PK arr: ".$this->printAr($_POST[$prfx.$pk_name])); + } elseif (is_array($this->element_list[$element_list[$i]]['read_data']) && $this->element_list[$element_list[$i]]['delete']) { + // $this->debug('form_clean', 'ID [$id] [$prfx.$pk_name]'); + // $this->debug('form_clean', 'ID arr: '.$this->printAr($_POST[$id])); + // $this->debug('form_clean', 'PK arr: '.$this->printAr($_POST[$prfx.$pk_name])); for ($j = 0, $j_max = count($_POST[$prfx.$pk_name]); $j < $j_max; $j ++) { if (!$_POST[$remove_name[$i]][$j] && $_POST[$prfx.$pk_name][$j]) { - $q = "DELETE FROM ".$element_list[$i]." WHERE ".$pk_name." = ".$_POST[$prfx.$pk_name][$j]; - // $this->debug('edit_db', "DEL: $q"); + $q = 'DELETE FROM '.$element_list[$i].' WHERE '.$pk_name.' = '.$_POST[$prfx.$pk_name][$j]; + // $this->debug('edit_db', 'DEL: $q'); $this->dbExec($q); - $this->msg .= $this->l->__("Deleted deselected entries from list
"); + $this->msg .= $this->l->__('Deleted deselected entries from list
'); $this->warning = 1; } } @@ -543,32 +558,32 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO // METHOD: formCreateLoad // WAS : form_create_load // PARAMS: none - // RETURN: string from "load" part of form ... + // RETURN: string from 'load' part of form ... public function formCreateLoad() { // when security leve is okay ... - if ($this->group_level_user <= $this->security_level["load"]) { + if ($this->group_level_user <= $this->security_level['load']) { $t_pk_name = $this->archive_pk_name; // lade liste $this->dbExec($this->load_query); while ($res = $this->dbFetchArray()) { $pk_ids[] = $res[$this->int_pk_name]; - if ($res[$this->int_pk_name] == $this->table_array[$this->int_pk_name]["value"]) { + if ($res[$this->int_pk_name] == $this->table_array[$this->int_pk_name]['value']) { $pk_selected = $res[$this->int_pk_name]; } $t_string = ''; for ($i = 0, $i_max = count($this->field_array); $i < $i_max; $i ++) { if ($t_string) { - $t_string .= ", "; + $t_string .= ', '; } - if ($this->field_array[$i]["before_value"]) { - $t_string .= $this->field_array[$i]["before_value"]; + if ($this->field_array[$i]['before_value']) { + $t_string .= $this->field_array[$i]['before_value']; } - if ($this->field_array[$i]["binary"]) { - $t_string .= ($res[$this->field_array[$i]["name"]]) ? $this->field_array[$i]["binary"][0] : $this->field_array[$i]["binary"][1]; + if ($this->field_array[$i]['binary']) { + $t_string .= ($res[$this->field_array[$i]['name']]) ? $this->field_array[$i]['binary'][0] : $this->field_array[$i]['binary'][1]; } else { - $t_string .= $res[$this->field_array[$i]["name"]]; + $t_string .= $res[$this->field_array[$i]['name']]; } } $pk_names[] = $t_string; @@ -584,15 +599,15 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO public function formCreateNew($hide_new_checkbox = 0) { // when security level is okay - if ($this->group_level_user <= $this->security_level["new"]) { + if ($this->group_level_user <= $this->security_level['new']) { if ($this->yes && !$hide_new_checkbox) { $show_checkbox = 1; } // set type of new name if ($this->yes) { - $new_name = $this->l->__("Clear all and create new"); + $new_name = $this->l->__('Clear all and create new'); } else { - $new_name = $this->l->__("New"); + $new_name = $this->l->__('New'); } } // security level okay return array('new_name' => $new_name, 'show_checkbox' => $show_checkbox); @@ -604,23 +619,23 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO // RETURN: string for delete / save part public function formCreateSaveDelete($hide_delete = 0, $hide_delete_checkbox = 0) { - if ($this->group_level_user <= $this->security_level["save"] || $this->group_level_user <= $this->security_level["delete"]) { + if ($this->group_level_user <= $this->security_level['save'] || $this->group_level_user <= $this->security_level['delete']) { $old_school_hidden = 0; - if ($this->group_level_user <= $this->security_level["save"]) { + if ($this->group_level_user <= $this->security_level['save']) { $seclevel_okay = 1; - if (!$this->table_array[$this->int_pk_name]["value"]) { - $save = $this->l->__("Save"); + if (!$this->table_array[$this->int_pk_name]['value']) { + $save = $this->l->__('Save'); } else { - $save = $this->l->__("Update"); + $save = $this->l->__('Update'); } // print the old_school hidden if requestet if ($old_school_hidden) { $pk_name = $this->int_pk_name; - $pk_value = $this->table_array[$this->int_pk_name]["value"]; + $pk_value = $this->table_array[$this->int_pk_name]['value']; } } // show save part // show delete part only if pk is set && we want to see the delete - if ($this->table_array[$this->int_pk_name]["value"] && !$hide_delete && $this->group_level_user <= $this->security_level["delete"]) { + if ($this->table_array[$this->int_pk_name]['value'] && !$hide_delete && $this->group_level_user <= $this->security_level['delete']) { $show_delete = 1; } } // print save/delete row at all$ @@ -641,32 +656,32 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO // for drop down, as data comes from a reference table // for drop_down_text it has to be an array with $key->$value // RETURN: element in HTML - public function formCreateElement($element_name, $query = "") + public function formCreateElement($element_name, $query = '') { - // special 2nd color for "binary" attribut - if ($this->table_array[$element_name]["type"] == "binary" && !$this->table_array[$element_name]["value"]) { + // special 2nd color for 'binary' attribut + if ($this->table_array[$element_name]['type'] == 'binary' && !$this->table_array[$element_name]['value']) { $EDIT_FGCOLOR_T = 'edit_fgcolor_no'; } else { $EDIT_FGCOLOR_T = 'edit_fgcolor'; } - $output_name = $this->table_array[$element_name]["output_name"]; - if ($this->table_array[$element_name]["mandatory"]) { + $output_name = $this->table_array[$element_name]['output_name']; + if ($this->table_array[$element_name]['mandatory']) { $output_name .= ' *'; } - // create right side depending on "definiton" in table_array - $type = $this->table_array[$element_name]["type"]; + // create right side depending on 'definiton' in table_array + $type = $this->table_array[$element_name]['type']; // view only output - if ($this->table_array[$element_name]["type"] == "view") { - $data['value'] = !$this->table_array[$element_name]["value"] ? $this->table_array[$element_name]['empty'] : $this->table_array[$element_name]["value"]; + if ($this->table_array[$element_name]['type'] == 'view') { + $data['value'] = !$this->table_array[$element_name]['value'] ? $this->table_array[$element_name]['empty'] : $this->table_array[$element_name]['value']; } // binary true/false element - if ($this->table_array[$element_name]["type"] == "binary") { - for ($i = (count($this->table_array[$element_name]["element_list"]) - 1); $i >= 0; $i --) { + if ($this->table_array[$element_name]['type'] == 'binary') { + for ($i = (count($this->table_array[$element_name]['element_list']) - 1); $i >= 0; $i --) { $data['value'][] = $i; - $data['output'][] = $this->table_array[$element_name]["element_list"][$i]; + $data['output'][] = $this->table_array[$element_name]['element_list'][$i]; $data['name'] = $element_name; - if (($i && $this->table_array[$element_name]["value"]) || (!$i && !$this->table_array[$element_name]["value"])) { - $data['checked'] = $this->table_array[$element_name]["value"]; + if (($i && $this->table_array[$element_name]['value']) || (!$i && !$this->table_array[$element_name]['value'])) { + $data['checked'] = $this->table_array[$element_name]['value']; } if ($i) { @@ -675,138 +690,138 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO } } // checkbox element - if ($this->table_array[$element_name]["type"] == "checkbox") { + if ($this->table_array[$element_name]['type'] == 'checkbox') { $data['name'] = $element_name; - $data['value'][] = $this->table_array[$element_name]["element_list"]; - $data['checked'] = $this->table_array[$element_name]["value"]; + $data['value'][] = $this->table_array[$element_name]['element_list']; + $data['checked'] = $this->table_array[$element_name]['value']; } // normal text element - if ($this->table_array[$element_name]["type"] == "text") { + if ($this->table_array[$element_name]['type'] == 'text') { $data['name'] = $element_name; - $data['value'] = $this->table_array[$element_name]["value"]; - $data['size'] = $this->table_array[$element_name]["size"]; - $data['length'] = $this->table_array[$element_name]["length"]; + $data['value'] = $this->table_array[$element_name]['value']; + $data['size'] = $this->table_array[$element_name]['size']; + $data['length'] = $this->table_array[$element_name]['length']; } // password element, does not write back the value - if ($this->table_array[$element_name]["type"] == "password") { + if ($this->table_array[$element_name]['type'] == 'password') { $data['name'] = $element_name; - $data['HIDDEN_value'] = $this->table_array[$element_name]["HIDDEN_value"]; - $data['size'] = $this->table_array[$element_name]["size"]; - $data['length'] = $this->table_array[$element_name]["length"]; + $data['HIDDEN_value'] = $this->table_array[$element_name]['HIDDEN_value']; + $data['size'] = $this->table_array[$element_name]['size']; + $data['length'] = $this->table_array[$element_name]['length']; } // date (YYYY-MM-DD) - if ($this->table_array[$element_name]["type"] == "date") { - if (!$this->table_array[$element_name]["value"]) { - $this->table_array[$element_name]["value"] = "YYYY-MM-DD"; + if ($this->table_array[$element_name]['type'] == 'date') { + if (!$this->table_array[$element_name]['value']) { + $this->table_array[$element_name]['value'] = 'YYYY-MM-DD'; } $data['name'] = $element_name; - $data['value'] = $this->table_array[$element_name]["value"]; + $data['value'] = $this->table_array[$element_name]['value']; } // textarea - if ($this->table_array[$element_name]["type"] == "textarea") { + if ($this->table_array[$element_name]['type'] == 'textarea') { $data['name'] = $element_name; - $data['value'] = $this->table_array[$element_name]["value"]; - $data['rows'] = $this->table_array[$element_name]["rows"]; - $data['cols'] = $this->table_array[$element_name]["cols"]; + $data['value'] = $this->table_array[$element_name]['value']; + $data['rows'] = $this->table_array[$element_name]['rows']; + $data['cols'] = $this->table_array[$element_name]['cols']; } // for drop_down_* - if (preg_match("/^drop_down_/", $this->table_array[$element_name]["type"])) { + if (preg_match("/^drop_down_/", $this->table_array[$element_name]['type'])) { $type = 'drop_down'; // outer query overrules inner if (!$query) { - $query = $this->table_array[$element_name]["query"]; + $query = $this->table_array[$element_name]['query']; } } // for drop_down_db* - if (preg_match("/^drop_down_db/", $this->table_array[$element_name]["type"])) { + if (preg_match("/^drop_down_db/", $this->table_array[$element_name]['type'])) { // if still NO query if (!$query) { // select pk_name, input_name from table_name (order by order_by) - $query = "SELECT DISTINCT ".$this->table_array[$element_name]["pk_name"].", ".$this->table_array[$element_name]["input_name"]." FROM ".$this->table_array[$element_name]["table_name"]; + $query = 'SELECT DISTINCT '.$this->table_array[$element_name]['pk_name'].', '.$this->table_array[$element_name]['input_name'].' FROM '.$this->table_array[$element_name]['table_name']; // possible where statements - if ($this->table_array[$element_name]["where"]) { - $query .= " WHERE ".$this->table_array[$element_name]["where"]; + if ($this->table_array[$element_name]['where']) { + $query .= ' WHERE '.$this->table_array[$element_name]['where']; } // possible order statements - if ($this->table_array[$element_name]["order_by"]) { - $query .= " ORDER BY ".$this->table_array[$element_name]["order_by"]; + if ($this->table_array[$element_name]['order_by']) { + $query .= ' ORDER BY '.$this->table_array[$element_name]['order_by']; } } // set output data $data['name'] = $element_name; - $data['value'][] = ""; - $data['output'][] = $this->l->__("Please choose ..."); + $data['value'][] = ''; + $data['output'][] = $this->l->__('Please choose ...'); while ($res = $this->dbReturn($query)) { $data['value'][] = $res[0]; $data['output'][] = $res[1]; - if ($this->table_array[$element_name]["value"] == $res[0]) { - $data['selected'] = $this->table_array[$element_name]["value"]; + if ($this->table_array[$element_name]['value'] == $res[0]) { + $data['selected'] = $this->table_array[$element_name]['value']; } } // for _input put additional field next to drop down - if (preg_match("/^drop_down_db_input/", $this->table_array[$element_name]["type"])) { + if (preg_match("/^drop_down_db_input/", $this->table_array[$element_name]['type'])) { $data['drop_down_input'] = 1; // pre fill the temp if empty and other side is selected, only for same_db - if ($this->table_array[$element_name]["type"] == "drop_down_db_input_same_db" && !$this->table_array[$element_name]["input_value"] && $this->table_array[$element_name]["value"]) { - $this->table_array[$element_name]["input_value"] = $this->table_array[$element_name]["value"]; + if ($this->table_array[$element_name]['type'] == 'drop_down_db_input_same_db' && !$this->table_array[$element_name]['input_value'] && $this->table_array[$element_name]['value']) { + $this->table_array[$element_name]['input_value'] = $this->table_array[$element_name]['value']; } - $data['input_value'] = $this->table_array[$element_name]["input_value"]; - $data['input_name'] = $this->table_array[$element_name]["input_name"].(($this->table_array[$element_name]["type"] == "drop_down_db_input_same_db") ? '_temp' : ''); - $data['input_size'] = $this->table_array[$element_name]["size"]; - $data['input_length'] = $this->table_array[$element_name]["length"]; + $data['input_value'] = $this->table_array[$element_name]['input_value']; + $data['input_name'] = $this->table_array[$element_name]['input_name'].(($this->table_array[$element_name]['type'] == 'drop_down_db_input_same_db') ? '_temp' : ''); + $data['input_size'] = $this->table_array[$element_name]['size']; + $data['input_length'] = $this->table_array[$element_name]['length']; } } // drop down array - if ($this->table_array[$element_name]["type"] == "drop_down_array") { + if ($this->table_array[$element_name]['type'] == 'drop_down_array') { $data['name'] = $element_name; - $data['value'][] = ""; - $data['output'][] = $this->l->__("Please choose ..."); + $data['value'][] = ''; + $data['output'][] = $this->l->__('Please choose ...'); // outer query overrules inner foreach ($query as $key => $value) { $data['value'][] = $key; $data['output'][] = $value; - if ($this->table_array[$element_name]["value"] == $key) { - $data['selected'] = $this->table_array[$element_name]["value"]; + if ($this->table_array[$element_name]['value'] == $key) { + $data['selected'] = $this->table_array[$element_name]['value']; } } } // radio array - if ($this->table_array[$element_name]["type"] == "radio_array") { + if ($this->table_array[$element_name]['type'] == 'radio_array') { if (!$query) { - $query = $this->table_array[$element_name]["query"]; + $query = $this->table_array[$element_name]['query']; } $data['name'] = $element_name; foreach ($query as $key => $value) { $data['value'][] = $key; $data['output'][] = $value; - if ($this->table_array[$element_name]["value"] == $key) { - $data['checked'] = $this->table_array[$element_name]["value"]; + if ($this->table_array[$element_name]['value'] == $key) { + $data['checked'] = $this->table_array[$element_name]['value']; } $data['separator'] = ''; } } // for media / not yet implemented - if ($this->table_array[$element_name]["type"] == "media") { - //media::insert_file($element_name,$this->table_array[$element_name]["value"],$query); + if ($this->table_array[$element_name]['type'] == 'media') { + //media::insert_file($element_name,$this->table_array[$element_name]['value'],$query); } // order button - if ($this->table_array[$element_name]["type"] == "order") { - $data['output_name'] = $this->table_array[$element_name]["output_name"]; + if ($this->table_array[$element_name]['type'] == 'order') { + $data['output_name'] = $this->table_array[$element_name]['output_name']; $data['name'] = $element_name; - $data['value'] = $this->table_array[$element_name]["value"]; + $data['value'] = $this->table_array[$element_name]['value']; $data['col_name'] = $this->col_name; $data['table_name'] = $this->table_name; $data['query'] = urlencode($query); } // file upload - if ($this->table_array[$element_name]["type"] == "file") { + if ($this->table_array[$element_name]['type'] == 'file') { $data['name'] = $element_name; - // if file for this exsists, print "delete, view stuff" - if ($this->table_array[$element_name]["value"]) { + // if file for this exsists, print 'delete, view stuff' + if ($this->table_array[$element_name]['value']) { $data['content'] = 1; - $data['url'] = $this->table_array[$element_name]["open_dir"].$this->table_array[$element_name]["value"]; - $data['output'] = $this->table_array[$element_name]["value"]; - $data['value'] = $this->table_array[$element_name]["value"]; + $data['url'] = $this->table_array[$element_name]['open_dir'].$this->table_array[$element_name]['value']; + $data['output'] = $this->table_array[$element_name]['value']; + $data['value'] = $this->table_array[$element_name]['value']; } } return array('output_name' => $output_name, 'color' => $EDIT_FGCOLOR_T, 'type' => $type, 'data' => $data); @@ -826,117 +841,117 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO } reset($this->table_array); foreach ($this->table_array as $key => $value) { - //if ($value["mandatory"] && $value["error_check"]) + //if ($value['mandatory'] && $value['error_check']) // if error value set && somethign input, check if input okay - if ($value["error_check"] && $this->table_array[$key]["value"]) { + if ($value['error_check'] && $this->table_array[$key]['value']) { // each error check can be a piped seperated value, lets split it - // $this->debug('edit', $value["error_check"]); - foreach (explode('|', $value["error_check"]) as $error_check) { + // $this->debug('edit', $value['error_check']); + foreach (explode('|', $value['error_check']) as $error_check) { switch ($error_check) { - case "number": - if (!preg_match("/^[0-9]+(['\,','.']?[0-9]+)*$/", $this->table_array[$key]["value"])) { - $this->msg .= sprintf($this->l->__("Please enter a vailid Number for the %s Field!
"), $this->table_array[$key]["output_name"]); + case 'number': + if (!is_numeric($this->table_array[$key]['value'])) { + $this->msg .= sprintf($this->l->__('Please enter a vailid Number for the %s Field!
'), $this->table_array[$key]['output_name']); } break; - case "date": // YYYY-MM-DD - if (!check_date($this->table_array[$key]["value"], 1)) { - $this->msg .= sprintf($this->l->__("Please enter a vailid date (YYYY-MM-DD) for the %s Field!
"), $this->table_array[$key]["output_name"]); + case 'date': // YYYY-MM-DD + if (!check_date($this->table_array[$key]['value'], 1)) { + $this->msg .= sprintf($this->l->__('Please enter a vailid date (YYYY-MM-DD) for the %s Field!
'), $this->table_array[$key]['output_name']); } break; - case "time": // HH:MM[:SS] - if (!check_time($this->table_array[$key]["value"])) { - $this->msg .= sprintf($this->l->__("Please enter a vailid time (HH:MM[:SS]) for the %s Field!
"), $this->table_array[$key]["output_name"]); + case 'time': // HH:MM[:SS] + if (!check_time($this->table_array[$key]['value'])) { + $this->msg .= sprintf($this->l->__('Please enter a vailid time (HH:MM[:SS]) for the %s Field!
'), $this->table_array[$key]['output_name']); } break; - case "datetime": // YYYY-MM-DD HH:MM[:SS] + case 'datetime': // YYYY-MM-DD HH:MM[:SS] // not implemented break; - case "intervalshort": // ony interval n [Y/M/D] only + case 'intervalshort': // ony interval n [Y/M/D] only if (preg_match("/^\d{1,3}\ ?[YMDymd]{1}$/", $this->table_array[$key]['value'])) { $this->msg .= sprintf($this->l->__('Please enter a valid time interval in the format Y|M|D for the %s Field!
'), $this->table[$key]['output_name']); } break; - case "email": - if (!preg_match("/$this->email_regex/", $this->table_array[$key]["value"])) { - $this->msg .= sprintf($this->l->__("Please enter a valid E-Mail Address for the %s Field!
"), $this->table_array[$key]["output_name"]); + case 'email': + if (!preg_match("/$this->email_regex/", $this->table_array[$key]['value'])) { + $this->msg .= sprintf($this->l->__('Please enter a valid E-Mail Address for the %s Field!
'), $this->table_array[$key]['output_name']); } break; // check unique, check if field in table is not yet exist - case "unique": - $q = "SELECT ".$key." FROM ".$this->table_name." WHERE ".$key." = '".$this->dbEscapeString($this->table_array[$key]["value"])."'"; - if ($this->table_array[$this->int_pk_name]["value"]) { - $q .= " AND ".$this->int_pk_name." <> ".$this->table_array[$this->int_pk_name]["value"]; + case 'unique': + $q = 'SELECT '.$key.' FROM '.$this->table_name.' WHERE '.$key.' = '."'".$this->dbEscapeString($this->table_array[$key]['value'])."'"; + if ($this->table_array[$this->int_pk_name]['value']) { + $q .= ' AND '.$this->int_pk_name.' <> '.$this->table_array[$this->int_pk_name]['value']; } list($$key) = $this->dbReturnRow($q); if ($$key) { - $this->msg .= sprintf($this->l->__("The field %s can be used only once!
"), $this->table_array[$key]["output_name"]); + $this->msg .= sprintf($this->l->__('The field %s can be used only once!
'), $this->table_array[$key]['output_name']); } break; - case "custom": - if (!preg_match($this->table_array[$key]["error_regex"], $this->table_array[$key]["value"])) { - $this->msg .= sprintf($this->l->__("Please enter a valid (%s) input for the %s Field!
"), $this->table_array[$key]["error_example"], $this->table_array[$key]["output_name"]); + case 'custom': + if (!preg_match($this->table_array[$key]['error_regex'], $this->table_array[$key]['value'])) { + $this->msg .= sprintf($this->l->__('Please enter a valid (%s) input for the %s Field!
'), $this->table_array[$key]['error_example'], $this->table_array[$key]['output_name']); } break; - case "alphanumericspace": + case 'alphanumericspace': // $this->debug('edit', 'IN Alphanumericspace'); - if (!preg_match("/^[0-9A-Za-z_\-\ ]+$/", $this->table_array[$key]["value"])) { - $this->msg .= sprintf($this->l->__("Please enter a valid alphanumeric (Numbers and Letters, -, _ and spaces allowed) value for the %s Field!
"), $this->table_array[$key]["output_name"]); + if (!preg_match("/^[0-9A-Za-z_\-\ ]+$/", $this->table_array[$key]['value'])) { + $this->msg .= sprintf($this->l->__('Please enter a valid alphanumeric (Numbers and Letters, -, _ and spaces allowed) value for the %s Field!
'), $this->table_array[$key]['output_name']); } break; - case "alphanumeric": + case 'alphanumeric': // $this->debug('edit', 'IN Alphanumeric'); - if (!preg_match("/^[0-9A-Za-z_\-]+$/", $this->table_array[$key]["value"])) { - $this->msg .= sprintf($this->l->__("Please enter a valid alphanumeric (Numbers and Letters only also - and _, no spaces) value for the %s Field!
"), $this->table_array[$key]["output_name"]); + if (!preg_match("/^[0-9A-Za-z_\-]+$/", $this->table_array[$key]['value'])) { + $this->msg .= sprintf($this->l->__('Please enter a valid alphanumeric (Numbers and Letters only also - and _, no spaces) value for the %s Field!
'), $this->table_array[$key]['output_name']); } break; // this one also allows @ and . - case "alphanumericextended": + case 'alphanumericextended': // $this->debug('edit', 'IN Alphanumericextended'); - if (!preg_match("/^[0-9A-Za-z_\-@\.]+$/", $this->table_array[$key]["value"])) { - $this->msg .= sprintf($this->l->__("Please enter a valid alphanumeric extended (Numbers, Letters, -, _, @ and . only, no spaces) value for the %s Field!
"), $this->table_array[$key]["output_name"]); + if (!preg_match("/^[0-9A-Za-z_\-@\.]+$/", $this->table_array[$key]['value'])) { + $this->msg .= sprintf($this->l->__('Please enter a valid alphanumeric extended (Numbers, Letters, -, _, @ and . only, no spaces) value for the %s Field!
'), $this->table_array[$key]['output_name']); } break; - case "password": + case 'password': // password can only be alphanumeric + special chars // password and CONFIRM_password need to be the same - if ($this->table_array[$key]["value"] != $this->table_array[$key]["CONFIRM_value"]) { + if ($this->table_array[$key]['value'] != $this->table_array[$key]['CONFIRM_value']) { // error } break; } // switch } // for each error to check - } elseif ($value["mandatory"] && + } elseif ($value['mandatory'] && ( - // for all "normal" fields - ($this->table_array[$key]["type"] != "password" && $this->table_array[$key]["type"] != "drop_down_db_input" && !$this->table_array[$key]["value"]) || + // for all 'normal' fields + ($this->table_array[$key]['type'] != 'password' && $this->table_array[$key]['type'] != 'drop_down_db_input' && !$this->table_array[$key]['value']) || // for drop_down_db_input check if one of both fields filled - ($this->table_array[$key]["type"] == "drop_down_db_input" && !$this->table_array[$key]["input_value"] && !$this->table_array[$key]["value"]) || + ($this->table_array[$key]['type'] == 'drop_down_db_input' && !$this->table_array[$key]['input_value'] && !$this->table_array[$key]['value']) || // for password - ($this->table_array[$key]["type"] == "password" && !$this->table_array[$key]["value"] && !$this->table_array[$key]["HIDDEN_value"]) + ($this->table_array[$key]['type'] == 'password' && !$this->table_array[$key]['value'] && !$this->table_array[$key]['HIDDEN_value']) ) // main if end ) { // if mandatory && no input - // $this->debug('form', "A: ".$this->table_array[$key]["type"]." -- ".$this->table_array[$key]["input_value"]." -- ".$this->table_array[$key]["value"]); - if (!$this->table_array[$key]["value"] && $this->table_array[$key]["type"] != "binary") { - $this->msg .= sprintf($this->l->__("Please enter something into the %s field!
"), $this->table_array[$key]["output_name"]); + // $this->debug('form', 'A: '.$this->table_array[$key]['type'].' -- '.$this->table_array[$key]['input_value'].' -- '.$this->table_array[$key]['value']); + if (!$this->table_array[$key]['value'] && $this->table_array[$key]['type'] != 'binary') { + $this->msg .= sprintf($this->l->__('Please enter something into the %s field!
'), $this->table_array[$key]['output_name']); } } // mandatory // check file upload - if ($this->table_array[$key]["type"] == "file" && $GLOBALS["_FILES"][$key."_file"]['name'] && is_array($this->table_array[$key]["accept_type"])) { + if ($this->table_array[$key]['type'] == 'file' && $GLOBALS['_FILES'][$key.'_file']['name'] && is_array($this->table_array[$key]['accept_type'])) { // check against allowed types $mime_okay = 0; - foreach ($this->table_array[$key]["accept_type"] as $mime_type) { - if ($GLOBALS["_FILES"][$key."_file"]['type'] == $mime_type) { + foreach ($this->table_array[$key]['accept_type'] as $mime_type) { + if ($GLOBALS['_FILES'][$key.'_file']['type'] == $mime_type) { $mime_okay = 1; } } if (!$mime_okay) { $this->msg .= sprintf( - $this->l->__("Uploaded File %s has MIME Type %s which is not in theallowed MIME List for Upload Field %s!
"), - $GLOBALS["_FILES"][$key."_file"]['name'], - $GLOBALS["_FILES"][$key."_file"]['type'], - $this->table_array[$key]["output_name"] + $this->l->__('Uploaded File %s has MIME Type %s which is not in theallowed MIME List for Upload Field %s!
'), + $GLOBALS['_FILES'][$key.'_file']['name'], + $GLOBALS['_FILES'][$key.'_file']['type'], + $this->table_array[$key]['output_name'] ); } } @@ -948,12 +963,12 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO } reset($this->reference_array); foreach ($this->reference_array as $key => $value) { - if ($this->reference_array[$key]["mandatory"] && !$this->reference_array[$key]["selected"][0]) { - $this->msg .= sprintf($this->l->__("Please select at least one Element from field %s!
"), $this->reference_array[$key]["output_name"]); + if ($this->reference_array[$key]['mandatory'] && !$this->reference_array[$key]['selected'][0]) { + $this->msg .= sprintf($this->l->__('Please select at least one Element from field %s!
'), $this->reference_array[$key]['output_name']); } } } - // $this->debug('edit_error', "QS:
".print_r($_POST, 1)."
"); + // $this->debug('edit_error', 'QS:
'.print_r($_POST, 1).'
'); if (is_array($this->element_list)) { // check the mandatory stuff // if mandatory, check that at least on pk exists or if at least the mandatory field is filled @@ -968,68 +983,68 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO } } // get the leasy of keys from the elements array - $keys = array_keys($reference_array["elements"]); + $keys = array_keys($reference_array['elements']); // prefix - $prfx = ($reference_array["prefix"]) ? $reference_array["prefix"]."_" : ''; + $prfx = ($reference_array['prefix']) ? $reference_array['prefix'].'_' : ''; // get max elements $max = 0; foreach ($keys as $key) { if (is_array($_POST[$prfx.$key]) && count($_POST[$prfx.$key]) > $max) { $max = count($_POST[$prfx.$key]); } - // $this->debug('edit_error_chk', "KEY: $prfx$key | count: ".count($_POST[$prfx.$key])." | M: $max"); - // $this->debug('edit_error_chk', "K: ".$_POST[$prfx.$key]." | ".$_POST[$prfx.$key][0]); + // $this->debug('edit_error_chk', 'KEY: $prfx$key | count: '.count($_POST[$prfx.$key]).' | M: $max'); + // $this->debug('edit_error_chk', 'K: '.$_POST[$prfx.$key].' | '.$_POST[$prfx.$key][0]); } $this->debug('post_array', $this->printAr($_POST)); # check each row for ($i = 0; $i < $max; $i ++) { // either one of the post pks is set, or the mandatory - foreach ($reference_array["elements"] as $el_name => $data_array) { - if ($data_array["mandatory"]) { - $mand_name = $data_array["output_name"]; + foreach ($reference_array['elements'] as $el_name => $data_array) { + if ($data_array['mandatory']) { + $mand_name = $data_array['output_name']; } // check if there is a primary ket inside, so it is okay - if ($data_array["pk_id"] && count($_POST[$prfx.$el_name]) && $reference_array["mandatory"]) { + if ($data_array['pk_id'] && count($_POST[$prfx.$el_name]) && $reference_array['mandatory']) { $mand_okay = 1; } // we found a mandatory field. check now if one is set to satisfy the main mandatory // also check, if this field is mandatory and its not set, but any other, throw an error - // $this->debug('edit_error_chk', "RG error - Data[".$prfx.$el_name.": ".$_POST[$prfx.$el_name][$i]." | ".$_POST[$prfx.$el_name]." - ".$reference_array['enable_name']." - ".$_POST[$reference_array['enable_name']][$_POST[$prfx.$el_name][$i]]); - if ($data_array["mandatory"] && $_POST[$prfx.$el_name][$i]) { + // $this->debug('edit_error_chk', 'RG error - Data['.$prfx.$el_name.': '.$_POST[$prfx.$el_name][$i].' | '.$_POST[$prfx.$el_name].' - '.$reference_array['enable_name'].' - '.$_POST[$reference_array['enable_name']][$_POST[$prfx.$el_name][$i]]); + if ($data_array['mandatory'] && $_POST[$prfx.$el_name][$i]) { $mand_okay = 1; $row_okay[$i] = 1; } elseif ($data_array['type'] == 'radio_group' && !isset($_POST[$prfx.$el_name])) { // radio group and set where one not active - // $this->debug('edit_error_chk', "RADIO GROUP"); + // $this->debug('edit_error_chk', 'RADIO GROUP'); $row_okay[$_POST[$prfx.$el_name][$i]] = 0; $default_wrong[$_POST[$prfx.$el_name][$i]] = 1; $error[$_POST[$prfx.$el_name][$i]] = 1; } elseif ($_POST[$prfx.$el_name][$i] && !$error[$i]) { - // $this->debug('edit_error_chk', "[$i]"); + // $this->debug('edit_error_chk', '[$i]'); $element_set[$i] = 1; $row_okay[$i] = 1; - } elseif ($data_array["mandatory"] && !$_POST[$prfx.$el_name][$i]) { + } elseif ($data_array['mandatory'] && !$_POST[$prfx.$el_name][$i]) { $row_okay[$i] = 0; } // do optional error checks like for normal fields // currently active: unique/alphanumeric if ($data_array['error_check']) { - foreach (explode('|', $value["error_check"]) as $error_check) { + foreach (explode('|', $value['error_check']) as $error_check) { switch ($error_check) { // check unique, check if field in table is not yet exist - case "unique": - $q = "SELECT ".$_pk_name." FROM ".$table_name." WHERE ".$el_name." = '".$this->dbEscapeString($_POST[$prfx.$el_name][$i])."'"; - if ($this->table_array[$this->int_pk_name]["value"]) { - $q .= " AND ".$this->int_pk_name." <> ".$this->table_array[$this->int_pk_name]["value"]; + case 'unique': + $q = 'SELECT '.$_pk_name.' FROM '.$table_name.' WHERE '.$el_name.' = '."'".$this->dbEscapeString($_POST[$prfx.$el_name][$i])."'"; + if ($this->table_array[$this->int_pk_name]['value']) { + $q .= ' AND '.$this->int_pk_name.' <> '.$this->table_array[$this->int_pk_name]['value']; } list($$key) = $this->dbReturnRow($q); if ($$key) { - $this->msg .= sprintf($this->l->__("The field %s in row %s can be used only once!
"), $reference_array["output_name"], $i); + $this->msg .= sprintf($this->l->__('The field %s in row %s can be used only once!
'), $reference_array['output_name'], $i); } break; - case "alphanumericspace": + case 'alphanumericspace': if (!preg_match("/^[0-9A-Za-z\ ]+$/", $_POST[$prfx.$el_name][$i])) { - $this->msg .= sprintf($this->l->__("Please enter a valid alphanumeric (Numbers and Letters, spaces allowed) value for the %s Field and row %s!
"), $reference_array["output_name"], $i); + $this->msg .= sprintf($this->l->__('Please enter a valid alphanumeric (Numbers and Letters, spaces allowed) value for the %s Field and row %s!
'), $reference_array['output_name'], $i); } break; } @@ -1039,15 +1054,15 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO } // main mandatory is met -> error msg - if (!$mand_okay && $reference_array["mandatory"]) { - $this->msg .= sprintf($this->l->__("You need to enter at least one data set for field %s!
"), $reference_array["output_name"]); + if (!$mand_okay && $reference_array['mandatory']) { + $this->msg .= sprintf($this->l->__('You need to enter at least one data set for field %s!
'), $reference_array['output_name']); } for ($i = 0; $i < $max; $i ++) { if (!$row_okay[$i] && $element_set[$i]) { - $this->msg .= sprintf($this->l->__("The row %s has %s set as mandatory, please fill at least this field out
"), $i, $mand_name); + $this->msg .= sprintf($this->l->__('The row %s has %s set as mandatory, please fill at least this field out
'), $i, $mand_name); } if (!$row_okay[$i] && $default_wrong[$i]) { - $this->msg .= sprintf($this->l->__("The row %s would have a default setting, but it would be disabled. Please change the default setting and save again
"), $i); + $this->msg .= sprintf($this->l->__('The row %s would have a default setting, but it would be disabled. Please change the default setting and save again
'), $i); } } } // each element list @@ -1065,21 +1080,21 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO public function formSetOrder() { // get order name - $order_name = $this->formGetColNameFromKey("order"); + $order_name = $this->formGetColNameFromKey('order'); if ($order_name) { // first check out of order ... - if (!$this->table_array[$order_name]["value"]) { + if (!$this->table_array[$order_name]['value']) { // set order (read max) - $q = "SELECT MAX(".$order_name.") + 1 AS max_page_order FROM ".$this->table_name; - list($this->table_array[$order_name]["value"]) = $this->dbReturnRow($q); + $q = 'SELECT MAX('.$order_name.') + 1 AS max_page_order FROM '.$this->table_name; + list($this->table_array[$order_name]['value']) = $this->dbReturnRow($q); // frist element is 0 because NULL gets returned, set to 1 - if (!$this->table_array[$order_name]["value"]) { - $this->table_array[$order_name]["value"] = 1; + if (!$this->table_array[$order_name]['value']) { + $this->table_array[$order_name]['value'] = 1; } - } elseif ($this->table_array[$this->int_pk_name]["value"]) { - $q = "SELECT $order_name FROM ".$this->table_name." WHERE ".$this->int_pk_name." = ".$this->table_array[$this->int_pk_name]["value"]; - list($this->table_array[$order_name]["value"]) = $this->dbReturnRow($q); + } elseif ($this->table_array[$this->int_pk_name]['value']) { + $q = 'SELECT '.$order_name.' FROM '.$this->table_name.' WHERE '.$this->int_pk_name.' = '.$this->table_array[$this->int_pk_name]['value']; + list($this->table_array[$order_name]['value']) = $this->dbReturnRow($q); } } return $this->table_array; @@ -1098,11 +1113,11 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO } reset($this->table_array); foreach ($this->table_array as $key => $value) { - unset($this->table_array[$key]["value"]); - unset($this->table_array[$key]["input_value"]); + unset($this->table_array[$key]['value']); + unset($this->table_array[$key]['input_value']); // if preset var present preset - if (isset($this->table_array[$key]["preset"])) { - $this->table_array[$key]["value"] = $this->table_array[$key]["preset"]; + if (isset($this->table_array[$key]['preset'])) { + $this->table_array[$key]['value'] = $this->table_array[$key]['preset']; } } if (is_array($this->reference_array)) { @@ -1111,11 +1126,11 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO } reset($this->reference_array); foreach ($this->reference_array as $key => $value) { - unset($this->reference_array[$key]["selected"]); + unset($this->reference_array[$key]['selected']); } } $this->warning = 1; - $this->msg = $this->l->__("Cleared for new Dataset!"); + $this->msg = $this->l->__('Cleared for new Dataset!'); } // METHOD: formLoadTableArray @@ -1136,7 +1151,7 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO } reset($this->table_array); foreach ($this->table_array as $key => $value) { - unset($this->table_array[$key]["input_value"]); + unset($this->table_array[$key]['input_value']); } if (is_array($this->reference_array)) { @@ -1146,15 +1161,15 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO } reset($this->reference_array); foreach ($this->reference_array as $key => $value) { - unset($this->reference_array[$key]["selected"]); - $q = "SELECT ".$this->reference_array[$key]["other_table_pk"]." FROM ".$this->reference_array[$key]["table_name"]." WHERE ".$this->int_pk_name."=".$this->table_array[$this->int_pk_name]["value"]; + unset($this->reference_array[$key]['selected']); + $q = 'SELECT '.$this->reference_array[$key]['other_table_pk'].' FROM '.$this->reference_array[$key]['table_name'].' WHERE '.$this->int_pk_name.' = '.$this->table_array[$this->int_pk_name]['value']; while ($res = $this->dbReturn($q)) { - $this->reference_array[$key]["selected"][] = $res[$this->reference_array[$key]["other_table_pk"]]; + $this->reference_array[$key]['selected'][] = $res[$this->reference_array[$key]['other_table_pk']]; } } } $this->warning = 1; - $this->msg = $this->l->__("Dataset has been loaded!
"); + $this->msg = $this->l->__('Dataset has been loaded!
'); } // METHOD: formSaveTableArray @@ -1172,97 +1187,97 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO reset($this->table_array); foreach ($this->table_array as $key => $value) { // drop_down_db with input + reference table - // $this->debug('form', "A: ".$this->table_array[$key]["type"]." --- ".$this->table_array[$key]["input_value"]); - if ($this->table_array[$key]["type"] == "drop_down_db_input" && $this->table_array[$key]["input_value"]) { - // $this->debug('form', "HERE"); + // $this->debug('form', 'A: '.$this->table_array[$key]['type'].' --- '.$this->table_array[$key]['input_value']); + if ($this->table_array[$key]['type'] == 'drop_down_db_input' && $this->table_array[$key]['input_value']) { + // $this->debug('form', 'HERE'); // check if this text name already exists (lowercase compare) - $q = "SELECT ".$this->table_array[$key]["pk_name"]." FROM ".$this->table_array[$key]["table_name"]." WHERE LCASE(".$this->table_array[$key]["input_name"].") = '".$this->dbEscapeString(strtolower($this->table_array[$key]["input_value"]))."'"; + $q = 'SELECT '.$this->table_array[$key]['pk_name'].' FROM '.$this->table_array[$key]['table_name'].' WHERE LCASE('.$this->table_array[$key]['input_name'].') = '."'".$this->dbEscapeString(strtolower($this->table_array[$key]['input_value']))."'"; // if a where was given, add here - if ($this->table_array[$key]["where"]) { - $q .= " AND ".$this->table_array[$key]["where"]; + if ($this->table_array[$key]['where']) { + $q .= ' AND '.$this->table_array[$key]['where']; } list($pk_name_temp) = $this->dbReturnRow($q); if ($this->num_rows >= 1) { - $this->table_array[$key]["value"] = $pk_name_temp; + $this->table_array[$key]['value'] = $pk_name_temp; } else { // if a where was given, set this key also [dangerous!] // postgreSQL compatible insert - $q = "INSERT INTO ".$this->table_array[$key]["table_name"]." (".$this->table_array[$key]["input_name"].") VALUES ('".$this->dbEscapeString($this->table_array[$key]["input_value"])."')"; + $q = 'INSERT INTO '.$this->table_array[$key]['table_name'].' ('.$this->table_array[$key]['input_name'].') VALUES ('."'".$this->dbEscapeString($this->table_array[$key]['input_value'])."')"; $this->dbExec($q); - if ($this->table_array[$key]["where"]) { + if ($this->table_array[$key]['where']) { // make an update on the just inseted data with the where data als update values - $q = "UPDATE ".$this->table_array[$key]["table_name"]." SET "; - $q .= $this->table_array[$key]["where"]." "; - $q .= "WHERE ".$this->table_array[$key]["pk_name"]." = ".$this->insert_id; + $q = 'UPDATE '.$this->table_array[$key]['table_name'].' SET '; + $q .= $this->table_array[$key]['where'].' '; + $q .= 'WHERE '.$this->table_array[$key]['pk_name'].' = '.$this->insert_id; $this->dbExec($q); } - $this->table_array[$key]["value"] = $this->insert_id; + $this->table_array[$key]['value'] = $this->insert_id; } // set value from DB through select or insert - unset($this->table_array[$key]["input_value"]); + unset($this->table_array[$key]['input_value']); } // if it is certain field type && if there is something in the temp field // drop_down_db with input and in same table - if ($this->table_array[$key]["type"] == "drop_down_db_input_same_db" && $this->table_array[$key]["input_value"]) { + if ($this->table_array[$key]['type'] == 'drop_down_db_input_same_db' && $this->table_array[$key]['input_value']) { // if drop down & input are different - if ($this->table_array[$key]["input_value"] != $this->table_array[$key]["value"]) { - // check if "right input" is in DB - $q = "SELECT ".$this->table_array[$key]["input_name"]." FROM ".$this->table_array[$key]["table_name"]." WHERE LCASE(".$this->table_array[$key]["input_name"].") = '".strtolower($this->dbEscapeString($this->table_array[$key]["input_value"]))."'"; + if ($this->table_array[$key]['input_value'] != $this->table_array[$key]['value']) { + // check if 'right input' is in DB + $q = 'SELECT '.$this->table_array[$key]['input_name'].' FROM '.$this->table_array[$key]['table_name'].' WHERE LCASE('.$this->table_array[$key]['input_name'].') = '."'".strtolower($this->dbEscapeString($this->table_array[$key]['input_value']))."'"; // if a where was given, add here - if ($this->table_array[$key]["where"]) { - $q .= " AND ".$this->table_array[$key]["where"]; + if ($this->table_array[$key]['where']) { + $q .= ' AND '.$this->table_array[$key]['where']; } list($temp) = $this->dbReturnRow($q); // nothing found in table, use new inserted key if (!$temp) { - $this->table_array[$key]["value"] = $this->table_array[$key]["input_value"]; + $this->table_array[$key]['value'] = $this->table_array[$key]['input_value']; } else { // found in DB - $this->table_array[$key]["input_value"] = $this->table_array[$key]["value"]; + $this->table_array[$key]['input_value'] = $this->table_array[$key]['value']; } } // key difference ? } // for same_db drop down // upload & save files to locations - if ($this->table_array[$key]["type"] == "file") { + if ($this->table_array[$key]['type'] == 'file') { // if smth in $$key_file -> save or overwrite // if smth in $key && $$key_delete && !$$key_file-> delte // if smth in $key, keep as is - // $_file=$key."_file"; - // $_delete=$key."_delete"; - // $this->debug('form', "UF: ".$GLOBALS["_FILES"][$key."_file"]['name']); - // $this->debug('form', "delete: ".$key."_delete => ".$GLOBALS[$key.'_delete']); - if ($GLOBALS["_FILES"][$key."_file"]['name']) { + // $_file=$key.'_file'; + // $_delete=$key.'_delete'; + // $this->debug('form', 'UF: '.$GLOBALS['_FILES'][$key.'_file']['name']); + // $this->debug('form', 'delete: '.$key.'_delete => '.$GLOBALS[$key.'_delete']); + if ($GLOBALS['_FILES'][$key.'_file']['name']) { // check if dir exists - if (is_dir($this->table_array[$key]["save_dir"])) { + if (is_dir($this->table_array[$key]['save_dir'])) { //if a slash at the end (if not add slash) - if (!preg_match("|/$|", $this->table_array[$key]["save_dir"])) { - $this->table_array[$key]["save_dir"] .= "/"; + if (!preg_match("|/$|", $this->table_array[$key]['save_dir'])) { + $this->table_array[$key]['save_dir'] .= '/'; } - if (move_uploaded_file($GLOBALS["_FILES"][$key."_file"]['tmp_name'], $this->table_array[$key]["save_dir"].$GLOBALS["_FILES"][$key."_file"]['name'])) { + if (move_uploaded_file($GLOBALS['_FILES'][$key.'_file']['tmp_name'], $this->table_array[$key]['save_dir'].$GLOBALS['_FILES'][$key.'_file']['name'])) { // make it unique with a unique number at the beginning - $this->table_array[$key]["value"] = uniqid(rand(), 1)."_".$GLOBALS["_FILES"][$key."_file"]['name']; + $this->table_array[$key]['value'] = uniqid(rand(), 1).'_'.$GLOBALS['_FILES'][$key.'_file']['name']; } else { - $this->msg .= $this->l->__("File could not be copied to target directory! Perhaps wrong directory permissions."); + $this->msg .= $this->l->__('File could not be copied to target directory! Perhaps wrong directory permissions.'); $this->error = 1; } // could not move file (dir permissions?) } else { - $this->msg .= sprintf($this->l->__("Target Directory \"%s\" is not a vaild directory!"), $this->table_array[$key]["save_dir"]); + $this->msg .= sprintf($this->l->__('Target Directory \'%s\' is not a vaild directory!'), $this->table_array[$key]['save_dir']); $this->error = 1; } // could not dir check (dir wrong??) } - if ($GLOBALS[$key.'_delete'] && $this->table_array[$key]["value"] && !$GLOBALS["_FILES"][$key."_file"]['name']) { - unlink($this->table_array[$key]["save_dir"].$this->table_array[$key]["value"]); - unset($this->table_array[$key]["value"]); + if ($GLOBALS[$key.'_delete'] && $this->table_array[$key]['value'] && !$GLOBALS['_FILES'][$key.'_file']['name']) { + unlink($this->table_array[$key]['save_dir'].$this->table_array[$key]['value']); + unset($this->table_array[$key]['value']); } } // for password crypt it as blowfish, or if not available MD5 if ($this->table_array[$key]['type'] == 'password') { - if ($this->table_array[$key]["value"]) { + if ($this->table_array[$key]['value']) { // use the better new passwordSet instead of crypt based $this->table_array[$key]['value'] = $this->passwordSet($this->table_array[$key]['value']); - $this->table_array[$key]["HIDDEN_value"] = $this->table_array[$key]["value"]; + $this->table_array[$key]['HIDDEN_value'] = $this->table_array[$key]['value']; } else { - // $this->table_array[$key]["HIDDEN_value"] = + // $this->table_array[$key]['HIDDEN_value'] = } } } // go through each field @@ -1278,11 +1293,11 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO } reset($this->reference_array); foreach ($this->reference_array as $reference_array) { - $q = "DELETE FROM ".$reference_array["table_name"]." WHERE ".$this->int_pk_name."=".$this->table_array[$this->int_pk_name]["value"]; + $q = 'DELETE FROM '.$reference_array['table_name'].' WHERE '.$this->int_pk_name.'='.$this->table_array[$this->int_pk_name]['value']; $this->dbExec($q); - $q = "INSERT INTO ".$reference_array["table_name"]." (".$reference_array["other_table_pk"].", ".$this->int_pk_name.") VALUES "; - for ($i = 0, $i_max = count($reference_array["selected"]); $i < $i_max; $i ++) { - $t_q = "(".$reference_array["selected"][$i].", ".$this->table_array[$this->int_pk_name]["value"].")"; + $q = 'INSERT INTO '.$reference_array['table_name'].' ('.$reference_array['other_table_pk'].', '.$this->int_pk_name.') VALUES '; + for ($i = 0, $i_max = count($reference_array['selected']); $i < $i_max; $i ++) { + $t_q = '('.$reference_array['selected'][$i].', '.$this->table_array[$this->int_pk_name]['value'].')'; $this->dbExec($q.$t_q); } } // foreach reference arrays @@ -1299,9 +1314,9 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO $q_data = array (); $q_values = array (); // get the number of keys from the elements array - $keys = array_keys($reference_array["elements"]); + $keys = array_keys($reference_array['elements']); // element prefix name - $prfx = ($reference_array["prefix"]) ? $reference_array["prefix"]."_" : ''; + $prfx = ($reference_array['prefix']) ? $reference_array['prefix'].'_' : ''; // get max elements $max = 0; foreach ($keys as $key) { @@ -1309,18 +1324,18 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO $max = count($_POST[$prfx.$key]); } } - // $this->debug('edit_error', "MAX: $max"); + // $this->debug('edit_error', 'MAX: $max'); // check if there is a hidden key, update, else insert - foreach ($reference_array["elements"] as $el_name => $data_array) { + foreach ($reference_array['elements'] as $el_name => $data_array) { // this is only for reference_data part, at least one of the text fields need to be set for writing $blow_write = array (); - // $this->debug('edit_error_query', "QUERY: ".$this->printAr($_POST)); + // $this->debug('edit_error_query', 'QUERY: '.$this->printAr($_POST)); // go through all submitted data // for ($i = 0; $i < count($_POST[$el_name]); $i ++) for ($i = 0; $i < $max; $i ++) { // if we have enable name & delete set, then only insert/update those which are flagged as active - // check if mandatory field is set, if not set "do not write flag" - if ($data_array["mandatory"] && !$_POST[$prfx.$el_name][$i]) { + // check if mandatory field is set, if not set 'do not write flag' + if ($data_array['mandatory'] && !$_POST[$prfx.$el_name][$i]) { $no_write[$i] = 1; } if ($reference_array['enable_name'] && $reference_array['delete'] && !$_POST[$reference_array['enable_name']][$i]) { @@ -1335,33 +1350,33 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO $block_write[$i] = 1; } // set type and boundaries for insert/update - if ($data_array["pk_id"] && $_POST[$prfx.$el_name][$i]) { - $q_begin[$i] = "UPDATE $table_name SET "; - $q_end[$i] = " WHERE $el_name = ".$_POST[$prfx.$el_name][$i]; - $type[$i] = "update"; - } elseif ($data_array["pk_id"] && !$_POST[$prfx.$el_name][$i]) { - $q_begin[$i] = "INSERT INTO $table_name ("; - $q_middle[$i] = ") VALUES ("; - $q_end[$i] = ")"; - $type[$i] = "insert"; + if ($data_array['pk_id'] && $_POST[$prfx.$el_name][$i]) { + $q_begin[$i] = 'UPDATE $table_name SET '; + $q_end[$i] = ' WHERE $el_name = '.$_POST[$prfx.$el_name][$i]; + $type[$i] = 'update'; + } elseif ($data_array['pk_id'] && !$_POST[$prfx.$el_name][$i]) { + $q_begin[$i] = 'INSERT INTO $table_name ('; + $q_middle[$i] = ') VALUES ('; + $q_end[$i] = ')'; + $type[$i] = 'insert'; } // write all data (insert/update) because I don't know until all are processed if it is insert or update // don't write primary key backup for update // for reference_data type, only write if at least one text type field is set - // $this->debug('edit_error', "I: $i | EL Name: $prfx$el_name | Data: ".$_POST[$prfx.$el_name][$i]." | Type: ".$type[$i]." | PK: ".$data_array["pk_id"].", Block write: ".$block_write[$i]); + // $this->debug('edit_error', 'I: $i | EL Name: $prfx$el_name | Data: '.$_POST[$prfx.$el_name][$i].' | Type: '.$type[$i].' | PK: '.$data_array['pk_id'].', Block write: '.$block_write[$i]); // only add elements that are not PK or FK flaged if (!$data_array['pk_id'] && !$data_array['fk_id']) { // update data list if (strlen($q_data[$i])) { - $q_data[$i] .= ", "; + $q_data[$i] .= ', '; } // insert name part list if (strlen($q_names[$i])) { - $q_names[$i] .= ", "; + $q_names[$i] .= ', '; } // insert value part list if (strlen($q_values[$i])) { - $q_values[$i] .= ", "; + $q_values[$i] .= ', '; } // insert column name add $q_names[$i] .= $el_name; @@ -1383,11 +1398,11 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO } elseif (!isset($_value)) { $_value = 0; } - $q_data[$i] .= $el_name." = ".$_value; + $q_data[$i] .= $el_name.' = '.$_value; $q_values[$i] .= $_value; } else { // normal data gets escaped - $q_data[$i] .= $el_name." = '".$this->dbEscapeString($_value)."'"; + $q_data[$i] .= $el_name.' = '."'".$this->dbEscapeString($_value)."'"; $q_values[$i] .= "'".$this->dbEscapeString($_value)."'"; } } @@ -1397,12 +1412,12 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO for ($i = 0, $i_max = count($type); $i < $i_max; $i ++) { $q = ''; if (!$no_write[$i]) { - if ($type[$i] == "update") { + if ($type[$i] == 'update') { $q = $q_begin[$i].$q_data[$i].$q_end[$i]; } elseif ($block_write[$i]) { - $q = $q_begin[$i].$q_names[$i].", ".$this->int_pk_name.$q_middle[$i].$q_values[$i].", ".$this->table_array[$this->int_pk_name]["value"].$q_end[$i]; + $q = $q_begin[$i].$q_names[$i].', '.$this->int_pk_name.$q_middle[$i].$q_values[$i].', '.$this->table_array[$this->int_pk_name]['value'].$q_end[$i]; } - $this->debug('edit', "Pos[$i] => ".$type[$i]." Q: ".$q."
"); + $this->debug('edit', 'Pos[$i] => '.$type[$i].' Q: '.$q.'
'); // write the dataset if ($q) { $this->dbExec($q); @@ -1412,7 +1427,7 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO } // each element list } $this->warning = 1; - $this->msg = $this->l->__("Dataset has been saved!
"); + $this->msg = $this->l->__('Dataset has been saved!
'); } // METHOD: formDeleteTableArray @@ -1429,7 +1444,7 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO } reset($this->reference_array); foreach ($this->reference_array as $reference_array) { - $q = "DELETE FROM ".$reference_array["table_name"]." WHERE ".$this->int_pk_name." = ".$this->table_array[$this->int_pk_name]["value"]; + $q = 'DELETE FROM '.$reference_array['table_name'].' WHERE '.$this->int_pk_name.' = '.$this->table_array[$this->int_pk_name]['value']; $this->dbExec($q); } } @@ -1440,7 +1455,7 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO } reset($this->element_list); foreach ($this->element_list as $table_name => $data_array) { - $q = "DELETE FROM ".$table_name." WHERE ".$this->int_pk_name." = ".$this->table_array[$this->int_pk_name]["value"]; + $q = 'DELETE FROM '.$table_name.' WHERE '.$this->int_pk_name.' = '.$this->table_array[$this->int_pk_name]['value']; $this->dbExec($q); } } @@ -1450,13 +1465,13 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO } reset($this->table_array); foreach ($this->table_array as $key => $value) { - if ($this->table_array[$key]["type"] == "file") { - unlink($this->table_array[$key]["save_dir"].$this->table_array[$key]["value"]); + if ($this->table_array[$key]['type'] == 'file') { + unlink($this->table_array[$key]['save_dir'].$this->table_array[$key]['value']); } } $this->dbDelete(); $this->warning = 1; - $this->msg = $this->l->__("Dataset has been deleted!"); + $this->msg = $this->l->__('Dataset has been deleted!'); } // METHOD: formCreateHiddenFields @@ -1472,9 +1487,9 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO } reset($this->table_array); foreach ($this->table_array as $key => $value) { - if ($this->table_array[$key]["type"] == "hidden") { + if ($this->table_array[$key]['type'] == 'hidden') { if (array_key_exists($key, $this->table_array)) { - $hidden_array[$key] = $this->table_array[$key]["value"]; + $hidden_array[$key] = $this->table_array[$key]['value']; } else { $hidden_array[$key] = ''; } @@ -1496,16 +1511,16 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO // DESC : creates the multiple select part for a reference_table public function formCreateElementReferenceTable($table_name) { - $output_name = $this->reference_array[$table_name]["output_name"]; - if ($this->reference_array[$table_name]["mandatory"]) { + $output_name = $this->reference_array[$table_name]['output_name']; + if ($this->reference_array[$table_name]['mandatory']) { $output_name .= ' *'; } - $data['name'] = $this->reference_array[$table_name]["other_table_pk"]; - $data['size'] = $this->reference_array[$table_name]["select_size"]; - while ($res = $this->dbReturn($this->reference_array[$table_name]["query"])) { + $data['name'] = $this->reference_array[$table_name]['other_table_pk']; + $data['size'] = $this->reference_array[$table_name]['select_size']; + while ($res = $this->dbReturn($this->reference_array[$table_name]['query'])) { $data['value'][] = $res[0]; $data['output'][] = $res[1]; - $data['selected'][] = ($this->checked($this->reference_array[$table_name]["selected"], $res[0])) ? $res[0] : ''; + $data['selected'][] = ($this->checked($this->reference_array[$table_name]['selected'], $res[0])) ? $res[0] : ''; } $type = 'reference_table'; return array('output_name' => $output_name, 'type' => $type, 'color' => 'edit_fgcolor', 'data' => $data); @@ -1521,43 +1536,43 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO public function formCreateElementListTable($table_name) { // output name for the viewable left table td box, prefixed with * if mandatory - $output_name = $this->element_list[$table_name]["output_name"]; - if ($this->element_list[$table_name]["mandatory"]) { + $output_name = $this->element_list[$table_name]['output_name']; + if ($this->element_list[$table_name]['mandatory']) { $output_name .= ' *'; } // delete button name, if there is one set - if ($this->element_list[$table_name]["delete_name"]) { - $data['delete_name'] = $this->element_list[$table_name]["delete_name"]; + if ($this->element_list[$table_name]['delete_name']) { + $data['delete_name'] = $this->element_list[$table_name]['delete_name']; } // set the enable checkbox for delete, if the delete flag is given if there is one - if ($this->element_list[$table_name]["enable_name"]) { - $data['enable_name'] = $this->element_list[$table_name]["enable_name"]; - if ($this->element_list[$table_name]["delete"]) { + if ($this->element_list[$table_name]['enable_name']) { + $data['enable_name'] = $this->element_list[$table_name]['enable_name']; + if ($this->element_list[$table_name]['delete']) { $data['delete'] = 1; } } // prefix for the elements, to not collide with names in the master set - if ($this->element_list[$table_name]["prefix"]) { - $data["prefix"] = $this->element_list[$table_name]["prefix"]."_"; + if ($this->element_list[$table_name]['prefix']) { + $data['prefix'] = $this->element_list[$table_name]['prefix'].'_'; } // the sub data table name $data['table_name'] = $table_name; // build the select part - if (!is_array($this->element_list[$table_name]["elements"])) { - $this->element_list[$table_name]["elements"] = array (); + if (!is_array($this->element_list[$table_name]['elements'])) { + $this->element_list[$table_name]['elements'] = array (); } - reset($this->element_list[$table_name]["elements"]); + reset($this->element_list[$table_name]['elements']); // generic data read in (counts for all rows) // visible list data output - foreach ($this->element_list[$table_name]["elements"] as $el_name => $data_array) { + foreach ($this->element_list[$table_name]['elements'] as $el_name => $data_array) { $this->debug('CFG', 'El: '.$el_name.' -> '.$this->printAr($data_array)); // if the element name matches the read array, then set the table as a name prefix $q_select[] = $el_name; // this is for reading the data // prefix the name for any further data parts - $el_name = $data["prefix"].$el_name; - $data['output_name'][$el_name] = $data_array["output_name"]; // this are the output names (if given) - $data['type'][$el_name] = $data_array["type"]; /// this is the type of the field + $el_name = $data['prefix'].$el_name; + $data['output_name'][$el_name] = $data_array['output_name']; // this are the output names (if given) + $data['type'][$el_name] = $data_array['type']; /// this is the type of the field // set the primary key name if ($data_array['pk_id']) { $data['pk_name'] = $el_name; @@ -1570,17 +1585,17 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO if ($data_array['type'] == 'drop_down_db') { $md_q = md5($data_array['query']); while ($res = $this->dbReturn($data_array['query'])) { - $this->debug('edit', "Q[$md_q] pos: ".$this->cursor_ext[$md_q]["pos"]." | want: ".$data_array["preset"]." | set: ".$data['preset'][$el_name]); + $this->debug('edit', 'Q[$md_q] pos: '.$this->cursor_ext[$md_q]['pos'].' | want: '.$data_array['preset'].' | set: '.$data['preset'][$el_name]); // first is default for this element - if (!$data['preset'][$el_name] && ($this->cursor_ext[$md_q]["pos"] == $data_array['preset'])) { + if (!$data['preset'][$el_name] && ($this->cursor_ext[$md_q]['pos'] == $data_array['preset'])) { $data['preset'][$el_name] = $res[0]; } // split up data, 0 is id, 1 name $data['element_list'][$el_name][] = $res[0]; $data['output_data'][$el_name][] = $res[1]; } - } elseif ($data_array["element_list"]) { - $data['element_list'][$el_name] = $data_array["element_list"]; // this is for the checkboxes + } elseif ($data_array['element_list']) { + $data['element_list'][$el_name] = $data_array['element_list']; // this is for the checkboxes } $this->debug('CREATE ELEMENT LIST TABLE', 'Post: '.$el_name.' => '.$_POST[$el_name].' => '.is_array($_POST[$el_name])); // if error, check new line addition so we don't loose it @@ -1600,9 +1615,9 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO // $this->debug('CFG PROTO', 'Proto: '.$this->printAr($proto)); // $this->debug('CFG SELECT', 'Proto: '.$this->printAr($q_select)); // query for reading in the data - $this->debug('edit_error', "ERR: ".$this->error); - // if we got a read data, build the read select for the read, and read out the "selected" data - if ($this->element_list[$table_name]["read_data"]) { + $this->debug('edit_error', 'ERR: '.$this->error); + // if we got a read data, build the read select for the read, and read out the 'selected' data + if ($this->element_list[$table_name]['read_data']) { // we need a second one for the query build only // prefix all elements with the $table name foreach ($q_select as $_pos => $element) { @@ -1610,38 +1625,38 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO } // add the read names in here, prefix them with the table name // earch to read part is split by | - if ($this->element_list[$table_name]["read_data"]["name"]) { - foreach (explode('|', $this->element_list[$table_name]["read_data"]["name"]) as $read_name) { - array_unshift($_q_select, $this->element_list[$table_name]["read_data"]["table_name"].'.'.$read_name); + if ($this->element_list[$table_name]['read_data']['name']) { + foreach (explode('|', $this->element_list[$table_name]['read_data']['name']) as $read_name) { + array_unshift($_q_select, $this->element_list[$table_name]['read_data']['table_name'].'.'.$read_name); array_unshift($q_select, $read_name); } } // set the rest of the data so we can print something out - $data['type'][$data["prefix"].$this->element_list[$table_name]["read_data"]["name"]] = 'string'; + $data['type'][$data['prefix'].$this->element_list[$table_name]['read_data']['name']] = 'string'; // build the read query - $q = "SELECT "; - // if (!$this->table_array[$this->int_pk_name]["value"]) - // $q .= "DISTINCT "; + $q = 'SELECT '; + // if (!$this->table_array[$this->int_pk_name]['value']) + // $q .= 'DISTINCT '; // prefix join key with table name, and implode the query select part - $q .= str_replace($table_name.'.'.$this->element_list[$table_name]["read_data"]["pk_id"], $this->element_list[$table_name]["read_data"]["table_name"].'.'.$this->element_list[$table_name]["read_data"]["pk_id"], implode(', ', $_q_select)).' '; - // if (!$this->table_array[$this->int_pk_name]["value"] && $this->element_list[$table_name]["read_data"]["order"]) - // $q .= ", ".$this->element_list[$table_name]["read_data"]["order"]." "; + $q .= str_replace($table_name.'.'.$this->element_list[$table_name]['read_data']['pk_id'], $this->element_list[$table_name]['read_data']['table_name'].'.'.$this->element_list[$table_name]['read_data']['pk_id'], implode(', ', $_q_select)).' '; + // if (!$this->table_array[$this->int_pk_name]['value'] && $this->element_list[$table_name]['read_data']['order']) + // $q .= ', '.$this->element_list[$table_name]['read_data']['order'].' '; // read from the read table as main, and left join to the sub table to read the actual data - $q .= "FROM ".$this->element_list[$table_name]["read_data"]["table_name"]." "; - $q .= "LEFT JOIN ".$table_name." "; - $q .= "ON ("; - $q .= $this->element_list[$table_name]["read_data"]["table_name"].".".$this->element_list[$table_name]["read_data"]["pk_id"]." = ".$table_name.".".$this->element_list[$table_name]["read_data"]["pk_id"]." "; - // if ($this->table_array[$this->int_pk_name]["value"]) - $q .= "AND ".$table_name.".".$this->int_pk_name." = ".(($this->table_array[$this->int_pk_name]["value"]) ? $this->table_array[$this->int_pk_name]["value"] : 'NULL')." "; - $q .= ") "; - if ($this->element_list[$table_name]["read_data"]["order"]) { - $q .= " ORDER BY ".$this->element_list[$table_name]["read_data"]["table_name"].'.'.$this->element_list[$table_name]["read_data"]["order"]; + $q .= 'FROM '.$this->element_list[$table_name]['read_data']['table_name'].' '; + $q .= 'LEFT JOIN '.$table_name.' '; + $q .= 'ON ('; + $q .= $this->element_list[$table_name]['read_data']['table_name'].'.'.$this->element_list[$table_name]['read_data']['pk_id'].' = '.$table_name.'.'.$this->element_list[$table_name]['read_data']['pk_id'].' '; + // if ($this->table_array[$this->int_pk_name]['value']) + $q .= 'AND '.$table_name.'.'.$this->int_pk_name.' = '.(($this->table_array[$this->int_pk_name]['value']) ? $this->table_array[$this->int_pk_name]['value'] : 'NULL').' '; + $q .= ') '; + if ($this->element_list[$table_name]['read_data']['order']) { + $q .= ' ORDER BY '.$this->element_list[$table_name]['read_data']['table_name'].'.'.$this->element_list[$table_name]['read_data']['order']; } } else { // only create query if we have a primary key // reads directly from the reference table - if ($this->table_array[$this->int_pk_name]["value"]) { - $q = "SELECT ".implode(", ", $q_select)." FROM ".$table_name." WHERE ".$this->int_pk_name." = ".$this->table_array[$this->int_pk_name]["value"]; + if ($this->table_array[$this->int_pk_name]['value']) { + $q = 'SELECT '.implode(', ', $q_select).' FROM '.$table_name.' WHERE '.$this->int_pk_name.' = '.$this->table_array[$this->int_pk_name]['value']; } } // $this->debug('CFG QUERY', 'Q: '.$q); @@ -1651,12 +1666,12 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO // read out the list and add the selected data if needed while ($res = $this->dbReturn($q)) { $_data = array (); - $prfx = $data["prefix"]; // short + $prfx = $data['prefix']; // short // go through each res for ($i = 0, $i_max = count($q_select); $i < $i_max; $i ++) { // query select part, set to the element name $el_name = $q_select[$i]; - // $this->debug('edit_error', "[$i] ELNAME: $el_name | POS[$prfx$el_name]: ".$_POST[$prfx.$el_name][$pos]." | RES: ".$res[$el_name]); + // $this->debug('edit_error', '[$i] ELNAME: $el_name | POS[$prfx$el_name]: '.$_POST[$prfx.$el_name][$pos].' | RES: '.$res[$el_name]); // if we have an error, we take what we have in the vars, if not we take the data from the db if ($this->error) { // if we have a radio group, set a bit different @@ -1666,8 +1681,8 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO $_data[$prfx.$el_name] = $_POST[$prfx.$el_name][$pos]; } } else { - if ($data["preset"][$prfx.$el_name] && !$res[$el_name]) { - $_data[$prfx.$el_name] = $data["preset"][$el_name]; + if ($data['preset'][$prfx.$el_name] && !$res[$el_name]) { + $_data[$prfx.$el_name] = $data['preset'][$el_name]; } else { $_data[$prfx.$el_name] = $res[$el_name]; } @@ -1698,12 +1713,12 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO // the fields that need to be filled are in data->type array: // pk fields are unfilled - // fk fields are filled with the fk_id "int_pk_name" value + // fk fields are filled with the fk_id 'int_pk_name' value foreach ($data['type'] as $el_name => $type) { $_data[$el_name] = ''; if ($el_name == $data['pk_name']) { } elseif ($el_name == $data['fk_name']) { - $_data[$el_name] = $this->table_array[$this->int_pk_name]["value"]; + $_data[$el_name] = $this->table_array[$this->int_pk_name]['value']; } } $data['content'][] = $_data; @@ -1716,7 +1731,7 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO if ($data['delete_name']) { $data['content'][] = $proto; } - // $this->debug('edit', "A:
".print_r($data, 1)."
"); + // $this->debug('edit', 'A:
'.print_r($data, 1).'
'); $type = 'element_list'; return array('output_name' => $output_name, 'type' => $type, 'color' => 'edit_fgcolor', 'data' => $data); }