--- loncom/interface/lonpreferences.pm	2007/07/05 21:37:38	1.107
+++ 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.107 2007/07/05 21:37:38 www Exp $
+# $Id: lonpreferences.pm,v 1.108 2007/07/06 23:17:30 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -580,7 +580,7 @@ sub clickerchanger {
 <form name="prefs" action="/adm/preferences" method="post">
 <input type="hidden" name="action" value="verify_and_change_clicker" />
 <label>$text $helplink<br />
-<textarea name="clickers" rows="5" cols="10">$clickers</textarea>
+<textarea name="clickers" rows="5" cols="20">$clickers</textarea>
 </label>
 <input type="submit" value="$change" />
 </form>
@@ -592,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});