root
/
rabbitmq-server
mirror of https://github.com/rabbitmq/rabbitmq-server.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Make fmt_string a bit more general, and use it all over the place.

This commit is contained in:
Simon MacMullen 2011-11-30 13:43:42 +00:00
parent 9fa15a3c54
commit a48eb623b2
19 changed files with 72 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
deps/rabbitmq_management/priv/www/js/formatters.js vendored
View File

@ -8,7 +8,7 @@ PROCESS_THRESHOLDS=[[0.75, 'red'],
function fmt_string(str) {
if (str == undefined) return UNKNOWN_REPR;
return str;
return fmt_escape_html("" + str);
}
function fmt_num(num) {
@ -57,8 +57,8 @@ function fmt_parameters_short(obj) {
for (var k in ALL_ARGS) {
if (params[k] != undefined) {
res += '<acronym title="' + k + ': ' + params[k] + '">' +
ALL_ARGS[k].short + '</acronym> ';
res += '<acronym title="' + k + ': ' + fmt_string(params[k]) +
'">' + ALL_ARGS[k].short + '</acronym> ';
}
}
@ -194,11 +194,11 @@ function is_col_empty(objects, name, accessor) {
}
function fmt_exchange(name) {
return name == '' ? '(AMQP default)' : name;
return name == '' ? '(AMQP default)' : fmt_escape_html(name);
}
function fmt_exchange_url(name) {
return name == '' ? 'amq.default' : name;
return name == '' ? 'amq.default' : fmt_escape_html(name);
}
function fmt_download_filename(host) {
@ -332,10 +332,6 @@ function fmt_maybe_wrap(txt, encoding) {
return fmt_escape_html(res);
}
function fmt_escape_html(txt) {
return txt.replace(/</g, '&lt;').replace(/>/g, '&gt;');
}
function fmt_node_host(node_host) {
var both = node_host.split('@');
var node = both.slice(0, 1);

8
deps/rabbitmq_management/priv/www/js/tmpl/add-binding.ejs vendored
View File

@ -9,11 +9,11 @@
</td>
<% } %>
<td>
<input type="hidden" name="vhost" value="<%= parent.vhost %>"/>
<input type="hidden" name="vhost" value="<%= fmt_string(parent.vhost) %>"/>
<% if (mode == 'queue') { %>
<input type="hidden" name="destination" value="<%= parent.name %>"/>
<input type="hidden" name="destination" value="<%= fmt_string(parent.name) %>"/>
<% } else { %>
<input type="hidden" name="source" value="<%= parent.name %>"/>
<input type="hidden" name="source" value="<%= fmt_string(parent.name) %>"/>
<% } %>
<table class="form">
<% if (mode == 'queue') { %>
@ -54,7 +54,7 @@
<% if (mode == 'queue') { %>
<td class="binding-endpoint">
<span class="arrow">&rarr;</span>
<span class="object"><%= parent.name %></span>
<span class="object"><%= fmt_string(parent.name) %></span>
</td>
<% } %>
</tr>

8
deps/rabbitmq_management/priv/www/js/tmpl/bindings.ejs vendored
View File

@ -35,16 +35,16 @@
<sub>Queue</sub>
</td>
<% } %>
<td><%= binding.routing_key %></td>
<td><%= fmt_string(binding.routing_key) %></td>
<td><%= fmt_table_short(binding.arguments) %></td>
<td class="c">
<% if (binding.source != '') { %>
<form action="#/bindings" method="delete" class="confirm">
<input type="hidden" name="vhost" value="<%= binding.vhost %>"/>
<input type="hidden" name="vhost" value="<%= fmt_string(binding.vhost) %>"/>
<input type="hidden" name="source" value="<%= fmt_exchange_url(binding.source) %>"/>
<input type="hidden" name="destination" value="<%= binding.destination %>"/>
<input type="hidden" name="destination" value="<%= fmt_string(binding.destination) %>"/>
<input type="hidden" name="destination_type" value="<%= binding.destination_type.substring(0, 1) %>"/>
<input type="hidden" name="properties_key" value="<%= binding.properties_key %>"/>
<input type="hidden" name="properties_key" value="<%= fmt_string(binding.properties_key) %>"/>
<input type="submit" value="Unbind"/>
</form>
<% } %>

6
deps/rabbitmq_management/priv/www/js/tmpl/channel.ejs vendored
View File

@ -11,18 +11,18 @@
<% if (nodes_interesting) { %>
<tr>
<th>Node</th>
<td><%= channel.node %></td>
<td><%= fmt_string(channel.node) %></td>
</tr>
<% } %>
<% if (vhosts_interesting) { %>
<tr>
<th>Virtual host</th>
<td><%= channel.vhost %></td>
<td><%= fmt_string(channel.vhost) %></td>
</tr>
<% } %>
<tr>
<th>Username</th>
<td><%= channel.user %></td>
<td><%= fmt_string(channel.user) %></td>
</tr>
<tr>
<th>Mode <span class="help" id="channel-mode"></span></th>

6
deps/rabbitmq_management/priv/www/js/tmpl/channels-list.ejs vendored
View File

@ -89,13 +89,13 @@
<%= link_channel(channel.name) %>
</td>
<% if (mode == 'standalone' && nodes_interesting) { %>
<td><%= channel.node %></td>
<td><%= fmt_string(channel.node) %></td>
<% } %>
<% if (mode == 'standalone') { %>
<% if (vhosts_interesting) { %>
<td class="c"><%= channel.vhost %></td>
<td class="c"><%= fmt_string(channel.vhost) %></td>
<% } %>
<td class="c"><%= channel.user %></td>
<td class="c"><%= fmt_string(channel.user) %></td>
<% } %>
<td class="c">
<%= fmt_channel_mode(channel) %>

10
deps/rabbitmq_management/priv/www/js/tmpl/connection.ejs vendored
View File

@ -1,4 +1,4 @@
<h1>Connection <b><%= fmt_escape_html(connection.name) %></b></h1>
<h1>Connection <b><%= fmt_string(connection.name) %></b></h1>
<div class="section">
<h2>Overview</h2>
@ -29,18 +29,18 @@
<% if (nodes_interesting) { %>
<tr>
<th>Node</th>
<td><%= connection.node %></td>
<td><%= fmt_string(connection.node) %></td>
</tr>
<% } %>
<% if (vhosts_interesting) { %>
<tr>
<th>Virtual host</th>
<td><%= connection.vhost %></td>
<td><%= fmt_string(connection.vhost) %></td>
</tr>
<% } %>
<tr>
<th>Username</th>
<td><%= connection.user %></td>
<td><%= fmt_string(connection.user) %></td>
</tr>
<tr>
<th>Protocol</th>
@ -142,7 +142,7 @@
<h2>Close this connection</h2>
<div class="hider">
<form action="#/connections" method="delete" class="confirm">
<input type="hidden" name="name" value="<%= connection.name %>"/>
<input type="hidden" name="name" value="<%= fmt_string(connection.name) %>"/>
<input type="submit" value="Force Close"/>
</form>
</div>

4
deps/rabbitmq_management/priv/www/js/tmpl/connections.ejs vendored
View File

@ -44,9 +44,9 @@
<td><%= fmt_rate_bytes(connection, 'send_oct') %></td>
<td><%= connection.channels %></td>
<% if (vhosts_interesting) { %>
<td><%= connection.vhost %></td>
<td><%= fmt_string(connection.vhost) %></td>
<% } %>
<td><%= connection.user %></td>
<td><%= fmt_string(connection.user) %></td>
<td><%= connection.state %></td>
</tr>
<% } %>

4
deps/rabbitmq_management/priv/www/js/tmpl/consumers.ejs vendored
View File

@ -20,9 +20,9 @@
<tr<%= alt_rows(i) %>>
<% if (mode == 'queue') { %>
<td><%= link_channel(consumer.channel_details.name) %></td>
<td><%= consumer.consumer_tag %></td>
<td><%= fmt_string(consumer.consumer_tag) %></td>
<% } else { %>
<td><%= consumer.consumer_tag %></td>
<td><%= fmt_string(consumer.consumer_tag) %></td>
<td><%= link_queue(consumer.queue_details.vhost, consumer.queue_details.name) %></td>
<% } %>
<td class="c"><%= fmt_boolean(consumer.ack_required) %></td>

8
deps/rabbitmq_management/priv/www/js/tmpl/exchange.ejs vendored
View File

@ -6,7 +6,7 @@
<table class="facts">
<tr>
<th>Type</th>
<td><%= exchange.type %></td>
<td><%= fmt_string(exchange.type) %></td>
</tr>
<tr>
<th>Parameters</th>
@ -15,7 +15,7 @@
<% if (vhosts_interesting) { %>
<tr>
<th>Virtual host</th>
<td><%= exchange.vhost %></td>
<td><%= fmt_string(exchange.vhost) %></td>
</tr>
<% } %>
</table>
@ -97,7 +97,7 @@
<h2>Publish message</h2>
<div class="hider">
<form action="#/exchanges/publish" method="post">
<input type="hidden" name="vhost" value="<%= exchange.vhost %>"/>
<input type="hidden" name="vhost" value="<%= fmt_string(exchange.vhost) %>"/>
<input type="hidden" name="name" value="<%= fmt_exchange_url(exchange.name) %>"/>
<input type="hidden" name="properties" value=""/>
<table class="form">
@ -152,7 +152,7 @@
<h2>Delete this exchange</h2>
<div class="hider">
<form action="#/exchanges" method="delete" class="confirm">
<input type="hidden" name="vhost" value="<%= exchange.vhost %>"/>
<input type="hidden" name="vhost" value="<%= fmt_string(exchange.vhost) %>"/>
<input type="hidden" name="name" value="<%= fmt_exchange_url(exchange.name) %>"/>
<input type="submit" value="Delete"/>
</form>

8
deps/rabbitmq_management/priv/www/js/tmpl/exchanges.ejs vendored
View File

@ -24,10 +24,10 @@
%>
<tr<%= alt_rows(i)%>>
<% if (vhosts_interesting) { %>
<td><%= exchange.vhost %></td>
<td><%= fmt_string(exchange.vhost) %></td>
<% } %>
<td><%= link_exchange(exchange.vhost, exchange.name) %></td>
<td class="c"><%= exchange.type %></td>
<td class="c"><%= fmt_string(exchange.type) %></td>
<td class="c"><%= fmt_parameters_short(exchange) %></td>
<td class="r"><%= fmt_rate(exchange.message_stats_in, 'publish', false) %></td>
</tr>
@ -48,13 +48,13 @@
<td>
<select name="vhost">
<% for (var i = 0; i < vhosts.length; i++) { %>
<option value="<%= vhosts[i].name %>"><%= vhosts[i].name %></option>
<option value="<%= fmt_string(vhosts[i].name) %>"><%= fmt_string(vhosts[i].name) %></option>
<% } %>
</select>
</td>
</tr>
<% } else { %>
<tr><td><input type="hidden" name="vhost" value="<%= vhosts[0].name %>"/></td></tr>
<tr><td><input type="hidden" name="vhost" value="<%= fmt_string(vhosts[0].name) %>"/></td></tr>
<% } %>
<tr>
<th><label>Name:</label></th>

2
deps/rabbitmq_management/priv/www/js/tmpl/messages.ejs vendored
View File

@ -12,7 +12,7 @@
</tr>
<tr>
<th>Routing Key</th>
<td><%= msg.routing_key %></td>
<td><%= fmt_string(msg.routing_key) %></td>
</tr>
<tr>
<th>Redelivered</th>

18
deps/rabbitmq_management/priv/www/js/tmpl/permissions.ejs vendored
View File

@ -27,13 +27,13 @@ for (var i = 0; i < permissions.length; i++) {
<% } else { %>
<td><%= link_to(permission.vhost, '#/vhosts/' + esc(permission.vhost)) %></td>
<% } %>
<td><%= permission.configure %></td>
<td><%= permission.write %></td>
<td><%= permission.read %></td>
<td><%= fmt_string(permission.configure) %></td>
<td><%= fmt_string(permission.write) %></td>
<td><%= fmt_string(permission.read) %></td>
<td class="c">
<form action="#/permissions" method="delete" class="confirm">
<input type="hidden" name="username" value="<%= permission.user %>"/>
<input type="hidden" name="vhost" value="<%= permission.vhost %>"/>
<input type="hidden" name="username" value="<%= fmt_string(permission.user) %>"/>
<input type="hidden" name="vhost" value="<%= fmt_string(permission.vhost) %>"/>
<input type="submit" value="Clear"/>
</form>
</td>
@ -54,20 +54,20 @@ for (var i = 0; i < permissions.length; i++) {
<% if (mode == 'vhost') { %>
<th>User</th>
<td>
<input type="hidden" name="vhost" value="<%= parent.name %>"/>
<input type="hidden" name="vhost" value="<%= fmt_string(parent.name) %>"/>
<select name="username">
<% for (var i = 0; i < users.length; i++) { %>
<option value="<%= users[i].name %>"><%= users[i].name %></option>
<option value="<%= fmt_string(users[i].name) %>"><%= fmt_string(users[i].name) %></option>
<% } %>
</select>
</td>
<% } else { %>
<th><label>Virtual Host:</label></th>
<td>
<input type="hidden" name="username" value="<%= parent.name %>"/>
<input type="hidden" name="username" value="<%= fmt_string(parent.name) %>"/>
<select name="vhost">
<% for (var i = 0; i < vhosts.length; i++) { %>
<option value="<%= vhosts[i].name %>"><%= vhosts[i].name %></option>
<option value="<%= fmt_string(vhosts[i].name) %>"><%= fmt_string(vhosts[i].name) %></option>
<% } %>
</select>
</td>

24
deps/rabbitmq_management/priv/www/js/tmpl/queue.ejs vendored
View File

@ -1,4 +1,4 @@
<h1>Queue <b><%= queue.name %></b></h1>
<h1>Queue <b><%= fmt_string(queue.name) %></b></h1>
<div class="section">
<h2>Overview</h2>
@ -56,13 +56,13 @@
<% if (vhosts_interesting) { %>
<tr>
<th>Virtual host</th>
<td><%= queue.vhost %></td>
<td><%= fmt_string(queue.vhost) %></td>
</tr>
<% } %>
<% if (nodes_interesting) { %>
<tr>
<th>Node</th>
<td><%= queue.node %></td>
<td><%= fmt_string(queue.node) %></td>
</tr>
<tr>
<th>Mirrors</th>
@ -71,9 +71,9 @@
var node = queue.slave_nodes[i];
%>
<% if (jQuery.inArray(node, queue.synchronised_slave_nodes) == -1) { %>
<%= node %> <b>(unsynchronised)</b>
<%= fmt_string(node) %> <b>(unsynchronised)</b>
<% } else { %>
<%= node %>
<%= fmt_string(node) %>
<% } %>
<br/>
<% } %>
@ -120,7 +120,7 @@
<div class="section-hidden">
<h2>Bindings</h2>
<div class="hider">
<h3>Incoming to <b><%= queue.name %></b></h3>
<h3>Incoming to <b><%= fmt_string(queue.name) %></b></h3>
<table class="bindings updatable">
<tr>
<td>
@ -146,8 +146,8 @@
<span class="help" id="message-get-requeue"></span>
</p>
<form action="#/queues/get" method="post">
<input type="hidden" name="vhost" value="<%= queue.vhost %>"/>
<input type="hidden" name="name" value="<%= queue.name %>"/>
<input type="hidden" name="vhost" value="<%= fmt_string(queue.vhost) %>"/>
<input type="hidden" name="name" value="<%= fmt_string(queue.name) %>"/>
<input type="hidden" name="truncate" value="50000"/>
<table class="form">
<tr>
@ -184,15 +184,15 @@
<h2>Delete / purge</h2>
<div class="hider">
<form action="#/queues" method="delete" class="confirm inline-form">
<input type="hidden" name="vhost" value="<%= queue.vhost %>"/>
<input type="hidden" name="name" value="<%= queue.name %>"/>
<input type="hidden" name="vhost" value="<%= fmt_string(queue.vhost) %>"/>
<input type="hidden" name="name" value="<%= fmt_string(queue.name) %>"/>
<input type="hidden" name="mode" value="delete"/>
<input type="submit" value="Delete" />
</form>
<form action="#/queues" method="delete" class="inline-form-right">
<input type="hidden" name="vhost" value="<%= queue.vhost %>"/>
<input type="hidden" name="name" value="<%= queue.name %>"/>
<input type="hidden" name="vhost" value="<%= fmt_string(queue.vhost) %>"/>
<input type="hidden" name="name" value="<%= fmt_string(queue.name) %>"/>
<input type="hidden" name="mode" value="purge"/>
<input type="submit" value="Purge" />
</form>

10
deps/rabbitmq_management/priv/www/js/tmpl/queues.ejs vendored
View File

@ -48,12 +48,12 @@
%>
<tr<%= alt_rows(i) %>>
<% if (vhosts_interesting) { %>
<td><%= queue.vhost %></td>
<td><%= fmt_string(queue.vhost) %></td>
<% } %>
<td><%= link_queue(queue.vhost, queue.name) %></td>
<% if (nodes_interesting) { %>
<td>
<%= queue.node %>
<%= fmt_string(queue.node) %>
<%= fmt_mirrors(queue) %>
</td>
<% } %>
@ -95,13 +95,13 @@
<td>
<select name="vhost">
<% for (var i = 0; i < vhosts.length; i++) { %>
<option value="<%= vhosts[i].name %>"><%= vhosts[i].name %></option>
<option value="<%= fmt_string(vhosts[i].name) %>"><%= fmt_string(vhosts[i].name) %></option>
<% } %>
</select>
</td>
</tr>
<% } else { %>
<tr><td><input type="hidden" name="vhost" value="<%= vhosts[0].name %>"/></td></tr>
<tr><td><input type="hidden" name="vhost" value="<%= fmt_string(vhosts[0].name) %>"/></td></tr>
<% } %>
<tr>
<th><label>Name:</label></th>
@ -125,7 +125,7 @@
<td>
<select name="node">
<% for (var i = 0; i < nodes.length; i++) { %>
<option value="<%= nodes[i].name %>"><%= nodes[i].name %></option>
<option value="<%= fmt_string(nodes[i].name) %>"><%= nodes[i].name %></option>
<% } %>
</select>
</td>

4
deps/rabbitmq_management/priv/www/js/tmpl/registry.ejs vendored
View File

@ -12,8 +12,8 @@
var item = list[i];
%>
<tr<%= alt_rows(i)%>>
<td><%= item.name %></td>
<td><%= item.description %></td>
<td><%= fmt_string(item.name) %></td>
<td><%= fmt_string(item.description) %></td>
<% if (show_enabled) { %>
<td class="c"><%= fmt_boolean(item.enabled) %></td>
<% } %>

2
deps/rabbitmq_management/priv/www/js/tmpl/status.ejs vendored
View File

@ -1 +1 @@
<p class="status-<%= status %>"><%= text %></p>
<p class="status-<%= fmt_string(status) %>"><%= fmt_string(text) %></p>

6
deps/rabbitmq_management/priv/www/js/tmpl/user.ejs vendored
View File

@ -1,4 +1,4 @@
<h1>User: <b><%= user.name %></b></h1>
<h1>User: <b><%= fmt_string(user.name) %></b></h1>
<% if (permissions.length == 0) { %>
<p class="warning">
@ -13,7 +13,7 @@
<table class="facts">
<tr>
<th>Tags</th>
<td><%= user.tags %></td>
<td><%= fmt_string(user.tags) %></td>
</tr>
<tr>
<th>Can log in with password</th>
@ -29,7 +29,7 @@
<h2>Delete this user</h2>
<div class="hider">
<form action="#/users" method="delete" class="confirm">
<input type="hidden" name="username" value="<%= user.name %>"/>
<input type="hidden" name="username" value="<%= fmt_string(user.name) %>"/>
<input type="submit" value="Delete"/>
</form>
</div>

2
deps/rabbitmq_management/priv/www/js/tmpl/users.ejs vendored
View File

@ -17,7 +17,7 @@
%>
<tr<%= alt_rows(i)%>>
<td><%= link_user(user.name) %></td>
<td class="c"><%= user.tags %></td>
<td class="c"><%= fmt_string(user.tags) %></td>
<td class="c"><%= fmt_permissions(user, permissions, 'user', 'vhost',
'<p class="warning">No access</p>') %></td>
</tr>

4
deps/rabbitmq_management/priv/www/js/tmpl/vhost.ejs vendored
View File

@ -1,4 +1,4 @@
<h1>Virtual Host: <b><%= vhost.name %></b></h1>
<h1>Virtual Host: <b><%= fmt_string(vhost.name) %></b></h1>
<% if (permissions.length == 0) { %>
<p class="warning">
@ -25,7 +25,7 @@
<h2>Delete this vhost</h2>
<div class="hider">
<form action="#/vhosts" method="delete" class="confirm">
<input type="hidden" name="name" value="<%= vhost.name %>"/>
<input type="hidden" name="name" value="<%= fmt_string(vhost.name) %>"/>
<input type="submit" value="Delete this virtual host"/>
</form>
</div>