X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-order.php;h=1b1dd1984c29df084f31ad63e4dd97a93faa967c;hb=34db702d004b245e5528b0ba20c6de441f61820a;hp=281248a7950803e3705b67810bb60bb3807db954;hpb=c364e5bc64df1f184602dec6a86ad2d70e8f83a9;p=mailer.git

diff --git a/inc/modules/member/what-order.php b/inc/modules/member/what-order.php
index 281248a795..1b1dd1984c 100644
--- a/inc/modules/member/what-order.php
+++ b/inc/modules/member/what-order.php
@@ -27,8 +27,6 @@
  * (at your option) any later version.                                  *
  *                                                                      *
  * This program is distributed in the hope that it will be useful,      *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of       *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        *
  * GNU General Public License for more details.                         *
  *                                                                      *
  * You should have received a copy of the GNU General Public License    *
@@ -53,53 +51,19 @@ if ((!isExtensionActive('order')) && (!isAdmin())) {
 } // END - if
 
 $url = ''; $id = '0';
-$whereStatement = " WHERE `visible`='Y'";
-
-// Set undefined array elements
-if (isAdmin()) $whereStatement = '';
 
 // Count unconfirmed mails
 $links = countSumTotalData(getMemberId(), 'user_links', 'id', 'userid', true);
 
-// Do we have ext-holiday installed?
-// @TODO Rewrite this to a filter
-$extraColumn = 'userid';
-if (isExtensionInstalledAndNewer('holiday', '0.1.3')) {
-	// Fetch also holiday activation data
-	$extraColumn = 'holiday_active';
-} // END - if
-
-$result_mmails = SQL_QUERY_ESC("SELECT
-	`userid`,
-	`receive_mails`,
-	`mail_orders`,
-	`".$extraColumn."`
-FROM
-	`{?_MYSQL_PREFIX?}_user_data`
-WHERE
-	`userid`=%s AND
-	`max_mails` > 0
-LIMIT 1",
-	array(getMemberId()), __FILE__, __LINE__);
-
-$mmails = SQL_NUMROWS($result_mmails);
-list($DMY, $MAXI, $ORDERS, $HOLIDAY) = SQL_FETCHROW($result_mmails);
-
-// Free result
-SQL_FREERESULT($result_mmails);
-
-// Fix non-existent ext-holidy
-if ($HOLIDAY == $DMY) $HOLIDAY = 'N';
-
-$ALLOWED = $MAXI - $ORDERS;
-if (getConfig('order_max_full') == 'MAX') $ALLOWED = $MAXI;
+$ALLOWED = getUserData('receive_mails') - getUserData('mail_orders');
+if (getConfig('order_max_full') == 'MAX') $ALLOWED = getUserData('receive_mails');
 
 // Now check his points amount
-$total = countSumTotalData(getMemberId(), 'user_points', 'points') - countSumTotalData(getMemberId(), 'user_data', 'used_points');;
+$total = getTotalPoints(getMemberId());
 
-if (($HOLIDAY == 'Y') && (isExtensionInstalledAndNewer('holiday', '0.1.3'))) {
+if ((isExtensionInstalledAndNewer('holiday', '0.1.3')) && (getUserData('holiday_active') == 'Y')) {
 	// Holiday is active!
-	loadTemplate('admin_settings_saved', false, '{--HOLIDAY_ORDER_NOT_POSSIBLE--}');
+	loadTemplate('admin_settings_saved', false, '{--MEMBER_HOLIDAY_ORDER_NOT_POSSIBLE--}');
 } elseif ((isPostRequestParameterSet('frametester')) && ($ALLOWED > 0) && (postRequestParameter('receiver') > 0)) {
 	// Continue with the frametester, we first need to store the data temporary in the pool
 	//
@@ -435,7 +399,13 @@ LIMIT 1",
 } elseif (($ALLOWED == '0') && (getConfig('order_max_full') == 'ORDER')) {
 	// No more mail orders allowed
 	loadTemplate('admin_settings_saved', false, '{--MEMBER_ORDER_ALLOWED_EXHAUSTED--}');
-} elseif (($links < getConfig('unconfirmed')) && ($mmails == 1)) {
+} elseif ($links < getConfig('unconfirmed')) {
+	// Show only enabled categories to the user ...
+	$whereStatement = " WHERE `visible`='Y'";
+
+	// ... but all to the admin
+	if (isAdmin()) $whereStatement = '';
+
 	// Display order form
 	$result_cats = SQL_QUERY("SELECT
 	`id`, `cat`
@@ -474,11 +444,13 @@ ORDER BY
 				$userid_cnt = '0';
 				while (list($ucat) = SQL_FETCHROW($result_userids)) {
 					// Check for holiday system
-					$HOL_ACTIVE = false;
+					$isHolidayActive = false;
 					if (isExtensionInstalledAndNewer('holiday', '0.1.3')) {
 						// Check user's holiday status
 						$result_holiday = SQL_QUERY_ESC("SELECT
-	d.userid FROM `{?_MYSQL_PREFIX?}_user_data` AS d
+	COUNT(d.userid) AS `cnt`
+FROM
+	`{?_MYSQL_PREFIX?}_user_data` AS d
 LEFT JOIN
 	`{?_MYSQL_PREFIX?}_user_holidays` AS h
 ON
@@ -493,14 +465,17 @@ WHERE
 LIMIT 1",
 							array(bigintval($ucat)), __FILE__, __LINE__);
 
-						// Is holiday is active?
-						$HOL_ACTIVE = (SQL_NUMROWS($result_holiday) == 1);
+						// Fetch entry
+						list($cnt) = SQL_FETCHROW($result);
 
 						// Free memory
 						SQL_FREERESULT($result_holiday);
+
+						// Is holiday is active?
+						$isHolidayActive = ($cont == 1);
 					} // END - if
 
-					if ($HOL_ACTIVE === false) {
+					if ($isHolidayActive === false) {
 						// Check if the user want's to receive mails?
 						$result_ver = SQL_QUERY_ESC("SELECT `zip` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid`=%s".$HTML." AND `receive_mails` > 0 AND `status`='CONFIRMED' LIMIT 1",
 							array(bigintval($ucat)), __FILE__, __LINE__);
@@ -561,7 +536,7 @@ LIMIT 1",
 						break;
 
 					case 'ORDER': // He is allowed to send as much as he setup the receiving value
-						$content['order_max_full'] = sprintf(getMessage('MEMBER_ORDER_ALLOWED_RECEIVE'), $ALLOWED, $MAXI);
+						$content['order_max_full'] = sprintf(getMessage('MEMBER_ORDER_ALLOWED_RECEIVE'), $ALLOWED, getUserData('receive_mails'));
 						break;
 
 					default: // Unknown/invalid
@@ -696,9 +671,6 @@ LIMIT 1",
 		// No cateogries are defined yet
 		loadTemplate('admin_settings_saved', false, '<span class="member_failed">{--MEMBER_NO_CATEGORIES--}</span>');
 	}
-} elseif ($mmails == '0') {
-	// Please set more than 0 mails per day
-	loadTemplate('admin_settings_saved', false, '{--MEMBER_HAS_ZERO_MMAILS--}');
 } else {
 	// Please confirm some mails first
 	loadTemplate('admin_settings_saved', false, getMaskedMessage('MEMBER_LINKS_LEFT'), $links);