--- loncom/interface/coursecatalog.pm	2012/02/14 00:29:50	1.58.4.8.2.1
+++ loncom/interface/coursecatalog.pm	2013/11/21 16:34:23	1.58.4.9
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler for displaying the course catalog interface
 #
-# $Id: coursecatalog.pm,v 1.58.4.8.2.1 2012/02/14 00:29:50 raeburn Exp $
+# $Id: coursecatalog.pm,v 1.58.4.9 2013/11/21 16:34:23 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -66,13 +66,20 @@ sub handler {
     }
     my $formname = 'coursecatalog';
     if ($env{'form.showdom'} ne '') {
+        $env{'form.showdom'} = &LONCAPA::clean_domain($env{'form.showdom'});
         if (&Apache::lonnet::domain($env{'form.showdom'}) ne '') {
             $codedom = $env{'form.showdom'};
+        } else {
+            $env{'form.showdom'} = '';
         }
     }
     my $domdesc = &Apache::lonnet::domain($codedom,'description');
     &Apache::lonhtmlcommon::clear_breadcrumbs();
 
+    if ($env{'form.catalog_maxdepth'} ne '') {
+        $env{'form.catalog_maxdepth'} =~ s{\D}{}g;
+    }
+
     my %domconfig =
         &Apache::lonnet::get_dom('configuration',['coursecategories'],$codedom);
     my (@cats,@trails,%allitems,%idx,@jsarray,%subcathash,$cathash);
@@ -333,16 +340,14 @@ sub cat_header {
     unless ($env{'form.interface'} eq 'textual') {
         $onchange = 'this.form.submit()';
     }
-    unless ($codedom eq 'relate') {
-        $r->print('<form name="coursecatdom" method="post" action="/adm/coursecatalog">'.
-                  '<table border="0"><tr><td><b>'.&mt('Domain:').'</b></td><td>'.
-                  &Apache::loncommon::select_dom_form($codedom,'showdom','',1,$onchange));
-        if (!$onchange) {
-	    $r->print('&nbsp;<input type="submit" name="godom" value="'.&mt('Change').'" />');
-        }
-        $r->print('</td></tr></table></form>');
+    $r->print('<form name="coursecatdom" method="post" action="/adm/coursecatalog">'.
+              '<table border="0"><tr><td><b>'.&mt('Domain:').'</b></td><td>'.
+              &Apache::loncommon::select_dom_form($codedom,'showdom','',1,$onchange));
+    if (!$onchange) {
+	   $r->print('&nbsp;<input type="submit" name="godom" value="'.&mt('Change').'" />');
     }
-    $r->print('<form name="coursecats" method="post" action="/adm/coursecatalog"'.
+    $r->print('</td></tr></table></form>'.
+	      '<form name="coursecats" method="post" action="/adm/coursecatalog"'.
               ' onsubmit="return check_selected();">'.
               '<table border="0"><tr>'.$catlinks.'</tr></table></form>');
     return;