X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-payments.php;h=b7a9e27e50248b4560140269798c19ad2e7cace8;hb=e523b69ecd6c7f37ae1cb36872537073b40c0e27;hp=e5bf264a68f9f42945c946dd504861bb26b72afb;hpb=cf3765c38cf0a76f396aca291f71858936e92956;p=mailer.git

diff --git a/inc/modules/admin/what-payments.php b/inc/modules/admin/what-payments.php
index e5bf264a68..b7a9e27e50 100644
--- a/inc/modules/admin/what-payments.php
+++ b/inc/modules/admin/what-payments.php
@@ -14,8 +14,6 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
@@ -45,7 +43,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 // Add description as navigation point
 addMenuDescription('admin', __FILE__);
 
-if (((!isPostRequestParameterSet(('t_wait'))) || (!isPostRequestParameterSet(('payment')))) && (isGetRequestParameterSet('do')) && (getRequestParameter('do') == 'add')) {
+if (((!isPostRequestParameterSet('t_wait')) || (!isPostRequestParameterSet('payment'))) && (isGetRequestParameterSet('do')) && (getRequestParameter('do') == 'add')) {
 	unsetPostRequestParameter('ok');
 } // END - if
 
@@ -53,27 +51,22 @@ if (isFormSent()) {
 	switch (getRequestParameter('do')) {
 		case 'add':
 			addSql("INSERT INTO `{?_MYSQL_PREFIX?}_payments` (`time`, `payment`, `mail_title`, `price`) VALUES ('".postRequestParameter('t_wait')."','".postRequestParameter('payment')."','".postRequestParameter('title')."','".postRequestParameter('price')."')");
-			$result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_payments` WHERE `time`='%s' LIMIT 1",
-				array(postRequestParameter('t_wait')), __FILE__, __LINE__);
-			if (SQL_NUMROWS($result) == 1) {
+			if (countSumTotalData(postRequestParameter('t_wait'), 'payments', 'id', 'time', true) == 1) {
 				// Re-init the array here
 				initSqls();
-
-				// Free memory
-				SQL_FREERESULT($result);
-			}
+			} // END - if
 			break;
 
 		case 'edit':
 			foreach (postRequestParameter('time') as $id => $value) {
-				addSql("UPDATE `{?_MYSQL_PREFIX?}_payments` SET `time`='" . $value . "', `payment`='".postRequestParameter('pay', $id)."', price='".postRequestParameter('price', $id)."', mail_title='".postRequestParameter('title', $id)."' WHERE `id`='".$id."' LIMIT 1");
-			}
+				addSql("UPDATE `{?_MYSQL_PREFIX?}_payments` SET `time`='" . $value . "', `payment`='".postRequestParameter('payment', $id)."', price='".postRequestParameter('price', $id)."', mail_title='".postRequestParameter('mail_title', $id)."' WHERE `id`='".$id."' LIMIT 1");
+			} // END - foreach
 			break;
 
-		case 'del':
+		case 'delete':
 			foreach (postRequestParameter('id') as $id => $value) {
 				addSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_payments` WHERE `id`=" . bigintval($id) . " LIMIT 1");
-			}
+			} // END - foreach
 			break;
 	} // END - switch
 
