Empty commit

This commit is contained in:
Git 2014-01-28 08:00:56 +00:00
parent 95bbdfb01d
commit a92d42129a
4 changed files with 42 additions and 31 deletions

View File

@ -1,5 +1,14 @@
CHANGE LOG CHANGE LOG
2014-01-28 by alderaan
Adv. User Search: Replace date format tooltips with "placeholder" HTML attributes
2014-01-28 by alderaan
Clear cache key "num_staff_pms_$LoggedUser[ID]" when reassigning Staff PMs
2014-01-27 by alderaan
UI improvements to the Client Whitelist Manager
2014-01-27 by alderaan 2014-01-27 by alderaan
.gitattributes: set diff=html and diff=php, and clean up the file a bit .gitattributes: set diff=html and diff=php, and clean up the file a bit

View File

@ -63,6 +63,7 @@
Level = $NewLevel, Level = $NewLevel,
AssignedToUser = NULL AssignedToUser = NULL
WHERE ID = $ConvID"); WHERE ID = $ConvID");
$Cache->delete_value("num_staff_pms_$LoggedUser[ID]");
} else { } else {
$UserInfo = Users::user_info($NewLevel); $UserInfo = Users::user_info($NewLevel);
$Level = $Classes[$UserInfo['PermissionID']]['Level']; $Level = $Classes[$UserInfo['PermissionID']]['Level'];
@ -77,7 +78,7 @@
AssignedToUser = $NewLevel, AssignedToUser = $NewLevel,
Level = $Level Level = $Level
WHERE ID = $ConvID"); WHERE ID = $ConvID");
$Cache->delete_value("num_staff_pms_$LoggedUser[ID]");
} }
echo '1'; echo '1';

View File

@ -3,15 +3,36 @@
error(403); error(403);
} }
View::show_header('Whitelist Management'); View::show_header('Client Whitelist Manager');
$DB->query(' $DB->query('
SELECT id, vstring, peer_id SELECT id, vstring, peer_id
FROM xbt_client_whitelist FROM xbt_client_whitelist
ORDER BY peer_id ASC'); ORDER BY peer_id ASC');
?> ?>
<div class="header"> <div class="header">
<h2>Allowed Clients</h2> <h2>Client Whitelist</h2>
</div> </div>
<div class="box2 pad thin">
<form class="add_form" name="clients" action="" method="post">
<input type="hidden" name="action" value="whitelist_alter" />
<input type="hidden" name="auth" value="<?=$LoggedUser['AuthKey']?>" />
<table>
<tr class="colhead">
<td colspan="4">Add client</td>
</tr>
<tr class="rowa">
<td>
<input type="text" size="60" name="client" placeholder="Client name" />
</td>
<td>
<input type="text" size="10" name="peer_id" placeholder="Peer ID" />
</td>
<td>
<input type="submit" value="Create" />
</td>
</tr>
</table>
</form>
<table width="100%"> <table width="100%">
<tr class="colhead"> <tr class="colhead">
<td>Client</td> <td>Client</td>
@ -31,7 +52,7 @@
<tr class="row<?=$Row?>"> <tr class="row<?=$Row?>">
<td> <td>
<input type="hidden" name="id" value="<?=$ID?>" /> <input type="hidden" name="id" value="<?=$ID?>" />
<input type="text" size="100" name="client" value="<?=$Client?>" /> <input type="text" size="60" name="client" value="<?=$Client?>" />
</td> </td>
<td> <td>
<input type="text" size="10" name="peer_id" value="<?=$Peer_ID?>" /> <input type="text" size="10" name="peer_id" value="<?=$Peer_ID?>" />
@ -44,25 +65,5 @@
</table> </table>
</form> </form>
<? } ?> <? } ?>
<form class="add_form" name="clients" action="" method="post"> </div>
<input type="hidden" name="action" value="whitelist_alter" />
<input type="hidden" name="auth" value="<?=$LoggedUser['AuthKey']?>" />
<table>
<tr class="colhead">
<td colspan="4">Add client</td>
</tr>
<tr class="rowa">
<td>
<input type="text" size="100" name="client" />
</td>
<td>
<input type="text" size="10" name="peer_id" />
</td>
<td>
<input type="submit" value="Create" />
</td>
</tr>
</table>
</form>
<? View::show_footer(); ?> <? View::show_footer(); ?>

