web/html/network/software/channels/manage/edit.pxt | 12 ++++++++----
web/modules/sniglets/Sniglets/ChannelEditor.pm | 6 +++---
2 files changed, 11 insertions(+), 7 deletions(-)
New commits:
commit b0bcb7a3aeb032cd4e2e21277fae824dd0f7f248
Author: Dimitar Yordanov <dyordano(a)redhat.com>
Date: Tue Aug 27 23:16:02 2013 +0200
1001826 - restrictions to channel name
diff --git a/web/html/network/software/channels/manage/edit.pxt
b/web/html/network/software/channels/manage/edit.pxt
index 8625448..8285d0d 100644
--- a/web/html/network/software/channels/manage/edit.pxt
+++ b/web/html/network/software/channels/manage/edit.pxt
@@ -25,12 +25,16 @@
channel. Otherwise, the channel is a child of the specified channel.
</p>
<p>
- Channel name and label are required. They each must be at least 6
- characters in length. Labels must begin with a letter, contain only lowercase
letters,
- hyphens ('-'), periods ('.'), underscores ('_'), and
numerals. Channel name may also contain spaces and forward slashes ('/').
+ Channel name and label are required.
+ 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 may also contain spaces, parentheses () and forward slashes
('/').
</p>
<p>
- Channel summary is also required.
+ Channel summary is also required and must not exceed 500 characters.
</p>
</div>
diff --git a/web/modules/sniglets/Sniglets/ChannelEditor.pm
b/web/modules/sniglets/Sniglets/ChannelEditor.pm
index 5f395f5..473993f 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, '-', ' / ', '_' and '.'");
+ 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
'.'");
$errors++;
}
# bugzilla: 161517 - allow _ in channel labels
- unless ($channel_label =~ /^[a-z\d][a-z\d\-\.\_]*$/ and length($channel_label) >= 6)
{
- $pxt->push_message(local_alert => "Invalid channel label
'$channel_label' - must be at least 6 characters long, begin with a letter or
digit, and contain only lowercase letters, digits, '-', '_', and
'.'");
+ 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 '.'");
$errors++;
}