@@ -81,53 +74,41 @@ if (isFormSent()) {
 	if (countSqls() > 0) {
 		// Run all queries
 		runFilterChain('run_sqls');
-		$content = '<span class="admin_failed">{--SETTINGS_SAVED--}</span>';
+		$content = '<span class="notice">{--SETTINGS_SAVED--}</span>';
 	} else {
 		// Nothing has changed!
-		$content = '<span class="admin_failed">{--SETTINGS_NOT_SAVED--}</span>';
+		$content = '<span class="notice">{--SETTINGS_NOT_SAVED--}</span>';
 	}
 
 	// Output template
 	loadTemplate('admin_settings_saved', false, $content);
-} elseif ((isFormSent('del')) && (countPostSelection() > 0)) {
+} elseif ((isFormSent('delete')) && (ifPostContainsSelections())) {
 	// Delete entries here
 	$OUT = '';
 	foreach (postRequestParameter('sel') as $id => $value) {
-		$result = SQL_QUERY_ESC("SELECT time, mail_title FROM `{?_MYSQL_PREFIX?}_payments` WHERE `id`=%s LIMIT 1",
-		array(bigintval($id)), __FILE__, __LINE__);
-		list($time, $title) = SQL_FETCHROW($result);
-		SQL_FREERESULT($result);
+		$result = SQL_QUERY_ESC("SELECT `id`, `time`, `mail_title` FROM `{?_MYSQL_PREFIX?}_payments` WHERE `id`=%s LIMIT 1",
+			array(bigintval($id)), __FILE__, __LINE__);
+		$content = SQL_FETCHARRAY($result);
 
-		// Prepare array for the row template
-		$content = array(
-			'id'    => $id,
-			'time'  => $time,
-			'title' => $title,
-		);
+		// Free result
+		SQL_FREERESULT($result);
 
 		// Load row template and switch colors
-		$OUT .= loadTemplate('admin_del_payments_row', true, $content);
+		$OUT .= loadTemplate('admin_delete_payments_row', true, $content);
 	} // END - foreach
 
 	// Load main template
-	loadTemplate('admin_del_payments', false, $OUT);
-} elseif ((isFormSent('edit')) && (countPostSelection() > 0)) {
+	loadTemplate('admin_delete_payments', false, $OUT);
+} elseif ((isFormSent('edit')) && (ifPostContainsSelections())) {
 	// Edit entries
 	$OUT = '';
 	foreach (postRequestParameter('sel') as $id => $value) {
-		$result = SQL_QUERY_ESC("SELECT time, payment, mail_title, price FROM `{?_MYSQL_PREFIX?}_payments` WHERE `id`=%s LIMIT 1",
-		array(bigintval($id)), __FILE__, __LINE__);
-		list($time, $pay, $title, $price) = SQL_FETCHROW($result);
-		SQL_FREERESULT($result);
+		$result = SQL_QUERY_ESC("SELECT `id`, `time`, `payment`, `mail_title`, `price` FROM `{?_MYSQL_PREFIX?}_payments` WHERE `id`=%s LIMIT 1",
+			array(bigintval($id)), __FILE__, __LINE__);
+		$content = SQL_FETCHARRAY($result);
 
-		// Prepare array for the row template
-		$content = array(
-			'id'    => $id,
-			'time'  => $time,
-			'title' => $title,
-			'pay'   => $pay,
-			'price' => $price,
-		);
+		// Free result
+		SQL_FREERESULT($result);
 
 		// Load row template and switch colors
 		$OUT .= loadTemplate('admin_edit_payments_row', true, $content);
@@ -138,24 +119,14 @@ if (isFormSent()) {
 } else {
 	// Referal levels
 	$result = SQL_QUERY("SELECT `id`, `time`, `payment`, `mail_title`, `price` FROM `{?_MYSQL_PREFIX?}_payments` ORDER BY `time` ASC", __FILE__, __LINE__);
-	if (SQL_NUMROWS($result) > 0) {
+	if (!SQL_HASZERONUMS($result)) {
 		// Make referal levels editable and deletable
 		$OUT = '';
 
 		// List already existing categories for editing
 		while ($content = SQL_FETCHARRAY($result)) {
-			// Prepare array for the row template
-			// @TODO Rewritings: title->mail_title in template
-			$content = array(
-				'id'      => $content['id'],
-				'time'    => $content['time'],
-				'title'   => $content['mail_title'],
-				'payment' => translateComma($content['payment']),
-				'price'   => translateComma($content['price'])
-			);
-
 			// Load row template and switch colors
-			$OUT .= loadTemplate('admin_payments_list_row', true, $content);
+			$OUT .= loadTemplate('admin_list_payments_row', true, $content);
 		} // END - switch
 
 		// Free memory