View File

@ -460,7 +460,7 @@ function num_compare($Field, $Operand, $Num1, $Num2 = '') {
<td width="24%"> <td width="24%">
<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 tooltip nobr" title="Date format is YYYY-MM-DD">Joined:</td> <td class="label nobr">Joined:</td>
<td width="24%"> <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>
@ -468,8 +468,8 @@ function num_compare($Field, $Operand, $Num1, $Num2 = '') {
<option value="after"<? if ($_GET['joined'] === 'after') { echo ' selected="selected"'; } ?>>After</option> <option value="after"<? if ($_GET['joined'] === 'after') { echo ' selected="selected"'; } ?>>After</option>
<option value="between"<? if ($_GET['joined'] === 'between') { echo ' selected="selected"'; } ?>>Between</option> <option value="between"<? if ($_GET['joined'] === 'between') { echo ' selected="selected"'; } ?>>Between</option>
</select> </select>
<input type="text" name="join1" size="6" value="<?=display_str($_GET['join1'])?>" /> <input type="text" name="join1" size="10" value="<?=display_str($_GET['join1'])?>" placeholder="YYYY-MM-DD" />
<input type="text" name="join2" size="6" value="<?=display_str($_GET['join2'])?>" /> <input type="text" name="join2" size="10" value="<?=display_str($_GET['join2'])?>" placeholder="YYYY-MM-DD" />
</td> </td>
<td class="label nobr">Enabled:</td> <td class="label nobr">Enabled:</td>
<td> <td>
@ -486,7 +486,7 @@ function num_compare($Field, $Operand, $Num1, $Num2 = '') {
<td> <td>
<input type="text" name="email" size="20" value="<?=display_str($_GET['email'])?>" /> <input type="text" name="email" size="20" value="<?=display_str($_GET['email'])?>" />
</td> </td>
<td class="label tooltip nobr" title="Date format is YYYY-MM-DD">Last active:</td> <td class="label nobr">Last active:</td>
<td width="30%"> <td width="30%">
<select name="lastactive"> <select name="lastactive">
<option value="on"<? if ($_GET['lastactive'] === 'on') { echo ' selected="selected"'; } ?>>On</option> <option value="on"<? if ($_GET['lastactive'] === 'on') { echo ' selected="selected"'; } ?>>On</option>
@ -494,8 +494,8 @@ function num_compare($Field, $Operand, $Num1, $Num2 = '') {
<option value="after"<? if ($_GET['lastactive'] === 'after') { echo ' selected="selected"'; } ?>>After</option> <option value="after"<? if ($_GET['lastactive'] === 'after') { echo ' selected="selected"'; } ?>>After</option>
<option value="between"<? if ($_GET['lastactive'] === 'between') { echo ' selected="selected"'; } ?>>Between</option> <option value="between"<? if ($_GET['lastactive'] === 'between') { echo ' selected="selected"'; } ?>>Between</option>
</select> </select>
<input type="text" name="lastactive1" size="6" value="<?=display_str($_GET['lastactive1'])?>" /> <input type="text" name="lastactive1" size="10" value="<?=display_str($_GET['lastactive1'])?>" placeholder="YYYY-MM-DD" />
<input type="text" name="lastactive2" size="6" value="<?=display_str($_GET['lastactive2'])?>" /> <input type="text" name="lastactive2" size="10" value="<?=display_str($_GET['lastactive2'])?>" placeholder="YYYY-MM-DD" />
</td> </td>
<td class="label nobr">Primary class:</td> <td class="label nobr">Primary class:</td>
<td> <td>