diff --git a/app/database_transactions/database_transaction_edit.php b/app/database_transactions/database_transaction_edit.php index 95169961d7..0e95a04819 100644 --- a/app/database_transactions/database_transaction_edit.php +++ b/app/database_transactions/database_transaction_edit.php @@ -17,7 +17,7 @@ The Initial Developer of the Original Code is Mark J Crane - Portions created by the Initial Developer are Copyright (C) 2016 - 2017 + Portions created by the Initial Developer are Copyright (C) 2016 - 2018 the Initial Developer. All Rights Reserved. Contributor(s): @@ -44,128 +44,8 @@ //action add or update if (isset($_REQUEST["id"])) { - //$action = "update"; $database_transaction_uuid = check_str($_REQUEST["id"]); } - //else { - // $action = "add"; - //} - -//get http post variables and set them to php variables - /* - if (count($_POST) > 0) { - $user_uuid = check_str($_POST["user_uuid"]); - $app_uuid = check_str($_POST["app_uuid"]); - $transaction_code = check_str($_POST["transaction_code"]); - $transaction_address = check_str($_POST["transaction_address"]); - $transaction_type = check_str($_POST["transaction_type"]); - $transaction_date = check_str($_POST["transaction_date"]); - $transaction_old = check_str($_POST["transaction_old"]); - $transaction_new = check_str($_POST["transaction_new"]); - $transaction_result = check_str($_POST["transaction_result"]); - } - */ - -//process the data - /* - if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { - - $msg = ''; - if ($action == "update") { - $database_transaction_uuid = check_str($_POST["database_transaction_uuid"]); - } - - //check for all required data - if (strlen($domain_uuid) == 0) { $msg .= $text['message-required']." ".$text['label-domain_uuid']."
\n"; } - if (strlen($user_uuid) == 0) { $msg .= $text['message-required']." ".$text['label-user_uuid']."
\n"; } - if (strlen($app_uuid) == 0) { $msg .= $text['message-required']." ".$text['label-app_uuid']."
\n"; } - if (strlen($transaction_code) == 0) { $msg .= $text['message-required']." ".$text['label-transaction_code']."
\n"; } - if (strlen($transaction_address) == 0) { $msg .= $text['message-required']." ".$text['label-transaction_address']."
\n"; } - if (strlen($transaction_type) == 0) { $msg .= $text['message-required']." ".$text['label-transaction_type']."
\n"; } - if (strlen($transaction_date) == 0) { $msg .= $text['message-required']." ".$text['label-transaction_date']."
\n"; } - if (strlen($transaction_old) == 0) { $msg .= $text['message-required']." ".$text['label-transaction_old']."
\n"; } - if (strlen($transaction_new) == 0) { $msg .= $text['message-required']." ".$text['label-transaction_new']."
\n"; } - if (strlen($transaction_result) == 0) { $msg .= $text['message-required']." ".$text['label-transaction_result']."
\n"; } - if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) { - require_once "resources/header.php"; - require_once "resources/persist_form_var.php"; - echo "
\n"; - echo "
\n"; - echo $msg."
"; - echo "
\n"; - persistformvar($_POST); - echo "
\n"; - require_once "resources/footer.php"; - return; - } - - //add or update the database - if ($_POST["persistformvar"] != "true") { - if ($action == "add" && permission_exists('database_transaction_add')) { - $sql = "insert into v_database_transactions "; - $sql .= "("; - $sql .= "domain_uuid, "; - $sql .= "database_transaction_uuid, "; - $sql .= "domain_uuid, "; - $sql .= "user_uuid, "; - $sql .= "app_uuid, "; - $sql .= "transaction_code, "; - $sql .= "transaction_address, "; - $sql .= "transaction_type, "; - $sql .= "transaction_date, "; - $sql .= "transaction_old, "; - $sql .= "transaction_new, "; - $sql .= "transaction_result "; - $sql .= ")"; - $sql .= "values "; - $sql .= "("; - $sql .= "'$domain_uuid', "; - $sql .= "'".uuid()."', "; - $sql .= "'$domain_uuid', "; - $sql .= "'$user_uuid', "; - $sql .= "'$app_uuid', "; - $sql .= "'$transaction_code', "; - $sql .= "'$transaction_address', "; - $sql .= "'$transaction_type', "; - $sql .= "now(), "; - $sql .= "'$transaction_old', "; - $sql .= "'$transaction_new', "; - $sql .= "'$transaction_result' "; - $sql .= ")"; - $db->exec(check_sql($sql)); - unset($sql); - - messages::add($text['message-add']); - header("Location: database_transactions.php"); - return; - - } //if ($action == "add") - - if ($action == "update" && permission_exists('database_transaction_edit')) { - $sql = "update v_database_transactions set "; - $sql .= "domain_uuid = '$domain_uuid', "; - $sql .= "user_uuid = '$user_uuid', "; - $sql .= "app_uuid = '$app_uuid', "; - $sql .= "transaction_code = '$transaction_code', "; - $sql .= "transaction_address = '$transaction_address', "; - $sql .= "transaction_type = '$transaction_type', "; - $sql .= "transaction_date = now(), "; - $sql .= "transaction_old = '$transaction_old', "; - $sql .= "transaction_new = '$transaction_new', "; - $sql .= "transaction_result = '$transaction_result' "; - $sql .= "where database_transaction_uuid = '$database_transaction_uuid'"; - $sql .= "and domain_uuid = '$domain_uuid' "; - $db->exec(check_sql($sql)); - unset($sql); - - messages::add($text['message-update']); - header("Location: database_transactions.php"); - return; - - } //if ($action == "update") - } //if ($_POST["persistformvar"] != "true") - } //(count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) - */ //pre-populate the form if (count($_GET) > 0 && $_POST["persistformvar"] != "true") { @@ -196,7 +76,7 @@ $username = $row["username"]; $transaction_code = $row["transaction_code"]; $transaction_address = $row["transaction_address"]; - //$transaction_type = $row["transaction_type"]; + $transaction_type = $row["transaction_type"]; $transaction_date = $row["transaction_date"]; $transaction_old = $row["transaction_old"]; $transaction_new = $row["transaction_new"]; @@ -205,22 +85,28 @@ unset ($prep_statement); } +//get the type if not provided + //if (strlen($transaction_old) > 4) { + // $transaction_type = 'add'; + //} + //else { + // $transaction_type = 'update'; + //} + //show the header require_once "resources/header.php"; //show the content - //echo "
\n"; echo "\n"; echo " \n"; echo " \n"; echo " \n"; echo " \n"; echo "
".$text['title-database_transaction']."

