Empty commit

This commit is contained in:
Git 2011-09-25 08:00:11 +00:00
parent e3372d1487
commit 11a65f2945

View File

@ -220,7 +220,7 @@ function num_compare($Field, $Operand, $Num1, $Num2 = ''){
if(!empty($_GET['email'])){ if(!empty($_GET['email'])){
if(isset($_GET['email_history'])){ if(isset($_GET['email_history'])){
$Distinct = 'DISTINCT '; $Distinct = 'DISTINCT ';
$Join[]=' JOIN users_history_emails AS he ON he.UserID=um1.ID '; $Join['he']=' JOIN users_history_emails AS he ON he.UserID=um1.ID ';
$Where[]= ' he.Email '.$Match.wrap($_GET['email']); $Where[]= ' he.Email '.$Match.wrap($_GET['email']);
} else { } else {
$Where[]='um1.Email'.$Match.wrap($_GET['email']); $Where[]='um1.Email'.$Match.wrap($_GET['email']);
@ -250,7 +250,7 @@ function num_compare($Field, $Operand, $Num1, $Num2 = ''){
if(!empty($_GET['ip'])){ if(!empty($_GET['ip'])){
if(isset($_GET['ip_history'])){ if(isset($_GET['ip_history'])){
$Distinct = 'DISTINCT '; $Distinct = 'DISTINCT ';
$Join[]=' JOIN users_history_ips AS hi ON hi.UserID=um1.ID '; $Join['hi']=' JOIN users_history_ips AS hi ON hi.UserID=um1.ID ';
$Where[]= ' hi.IP '.$Match.wrap($_GET['ip'], '', true); $Where[]= ' hi.IP '.$Match.wrap($_GET['ip'], '', true);
} else { } else {
$Where[]='um1.IP'.$Match.wrap($_GET['ip'], '', true); $Where[]='um1.IP'.$Match.wrap($_GET['ip'], '', true);
@ -267,13 +267,13 @@ function num_compare($Field, $Operand, $Num1, $Num2 = ''){
if(!empty($_GET['tracker_ip'])){ if(!empty($_GET['tracker_ip'])){
$Distinct = 'DISTINCT '; $Distinct = 'DISTINCT ';
$Join[]=' JOIN xbt_files_users AS xfu ON um1.ID=xfu.uid '; $Join['xfu']=' JOIN xbt_files_users AS xfu ON um1.ID=xfu.uid ';
$Where[]= ' xfu.ip '.$Match.wrap($_GET['tracker_ip'], '', true); $Where[]= ' xfu.ip '.$Match.wrap($_GET['tracker_ip'], '', true);
} }
// if(!empty($_GET['tracker_ip'])){ // if(!empty($_GET['tracker_ip'])){
// $Distinct = 'DISTINCT '; // $Distinct = 'DISTINCT ';
// $Join[]=' JOIN xbt_snatched AS xs ON um1.ID=xs.uid '; // $Join['xs']=' JOIN xbt_snatched AS xs ON um1.ID=xs.uid ';
// $Where[]= ' xs.IP '.$Match.wrap($_GET['ip']); // $Where[]= ' xs.IP '.$Match.wrap($_GET['ip']);
// } // }
@ -360,13 +360,13 @@ function num_compare($Field, $Operand, $Num1, $Num2 = ''){
if($_GET['disabled_ip']){ if($_GET['disabled_ip']){
$Distinct = 'DISTINCT '; $Distinct = 'DISTINCT ';
if($_GET['ip_history']){ if($_GET['ip_history']){
//if(count($Join) == 0){ if(!isset($Join['hi'])){
$Join[]=' JOIN users_history_ips AS hi ON hi.UserID=um1.ID '; $Join['hi']=' JOIN users_history_ips AS hi ON hi.UserID=um1.ID ';
//} }
$Join[]=' JOIN users_history_ips AS hi2 ON hi2.IP=hi.IP '; $Join['hi2']=' JOIN users_history_ips AS hi2 ON hi2.IP=hi.IP ';
$Join[]=' JOIN users_main AS um2 ON um2.ID=hi2.UserID AND um2.Enabled=\'2\' '; $Join['um2']=' JOIN users_main AS um2 ON um2.ID=hi2.UserID AND um2.Enabled=\'2\' ';
} else { } else {
$Join[]=' JOIN users_main AS um2 ON um2.IP=um1.IP AND um2.Enabled=\'2\' '; $Join['um2']=' JOIN users_main AS um2 ON um2.IP=um1.IP AND um2.Enabled=\'2\' ';
} }
} }
@ -421,7 +421,7 @@ function num_compare($Field, $Operand, $Num1, $Num2 = ''){
<input type="text" name="username" size="20" value="<?=display_str($_GET['username'])?>" /> <input type="text" name="username" size="20" value="<?=display_str($_GET['username'])?>" />
</td> </td>
<td class="label nobr">Joined:</td> <td class="label nobr">Joined:</td>
<td width="24%" class="nobr"> <td width="24%">
<select name="joined"> <select name="joined">
<option value="on"<? if($_GET['joined']==='on'){echo ' selected="selected"';}?>>On</option> <option value="on"<? if($_GET['joined']==='on'){echo ' selected="selected"';}?>>On</option>
<option value="before"<? if($_GET['joined']==='before'){echo ' selected="selected"';}?>>Before</option> <option value="before"<? if($_GET['joined']==='before'){echo ' selected="selected"';}?>>Before</option>
@ -648,13 +648,13 @@ function num_compare($Field, $Operand, $Num1, $Num2 = ''){
</select> </select>
</td> </td>
<td class="label nobr"># Of Emails:</td> <td class="label nobr"># Of Emails:</td>
<td> <td>
<select name="emails_opt"> <select name="emails_opt">
<option value="equal"<? if($_GET['emails_opt']==='equal'){echo ' selected="selected"';}?>>Equal</option> <option value="equal"<? if($_GET['emails_opt']==='equal'){echo ' selected="selected"';}?>>Equal</option>
<option value="above"<? if($_GET['emails_opt']==='above'){echo ' selected="selected"';}?>>Above</option> <option value="above"<? if($_GET['emails_opt']==='above'){echo ' selected="selected"';}?>>Above</option>
<option value="below"<? if($_GET['emails_opt']==='below'){echo ' selected="selected"';}?>>Below</option> <option value="below"<? if($_GET['emails_opt']==='below'){echo ' selected="selected"';}?>>Below</option>
</select> </select>
<input type="text" name="email_cnt" size="6" value="<?=display_str($_GET['email_cnt'])?>" /> <input type="text" name="email_cnt" size="6" value="<?=display_str($_GET['email_cnt'])?>" />
</td> </td>
</tr> </tr>
<tr> <tr>