--- loncom/interface/lonpreferences.pm	2007/05/20 21:10:53	1.105
+++ loncom/interface/lonpreferences.pm	2007/07/06 23:17:30	1.108
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Preferences
 #
-# $Id: lonpreferences.pm,v 1.105 2007/05/20 21:10:53 www Exp $
+# $Id: lonpreferences.pm,v 1.108 2007/07/06 23:17:30 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -575,11 +575,12 @@ sub clickerchanger {
     $clickers=~s/\,/\n/gs;
     my $text=&mt('Enter response device ("clicker") numbers');
     my $change=&mt('Register');
+    my $helplink=&Apache::loncommon::help_open_topic('Clicker_Registration', 'Locating your clicker ID');
     $r->print(<<ENDSCREEN);
 <form name="prefs" action="/adm/preferences" method="post">
 <input type="hidden" name="action" value="verify_and_change_clicker" />
-<label>$text<br />
-<textarea name="clickers" rows="5" cols="10">$clickers</textarea>
+<label>$text $helplink<br />
+<textarea name="clickers" rows="5" cols="20">$clickers</textarea>
 </label>
 <input type="submit" value="$change" />
 </form>
@@ -591,8 +592,10 @@ sub verify_and_change_clicker {
     my $user       = $env{'user.name'};
     my $domain     = $env{'user.domain'};
     my $newclickers  = $env{'form.clickers'};
-    $newclickers=~s/\W+/\,/gs;
+    $newclickers=~s/[^\w\:\-]+/\,/gs;
     $newclickers=~tr/a-z/A-Z/;
+    $newclickers=~s/[\:\-]+/\-/g;
+    $newclickers=~s/\,+/\,/g;
     $newclickers=~s/^\,//;
     $newclickers=~s/\,$//;
     &Apache::lonnet::put('environment',{'clickers' => $newclickers});
@@ -1801,21 +1804,21 @@ sub handler {
                       printmenu => 'yes',
                       }));
 
-#    push (@Options,({ action   => 'changeclicker',
-#                      linktext => 'Register Response Devices ("Clickers")',
-#                      href     => '/adm/preferences',
-#                      subroutine => \&clickerchanger,
-#                      breadcrumb =>
-#                          { href => '/adm/preferences?action=changeicons',
-#                            text => 'Register Clicker'},
-#                      },
-#                    { action   => 'verify_and_change_clicker',
-#                      subroutine => \&verify_and_change_clicker,
-#                      breadcrumb =>
-#                          { href => '/adm/preferences?action=changeclicker',
-#                            text => 'Register Clicker'},
-#                      printmenu => 'yes',
-#                      }));
+    push (@Options,({ action   => 'changeclicker',
+                      linktext => 'Register Response Devices ("Clickers")',
+                      href     => '/adm/preferences',
+                      subroutine => \&clickerchanger,
+                      breadcrumb =>
+                          { href => '/adm/preferences?action=changeicons',
+                            text => 'Register Clicker'},
+                      },
+                    { action   => 'verify_and_change_clicker',
+                      subroutine => \&verify_and_change_clicker,
+                      breadcrumb =>
+                          { href => '/adm/preferences?action=changeclicker',
+                            text => 'Register Clicker'},
+                      printmenu => 'yes',
+                      }));
 
 
     if (&Apache::lonnet::allowed('whn',$env{'request.course.id'})