From 5448d0f8f7e59db6b1e2cd3abe1543a0d9a16eec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20D=C3=B6rre?= <felix@dogcraft.de>
Date: Tue, 2 Dec 2014 23:31:22 +0100
Subject: bug-1282: (related) fix the redirection-feature for domain search

---
 pages/account/49.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'pages/account')

diff --git a/pages/account/49.php b/pages/account/49.php
index 9802917..3d2fd09 100644
--- a/pages/account/49.php
+++ b/pages/account/49.php
@@ -39,7 +39,7 @@
 				`users`.`verified`=1
 				group by `users`.`id` limit 100";
 		$res = mysql_query($query);
-		if(mysql_num_rows($res) >= 1) { ?>
+		if(mysql_num_rows($res) > 1) { ?>
 <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
   <tr>
     <td colspan="5" class="title"><?=_("Select Specific User Account Details")?></td>
@@ -64,7 +64,7 @@
 </table><br><br>
 <?		} elseif(mysql_num_rows($res) == 1) {
 			$row = mysql_fetch_assoc($res);
-			$_GET['userid'] = intval($row['id']);
+			$userid = intval($row['id']);
 		} else {
 			?><table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
 				<tr>
@@ -74,7 +74,7 @@
 		}
 		$query = "select `orgid`,`domain`,`id` from `orgdomains` where `domain` like '$domainsearch' or `id`='$domainid' limit 100";
 		$res = mysql_query($query);
-		if(mysql_num_rows($res) >= 1) { ?>
+		if(mysql_num_rows($res) > 1) { ?>
 <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
   <tr>
     <td colspan="5" class="title"><?=_("Select Specific Organisation Account Details")?></td>
@@ -99,7 +99,7 @@
 </table><br><br>
 <?		} elseif(mysql_num_rows($res) == 1) {
 			$row = mysql_fetch_assoc($res);
-			$_GET['userid'] = intval($row['id']);
+			$userid = intval($row['id']);
 		} else {
 			?><table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
 				<tr>
@@ -111,7 +111,7 @@
 
 	if($userid > 0)
 	{
-		header("location: account.php?id=43&userid=".intval($_GET['userid']));
+		header("location: account.php?id=43&userid=".intval($userid));
 		exit;
 	}
 ?>
-- 
cgit v1.2.1


From 1a5c88baf84a80e8fba99cd2393ed00acb54107b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20D=C3=B6rre?= <felix@dogcraft.de>
Date: Tue, 2 Dec 2014 23:34:31 +0100
Subject: bug-1282: fix some creepy whitespace things

---
 pages/account/49.php | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

(limited to 'pages/account')

diff --git a/pages/account/49.php b/pages/account/49.php
index 3d2fd09..e9973f2 100644
--- a/pages/account/49.php
+++ b/pages/account/49.php
@@ -44,23 +44,22 @@
   <tr>
     <td colspan="5" class="title"><?=_("Select Specific User Account Details")?></td>
   </tr>
-<?
-	while($row = mysql_fetch_assoc($res))
-	{ ?>
+<?			while($row = mysql_fetch_assoc($res)) { ?>
   <tr>
     <td class="DataTD"><?=_("Domain")?>:</td>
     <td class="DataTD"><?=$row['domid']?></td>
     <td class="DataTD"><a href="account.php?id=43&amp;userid=<?=$row['id']?>"><?=sanitizeHTML($row['domain'])?></a></td>
   </tr>
-<? } if(mysql_num_rows($res) >= 100) { ?>
+<?			}
+			if(mysql_num_rows($res) >= 100) { ?>
   <tr>
     <td class="DataTD" colspan="3"><?=_("Only the first 100 rows are displayed.")?></td>
   </tr>
-<? } else { ?>
+<?			} else { ?>
   <tr>
     <td class="DataTD" colspan="3"><? printf(_("%s rows displayed."), mysql_num_rows($res)); ?></td>
   </tr>
-<? } ?>
+<?			} ?>
 </table><br><br>
 <?		} elseif(mysql_num_rows($res) == 1) {
 			$row = mysql_fetch_assoc($res);
@@ -79,23 +78,22 @@
   <tr>
     <td colspan="5" class="title"><?=_("Select Specific Organisation Account Details")?></td>
   </tr>
-<?
-	while($row = mysql_fetch_assoc($res))
-	{ ?>
+<?			while($row = mysql_fetch_assoc($res)) { ?>
   <tr>
     <td class="DataTD"><?=_("Domain")?>:</td>
     <td class="DataTD"><?=$row['id']?></td>
     <td class="DataTD"><a href="account.php?id=26&amp;orgid=<?=intval($row['orgid'])?>"><?=sanitizeHTML($row['domain'])?></a></td>
   </tr>
-<? } if(mysql_num_rows($res) >= 100) { ?>
+<?			}
+			if(mysql_num_rows($res) >= 100) { ?>
   <tr>
     <td class="DataTD" colspan="3"><?=_("Only the first 100 rows are displayed.")?></td>
   </tr>
-<? } else { ?>
+<?			} else { ?>
   <tr>
     <td class="DataTD" colspan="3"><? printf(_("%s rows displayed."), mysql_num_rows($res)); ?></td>
   </tr>
-<? } ?>
+<?			} ?>
 </table><br><br>
 <?		} elseif(mysql_num_rows($res) == 1) {
 			$row = mysql_fetch_assoc($res);
-- 
cgit v1.2.1