\n"; echo " "; - //echo " "; echo "
\n"; - echo "\n"; + echo "
\n"; echo "\n"; echo "\n"; + + echo "\n"; + echo "\n"; echo "
\n"; echo " \n"; echo " \n"; @@ -229,50 +115,27 @@ echo " \n"; echo " \n"; echo " \n"; - - /*echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - */ - echo " \n"; echo " \n"; echo " \n"; echo " \n"; echo "
\n"; echo " ".$app_name."\n"; - //echo " \n"; - //echo "
\n"; - //echo " ".$text['description-app_uuid']."\n"; echo "
\n"; - echo " ".$text['label-domain']."\n"; - echo " \n"; - echo " ".$domain_name; - //echo " \n"; - //echo "
\n"; - //echo " ".$text['description-domain']."\n"; - echo "
\n"; echo " ".$text['label-user_uuid']."\n"; echo " \n"; echo " ".$username."\n"; - //echo " \n"; - //echo "
\n"; - //echo " ".$text['description-user_uuid']."\n"; echo "
\n"; echo "		\n"; - echo " \n"; + echo "
\n"; echo " \n"; echo " \n"; echo " \n"; echo " \n"; echo " \n"; @@ -281,27 +144,35 @@ echo " \n"; echo " \n"; echo " \n"; echo "
\n"; echo " ".$text['label-transaction_code']."\n"; echo " \n"; echo " $transaction_code\n"; - //echo " \n"; - //echo "
\n"; - //echo " ".$text['description-transaction_code']."\n"; echo "
\n"; echo " $transaction_address\n"; - //echo " \n"; - //echo "
\n"; - //echo " ".$text['description-transaction_address']."\n"; echo "
\n"; echo "		\n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo "
\n"; + echo " ".$text['label-transaction_type']."\n"; + echo " \n"; + echo " $transaction_type\n"; + echo "
\n"; + echo " ".$text['label-domain']."\n"; + echo " \n"; + echo " ".$domain_name; + echo "
\n"; + echo "
\n"; - //echo "\n"; - //echo "\n"; - //echo " ".$text['label-transaction_type']."\n"; - //echo "\n"; - //echo "\n"; - //echo " \n"; - //echo "
\n"; - //echo $text['description-transaction_type']."\n"; - //echo "\n"; - //echo "\n"; - if ($_REQUEST["debug"] == "true") { echo "\n"; echo "\n"; @@ -342,18 +213,6 @@ echo "
"; } - //echo " \n"; - //echo " \n"; - //if ($action == "update") { - // echo " \n"; - //} - //echo " \n"; - //echo " \n"; - //echo " "; - //echo ""; - //echo "
"; - //echo "

"; - //define the array _difference function //this adds old and new values to the array function array_difference($array1, $array2) { @@ -438,28 +297,39 @@ unset($_SESSION['previous_row']); //show the add or update - if (count($before) > 0 && count($after) > 0) { - //create the table header - $array = array_difference($before, $after, 1); - $table_header = " \n"; - $table_header .= "\n"; - //$table_header .= " Table\n"; - //$table_header .= " Row\n"; - $table_header .= " name\n"; - $table_header .= " old\n"; - $table_header .= " new\n"; - $table_header .= "\n"; - $_SESSION['table_header'] = $table_header; - - //show the difference - echo "\n"; - show_difference($array); - echo "
\n"; + if ($transaction_type == "add") { + echo "
\n"; + echo " 
\n";
+		print_r($after);
+		echo "
\n"; + } + +//show the add or update + if ($transaction_type == "update") { + if (count($before) > 0 && count($after) > 0) { + //create the table header + $array = array_difference($before, $after, 1); + $table_header = " \n"; + $table_header .= "\n"; + //$table_header .= " Table\n"; + //$table_header .= " Row\n"; + $table_header .= " name\n"; + $table_header .= " old\n"; + $table_header .= " new\n"; + $table_header .= "\n"; + $_SESSION['table_header'] = $table_header; + + //show the difference + echo "\n"; + show_difference($array); + echo "
\n"; + } } //show the delete - if (count($before) > 0 && count($after) == 0) { - echo "

Record Deleted


\n"; + if ($transaction_type == "delete") { + //echo "

Record Deleted


\n"; + echo "
\n"; echo " 
\n";
 		print_r($before);
 		echo "
\n";