web/html/network/software/channels/manage/edit.pxt | 10 +++++-----
web/modules/sniglets/Sniglets/ChannelEditor.pm | 4 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
New commits:
commit fa85d1ee7b295826eae6981d9aa27bf6d72e3123
Author: Dimitar Yordanov <dyordano(a)redhat.com>
Date: Wed Aug 28 15:11:54 2013 +0200
1001826 - restrictions to channel name (update)
diff --git a/web/html/network/software/channels/manage/edit.pxt
b/web/html/network/software/channels/manage/edit.pxt
index 8285d0d..503893d 100644
--- a/web/html/network/software/channels/manage/edit.pxt
+++ b/web/html/network/software/channels/manage/edit.pxt
@@ -25,12 +25,12 @@
channel. Otherwise, the channel is a child of the specified channel.
</p>
<p>
- Channel name and label are required.
+ Channel name and label are required.<br>
They each must be at least 6 characters in length.<br>
- Channel name must no be longer than 256 characters and channel label must no be
longer than 128 characters.<br>
- Channel label may begin with a letter or digit whether channel name must begin
with a letter and for both is not allowed to <br>
- begin with rhn, redhat or red hat.<br>
- Further both must contain only lowercase letters, hyphens ('-'), periods
('.'), underscores ('_'), and numerals.<br>
+ Channel name must not be longer than 256 characters and channel label must not be
longer than 128 characters.<br>
+ Channel name must begin with a letter and channel label may begin with a letter
or digit.<br>
+ They each must not begin with rhn, redhat or red hat.<br>
+ They each must contain only lowercase letters, hyphens ('-'), periods
('.'), underscores ('_'), and numerals.<br>
Channel name may also contain spaces, parentheses () and forward slashes
('/').
</p>
<p>
diff --git a/web/modules/sniglets/Sniglets/ChannelEditor.pm
b/web/modules/sniglets/Sniglets/ChannelEditor.pm
index 473993f..1538229 100644
--- a/web/modules/sniglets/Sniglets/ChannelEditor.pm
+++ b/web/modules/sniglets/Sniglets/ChannelEditor.pm
@@ -148,13 +148,13 @@ sub channel_edit_cb {
# bugzilla: 459827 - disallow names longer than 64 characters
unless ($channel_name =~ /^[a-z][\w\d\s\-\.\'\(\)\/\_]*$/i and
length($channel_name) >= 6 and length($channel_name) <= 256) {
$pxt->push_message(local_alert => "Invalid channel name '" .
- PXT::Utils->escapeHTML($channel_name) . "' - must be at least 6
characters long and no longer than 256 characters, begin with a letter, and contain only
letters, digits, spaces, parentheses, '-', ' / ', '_' and
'.'");
+ PXT::Utils->escapeHTML($channel_name) . "' - must be at least 6
characters long and not longer than 256 characters, begin with a letter, and contain only
letters, digits, spaces, parentheses, '-', ' / ', '_' and
'.'");
$errors++;
}
# bugzilla: 161517 - allow _ in channel labels
unless ($channel_label =~ /^[a-z\d][a-z\d\-\.\_]*$/ and length($channel_label) >= 6
and length($channel_label) <= 128) {
- $pxt->push_message(local_alert => "Invalid channel label
'$channel_label' - must be at least 6 characters long and no longer than 128
characters, begin with a letter or digit, and contain only lowercase letters, digits,
'-', '_', and '.'");
+ $pxt->push_message(local_alert => "Invalid channel label
'$channel_label' - must be at least 6 characters long and not longer than 128
characters, begin with a letter or digit, and contain only lowercase letters, digits,
'-', '_', and '.'");
$errors++;
}