Bug Fixes

git-svn-id: svn://svn.code.sf.net/p/simpleauction/svn/WeBid/trunk@333 cb2008ec-e0ba-457b-a47b-93945ab2bf72

admin/auctions.php

@@ -109,7 +109,7 @@
 loadblock($MSG['663'], '', '', '', '', array(), true);
 loadblock($MSG['665'], $MSG['664'], 'batch', 'picturesgallery', $system->SETTINGS['picturesgallery'], array($MSG['030'], $MSG['029']));
 loadblock($MSG['666'], '', 'days', 'maxpictures', $system->SETTINGS['maxpictures']);
-loadblock($MSG['671'], $MSG['25_0187'], 'days', 'maxpicturesize', ($system->SETTINGS['maxuploadsize'] / 1024), array($MSG['672']));
+loadblock($MSG['671'], $MSG['25_0187'], 'decimals', 'maxpicturesize', ($system->SETTINGS['maxuploadsize'] / 1024), array($MSG['672']));
 loadblock($MSG['25_0107'], $MSG['896'], 'decimals', 'thumb_show', $system->SETTINGS['thumb_show'], array($MSG['2__0045']));
 
 $template->assign_vars(array(

admin/invoice.php

@@ -87,7 +87,7 @@
 $join_sql .= " LEFT JOIN " . $DBPrefix . "users u ON (u.id = " . $DBPrefix . "useraccounts.user_id) ";
 $pull_sql .= ', u.nick';
 
-$query = "SELECT COUNT(" . $DBPrefix . "useraccounts.id) As COUNT, SUM(total) As TOTAL_VAL FROM " . $DBPrefix . "useraccounts" . ((!empty($join_sql)) ? $join_sql : '') . " " . ((!empty($where_sql)) ? ' WHERE ' . $where_sql : '') . " " . ((!empty($group_sql)) ? $group_sql : '');
+$query = "SELECT COUNT(" . $DBPrefix . "useraccounts.useracc_id) As COUNT, SUM(total) As TOTAL_VAL FROM " . $DBPrefix . "useraccounts" . ((!empty($join_sql)) ? $join_sql : '') . " " . ((!empty($where_sql)) ? ' WHERE ' . $where_sql : '') . " " . ((!empty($group_sql)) ? $group_sql : '');
 
 $db->query($query, $params);
 $TOTALAUCTIONS = $db->result('COUNT');
@@ -185,7 +185,7 @@
 	}
 
 	$template->assign_block_vars('invoices', array(
-			'INVOICE' => $row['id'],
+			'INVOICE' => $row['useracc_id'],
 			'AUC_ID' => $row['auc_id'],
 			'USER' => (!$searchuser) ? $row['nick'] : '',
 			'DATE' => ArrangeDateNoCorrection($DATE),

docs/changes.txt

@@ -55,5 +55,8 @@
 - Fixed when auction set to seller pays shipping so the shipping cost no longer shows on outstanding.php
 - Fixed bug in admin/categoriestrans.php when adding a ' to a category name it would break everything (Bug #299)
 - Fixed a bug in admin/viewaccessstats.php if site has run for over a year the listings will mess up (Bug #412) (Thanks to andre88uk)
+- In admin you can now set max image upload size of up to ~97656249kb instead of 9999kb
+- Rewrote language string 640 to make more sence
+- Fixed missing word in language string 778
 
 for older changes check out http://www.webidsupport.com/wiki/Change_Log

includes/browseitems.inc.php

@@ -128,7 +128,7 @@ function build_items($row)
 
 	if ($row['buy_now'] > 0 && $row['bn_only'] == 'n' && ($row['num_bids'] == 0 || ($row['reserve_price'] > 0 && $row['current_bid'] < $row['reserve_price'])))
 	{
-		$row['buy_now'] = '<a href="' . $system->SETTINGS['siteurl'] . 'buy_now.php?id=' . $row['id'] . '"><img src="' . get_lang_img('buy_it_now.gif') . '" border=0 class="buynow"></a>' . $system->print_money($row['buy_now']) . ')';
+		$row['buy_now'] = '<a href="' . $system->SETTINGS['siteurl'] . 'buy_now.php?id=' . $row['id'] . '"><img src="' . get_lang_img('buy_it_now.gif') . '" border=0 class="buynow"></a>' . $system->print_money($row['buy_now']);
 	}
 	elseif ($row['buy_now'] > 0 && $row['bn_only'] == 'y')
 	{

includes/class_fees.php

@@ -254,7 +254,7 @@ function callback_process($custom_id, $fee_type, $payment_amount, $currency = NU
 				global $user, $MSG;
 				$catscontrol = new MPTTcategories();
 
-				$query = "SELECT auc_id FROM " . $DBPrefix . "useraccounts WHERE id = " . $custom_id;
+				$query = "SELECT auc_id FROM " . $DBPrefix . "useraccounts WHERE useracc_id = " . $custom_id;
 				$res = mysql_query($query);
 				$system->check_mysql($res, $query, __LINE__, __FILE__);
 				$auc_id = mysql_result($res, 0, 'auc_id');
@@ -264,7 +264,7 @@ function callback_process($custom_id, $fee_type, $payment_amount, $currency = NU
 				$system->check_mysql(mysql_query($query), $query, __LINE__, __FILE__);
 				$query = "UPDATE " . $DBPrefix . "counters SET auctions = auctions + 1";
 				$system->check_mysql(mysql_query($query), $query, __LINE__, __FILE__);
-				$query = "UPDATE " . $DBPrefix . "useraccounts SET paid = 1 WHERE id = " . $custom_id;
+				$query = "UPDATE " . $DBPrefix . "useraccounts SET paid = 1 WHERE useracc_id = " . $custom_id;
 				$system->check_mysql(mysql_query($query), $query, __LINE__, __FILE__);
 
 				$query = "SELECT category, title, minimum_bid, pict_url, buy_now, reserve_price, auction_type, ends

includes/functions_sell.php

@@ -306,48 +306,64 @@ function get_fee($minimum_bid, $just_fee = true)
 		$query = "SELECT * FROM " . $DBPrefix . "useraccounts WHERE auc_id = " . $_SESSION['SELL_auction_id'] . " AND user_id = " . $user->user_data['id'];
 		$res = mysql_query($query);
 		$system->check_mysql($res, $query, __LINE__, __FILE__);
-		$row = mysql_result($res, 0);
+		// build an array full of everything the user has been charged for the auction do far
+		$past_fees = array();
+		while($row = mysql_fetch_assoc($res, 0))
+		{
+			foreach ($row as $k => $v)
+			{
+				if (isset($past_fees[$k]))
+				{
+					$past_fees[$k] += $v;
+				}
+				else
+				{
+					$past_fees[$k] = $v;
+				}
+			}
+		}
+
 		$diff = 0; // difference from last payment
 		$fee_data['setup'] = 0; // shouldn't have to pay setup for an edit...
-		$diff = bcadd($diff, $row['setup'], $system->SETTINGS['moneydecimals']);
-		if ($row['bold'] == $fee_data['bolditem_fee'])
+		$diff = bcadd($diff, $past_fees['setup'], $system->SETTINGS['moneydecimals']);
+		if ($past_fees['bold'] == $fee_data['bolditem_fee'])
 		{
-			$diff = bcadd($diff, $row['bolditem_fee'], $system->SETTINGS['moneydecimals']);
+			$diff = bcadd($diff, $fee_data['bolditem_fee'], $system->SETTINGS['moneydecimals']);
 			$fee_data['bolditem_fee'] = 0;
 		}
-		if ($row['highlighted'] == $fee_data['hlitem_fee'])
+		if ($past_fees['highlighted'] == $fee_data['hlitem_fee'])
 		{
-			$diff = bcadd($diff, $row['hlitem_fee'], $system->SETTINGS['moneydecimals']);
+			$diff = bcadd($diff, $fee_data['hlitem_fee'], $system->SETTINGS['moneydecimals']);
 			$fee_data['hlitem_fee'] = 0;
 		}
-		if ($row['subtitle'] == $fee_data['subtitle_fee'])
+		if ($past_fees['subtitle'] == $fee_data['subtitle_fee'])
 		{
-			$diff = bcadd($diff, $row['subtitle_fee'], $system->SETTINGS['moneydecimals']);
+			$diff = bcadd($diff, $fee_data['subtitle_fee'], $system->SETTINGS['moneydecimals']);
 			$fee_data['subtitle_fee'] = 0;
 		}
-		if ($row['relist'] == $fee_data['relist_fee'])
+		if ($past_fees['relist'] == $fee_data['relist_fee'])
 		{
-			$diff = bcadd($diff, $row['relist_fee'], $system->SETTINGS['moneydecimals']);
+			$diff = bcadd($diff, $fee_data['relist_fee'], $system->SETTINGS['moneydecimals']);
 			$fee_data['relist_fee'] = 0;
 		}
-		if ($row['reserve'] == $fee_data['rp_fee'])
+		if ($past_fees['reserve'] == $fee_data['rp_fee'])
 		{
-			$diff = bcadd($diff, $row['rp_fee'], $system->SETTINGS['moneydecimals']);
+			$diff = bcadd($diff, $fee_data['rp_fee'], $system->SETTINGS['moneydecimals']);
 			$fee_data['rp_fee'] = 0;
 		}
-		if ($row['buynow'] == $fee_data['buyout_fee'])
+		if ($past_fees['buynow'] == $fee_data['buyout_fee'])
 		{
-			$diff = bcadd($diff, $row['buyout_fee'], $system->SETTINGS['moneydecimals']);
+			$diff = bcadd($diff, $fee_data['buyout_fee'], $system->SETTINGS['moneydecimals']);
 			$fee_data['buyout_fee'] = 0;
 		}
-		if ($row['image'] == $fee_data['picture_fee'])
+		if ($past_fees['image'] == $fee_data['picture_fee'])
 		{
-			$diff = bcadd($diff, $row['picture_fee'], $system->SETTINGS['moneydecimals']);
+			$diff = bcadd($diff, $fee_data['picture_fee'], $system->SETTINGS['moneydecimals']);
 			$fee_data['picture_fee'] = 0;
 		}
-		if ($row['extcat'] == $fee_data['excat_fee'])
+		if ($past_fees['extcat'] == $fee_data['excat_fee'])
 		{
-			$diff = bcadd($diff, $row['excat_fee'], $system->SETTINGS['moneydecimals']);
+			$diff = bcadd($diff, $fee_data['excat_fee'], $system->SETTINGS['moneydecimals']);
 			$fee_data['excat_fee'] = 0;
 		}
 		$fee_value = bcsub($fee_value, $diff, $system->SETTINGS['moneydecimals']);

install/sql/dump.inc.php

@@ -1741,7 +1741,7 @@
 
 $query[] = "DROP TABLE IF EXISTS `" . $DBPrefix . "useraccounts`;";
 $query[] = "CREATE TABLE `" . $DBPrefix . "useraccounts` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `useracc_id` int(11) NOT NULL AUTO_INCREMENT,
   `auc_id` int(15) NOT NULL default '0',
   `user_id` int(15) NOT NULL default '0',
   `date` int(15) NOT NULL default '0',

install/sql/updatedump.inc.php

@@ -173,7 +173,7 @@
 	$query[] = "ALTER TABLE `" . $DBPrefix . "adminusers` ADD `notes` text;";
 	$query[] = "DROP TABLE IF EXISTS `" . $DBPrefix . "userfees`;";
 	$query[] = "CREATE TABLE `" . $DBPrefix . "useraccounts` (
-	  `id` int(11) NOT NULL AUTO_INCREMENT,
+	  `useracc_id` int(11) NOT NULL AUTO_INCREMENT,
 	  `auc_id` int(15) NOT NULL default '0',
 	  `user_id` int(15) NOT NULL default '0',
 	  `date` int(15) NOT NULL default '0',

invoices.php

@@ -34,7 +34,7 @@
 }
 
 // count the pages
-$query = "SELECT COUNT(id) As COUNT  FROM " . $DBPrefix . "useraccounts
+$query = "SELECT COUNT(useracc_id) As COUNT  FROM " . $DBPrefix . "useraccounts
     WHERE user_id = " . $user->user_data['id'];
 $res = mysql_query($query);
 $system->check_mysql($res, $query, __LINE__, __FILE__);
@@ -132,7 +132,7 @@
 		}
 
 		$template->assign_block_vars('topay', array(
-				'INVOICE' => $row['id'],
+				'INVOICE' => $row['useracc_id'],
 				'AUC_ID' => $row['auc_id'],
 				'DATE' => ArrangeDateNoCorrection($DATE),
 				'INFO' => $info,

language/EN/messages.inc.php

@@ -724,7 +724,7 @@
 $MSG['629'] = "*If you click cancel the thumbnail image for your auction will be a squashed down version of the image you uploaded/set as default";
 $MSG['630'] = "Re-list";
 $MSG['631'] = "Process selected auctions";
-$MSG['640'] = "*Note* If Dutch Auction you may not set a reserve price, custom increment amount or use the BUY NOW feature.";
+$MSG['640'] = "*Note* For a Dutch Auction you may not set a reserve price, custom increment amount, nor use the BUY NOW feature.";
 $MSG['641'] = "Dutch auction";
 $MSG['642'] = "Standard auction";
 $MSG['645'] = "Post question for Seller";
@@ -821,7 +821,7 @@
 $MSG['775'] = 'Buyer Fee';
 $MSG['776'] = "To finalise the sale please proceed to one of the payment gateways listed below to pay the fee of <b>%s</b>.";
 $MSG['777'] = 'You have an outstanding payment of the buyers fee for the item %s; your account will be suspended until this is paid. You can pay for this now at <a href="%s">Here</a>';
-$MSG['778'] = 'If you wish to via an alternative method contact <a href="profile.php?user_id=%s">%s</a> to find out how.';
+$MSG['778'] = 'If you wish to pay via an alternative method contact <a href="profile.php?user_id=%s">%s</a> to find out how.';
 $MSG['779'] = 'User Registration Fields Updated';
 $MSG['780'] = 'Show On Registration Page';
 $MSG['781'] = 'Birthday Field Required?';

order_packingslip.php

@@ -50,7 +50,9 @@
 $title = $system->SETTINGS['sitename'] . ' - ' . $data['title'];
 
 $template->assign_vars(array(
+		'DOCDIR' => $DOCDIR,
 		'LOGO' => $system->SETTINGS['siteurl'] . 'themes/' . $system->SETTINGS['theme'] . '/' . $system->SETTINGS['logo'],
+		'CHARSET' => $CHARSET,
 		'LANGUAGE' => $language,
 		'SENDER' => $sender['nick'],
 		'WINNER_NICK' => $winner['nick'],

order_print.php

@@ -54,7 +54,7 @@
 else
 {
 	// get fee data
-	$query = "SELECT * FROM " . $DBPrefix . "useraccounts WHERE id = " . intval($_GET['id']);
+	$query = "SELECT * FROM " . $DBPrefix . "useraccounts WHERE useracc_id = " . intval($_GET['id']);
 }
 $res = mysql_query($query);
 $system->check_mysql($res, $query, __LINE__, __FILE__);
@@ -146,7 +146,9 @@
 }
 
 $template->assign_vars(array(
+		'DOCDIR' => $DOCDIR,
 		'LOGO' => $system->SETTINGS['siteurl'] . 'themes/' . $system->SETTINGS['theme'] . '/' . $system->SETTINGS['logo'],
+		'CHARSET' => $CHARSET,
 		'LANGUAGE' => $language,
 		'SENDER' => $seller['nick'],
 		'WINNER_NICK' => $winner['nick'],

pay.php

@@ -111,11 +111,11 @@
 		$wp_paytoid = $gateway_data['worldpay_id'];
 		$tc_paytoid = $gateway_data['toocheckout_id'];
 		$mb_paytoemail = $gateway_data['moneybookers_address'];
-		$query = "SELECT total, id FROM " . $DBPrefix . "useraccounts WHERE auc_id = " . $_SESSION['auction_id'] . " AND user_id = " . $user->user_data['id'];
+		$query = "SELECT total, useracc_id FROM " . $DBPrefix . "useraccounts WHERE auc_id = " . $_SESSION['auction_id'] . " AND user_id = " . $user->user_data['id'];
 		$res = mysql_query($query);
 		$system->check_mysql($res, $query, __LINE__, __FILE__);
 		$payvalue = mysql_result($res, 0, 'total');
-		$invoice_id = mysql_result($res, 0, 'id');
+		$invoice_id = mysql_result($res, 0, 'useracc_id');
 		$custoncode = $invoice_id . 'WEBID4';
 		$message = sprintf($MSG['590'], $system->print_money($payvalue));
 		$title = $system->SETTINGS['sitename'] . ' - ' . $MSG['432'];

themes/admin/help.tpl

@@ -4,10 +4,10 @@
             	<div class="box">
                 	<h4 class="rounded-top">{L_1061}</h4>
                     <div class="rounded-bottom">
-                    	<form name="wordlist" action="" method="post">
-							<textarea rows="15" cols="35" name="anotes">{ADMIN_NOTES}</textarea>
+                    	<form name="anotes" action="" method="post">
+							<textarea rows="15" name="anotes" class="anotes">{ADMIN_NOTES}</textarea>
 							<input type="hidden" name="csrftoken" value="{_CSRFTOKEN}">
-							<input type="submit" name="act" class="centre" value="{L_007}">
+							<input type="submit" name="act" value="{L_007}">
 						</form>
 					</div>
                 </div>

themes/admin/home.tpl

@@ -4,10 +4,10 @@
             	<div class="box">
                 	<h4 class="rounded-top">{L_1061}</h4>
                     <div class="rounded-bottom">
-                    	<form name="wordlist" action="" method="post">
-							<textarea rows="15" cols="35" name="anotes">{ADMIN_NOTES}</textarea>
+                    	<form name="anotes" action="" method="post">
+							<textarea rows="15" name="anotes" class="anotes">{ADMIN_NOTES}</textarea>
 							<input type="hidden" name="csrftoken" value="{_CSRFTOKEN}">
-							<input type="submit" name="act" class="centre" value="{L_007}">
+							<input type="submit" name="act" value="{L_007}">
 						</form>
 					</div>
                 </div>

themes/admin/sidebar-auctions.tpl

@@ -11,10 +11,10 @@
             	<div class="box">
                 	<h4 class="rounded-top">{L_1061}</h4>
                     <div class="rounded-bottom">
-                    	<form name="wordlist" action="" method="post">
-							<textarea rows="15" cols="35" name="anotes">{ADMIN_NOTES}</textarea>
+                    	<form name="anotes" action="" method="post">
+							<textarea rows="15" name="anotes" class="anotes">{ADMIN_NOTES}</textarea>
 							<input type="hidden" name="csrftoken" value="{_CSRFTOKEN}">
-							<input type="submit" name="act" class="centre" value="{L_007}">
+							<input type="submit" name="act" value="{L_007}">
 						</form>
 					</div>
                 </div>

themes/admin/sidebar-banners.tpl

@@ -10,10 +10,10 @@
             	<div class="box">
                 	<h4 class="rounded-top">{L_1061}</h4>
                     <div class="rounded-bottom">
-                    	<form name="wordlist" action="" method="post">
-							<textarea rows="15" cols="35" name="anotes">{ADMIN_NOTES}</textarea>
+                    	<form name="anotes" action="" method="post">
+							<textarea rows="15" name="anotes" class="anotes">{ADMIN_NOTES}</textarea>
 							<input type="hidden" name="csrftoken" value="{_CSRFTOKEN}">
-							<input type="submit" name="act" class="centre" value="{L_007}">
+							<input type="submit" name="act" value="{L_007}">
 						</form>
 					</div>
                 </div>

themes/admin/sidebar-contents.tpl

@@ -32,10 +32,10 @@
             	<div class="box">
                 	<h4 class="rounded-top">{L_1061}</h4>
                     <div class="rounded-bottom">
-                    	<form name="wordlist" action="" method="post">
-							<textarea rows="15" cols="35" name="anotes">{ADMIN_NOTES}</textarea>
+                    	<form name="anotes" action="" method="post">
+							<textarea rows="15" name="anotes" class="anotes">{ADMIN_NOTES}</textarea>
 							<input type="hidden" name="csrftoken" value="{_CSRFTOKEN}">
-							<input type="submit" name="act" class="centre" value="{L_007}">
+							<input type="submit" name="act" value="{L_007}">
 						</form>
 					</div>
                 </div>

themes/admin/sidebar-fees.tpl

@@ -16,10 +16,10 @@
             	<div class="box">
                 	<h4 class="rounded-top">{L_1061}</h4>
                     <div class="rounded-bottom">
-                    	<form name="wordlist" action="" method="post">
-							<textarea rows="15" cols="35" name="anotes">{ADMIN_NOTES}</textarea>
+                    	<form name="anotes" action="" method="post">
+							<textarea rows="15" name="anotes" class="anotes">{ADMIN_NOTES}</textarea>
 							<input type="hidden" name="csrftoken" value="{_CSRFTOKEN}">
-							<input type="submit" name="act" class="centre" value="{L_007}">
+							<input type="submit" name="act" value="{L_007}">
 						</form>
 					</div>
                 </div>

themes/admin/sidebar-interface.tpl

@@ -10,10 +10,10 @@
             	<div class="box">
                 	<h4 class="rounded-top">{L_1061}</h4>
                     <div class="rounded-bottom">
-                    	<form name="wordlist" action="" method="post">
-							<textarea rows="15" cols="35" name="anotes">{ADMIN_NOTES}</textarea>
+                    	<form name="anotes" action="" method="post">
+							<textarea rows="15" name="anotes" class="anotes">{ADMIN_NOTES}</textarea>
 							<input type="hidden" name="csrftoken" value="{_CSRFTOKEN}">
-							<input type="submit" name="act" class="centre" value="{L_007}">
+							<input type="submit" name="act" value="{L_007}">
 						</form>
 					</div>
                 </div>

themes/admin/sidebar-settings.tpl

@@ -45,10 +45,10 @@
             	<div class="box">
                 	<h4 class="rounded-top">{L_1061}</h4>
                     <div class="rounded-bottom">
-                    	<form name="wordlist" action="" method="post">
-							<textarea rows="15" cols="35" name="anotes">{ADMIN_NOTES}</textarea>
+                    	<form name="anotes" action="" method="post">
+							<textarea rows="15" name="anotes" class="anotes">{ADMIN_NOTES}</textarea>
 							<input type="hidden" name="csrftoken" value="{_CSRFTOKEN}">
-							<input type="submit" name="act" class="centre" value="{L_007}">
+							<input type="submit" name="act" value="{L_007}">
 						</form>
 					</div>
                 </div>

themes/admin/sidebar-stats.tpl

@@ -12,10 +12,10 @@
             	<div class="box">
                 	<h4 class="rounded-top">{L_1061}</h4>
                     <div class="rounded-bottom">
-                    	<form name="wordlist" action="" method="post">
-							<textarea rows="15" cols="35" name="anotes">{ADMIN_NOTES}</textarea>
+                    	<form name="anotes" action="" method="post">
+							<textarea rows="15" name="anotes" class="anotes">{ADMIN_NOTES}</textarea>
 							<input type="hidden" name="csrftoken" value="{_CSRFTOKEN}">
-							<input type="submit" name="act" class="centre" value="{L_007}">
+							<input type="submit" name="act" value="{L_007}">
 						</form>
 					</div>
                 </div>

themes/admin/sidebar-tools.tpl

@@ -12,10 +12,10 @@
             	<div class="box">
                 	<h4 class="rounded-top">{L_1061}</h4>
                     <div class="rounded-bottom">
-                    	<form name="wordlist" action="" method="post">
-							<textarea rows="15" cols="35" name="anotes">{ADMIN_NOTES}</textarea>
+                    	<form name="anotes" action="" method="post">
+							<textarea rows="15" name="anotes" class="anotes">{ADMIN_NOTES}</textarea>
 							<input type="hidden" name="csrftoken" value="{_CSRFTOKEN}">
-							<input type="submit" name="act" class="centre" value="{L_007}">
+							<input type="submit" name="act" value="{L_007}">
 						</form>
 					</div>
                 </div>