--- loncom/interface/lonsimplepage.pm	2012/12/07 17:15:56	1.101
+++ loncom/interface/lonsimplepage.pm	2013/09/17 15:04:30	1.103
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Simple Page Editor
 #
-# $Id: lonsimplepage.pm,v 1.101 2012/12/07 17:15:56 raeburn Exp $
+# $Id: lonsimplepage.pm,v 1.103 2013/09/17 15:04:30 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -33,8 +33,7 @@ use Apache::Constants qw(:common);
 use Apache::loncommon;
 use Apache::lontemplate;
 use Apache::lonnet;
-use Apache::lontexconvert;
-use Apache::lonfeedback;
+use Apache::lonhtmlgateway;
 use Apache::lonlocal;
 use Apache::lonprintout;
 use Apache::lonxml;
@@ -44,14 +43,18 @@ use HTML::Entities();
 use LONCAPA;
 
 sub get_db_name {
-    my ($url) = @_;
-    my ($udom,$uname,$marker)=(split(m{/},$url))[2,3,4];
-    my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
-    my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
-
+    my ($url,$marker,$cdom,$cnum) = @_;
+    my ($udom,$uname,$timemark)=(split(m{/},$url))[2,3,4];
+    if ($marker eq '') {
+        $marker = $timemark;
+    }
+    if (($cdom eq '') || ($cnum eq '')) {
+        $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+        $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+    }
     my $db_name;
 
-    if ($dom && $crs && ($udom eq $dom) && ($uname eq $crs)) {
+    if ($cdom && $cnum && ($udom eq $cdom) && ($uname eq $cnum)) {
         $marker =~ s/\W//g;
         $db_name = 'grppage_'.$marker;
     } else {
@@ -59,7 +62,6 @@ sub get_db_name {
         $db_name = 'smppage_'.$marker;
     }
     return if (!defined($marker));
-
     return $db_name;
 }
 
@@ -84,7 +86,8 @@ sub handler {
         return OK;
     }
 
-    my $db_name = &get_db_name($r->uri);
+    my $marker = (split(m{/},$r->uri))[4];
+    my $db_name = &get_db_name($r->uri,$marker);
 
     my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
     my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
@@ -93,7 +96,7 @@ sub handler {
     my %curr_group = ();
     my %groupinfo = ();
     if ($db_name =~ /^grppage_/) {
-        $group = (split(m{/},$r->uri))[4];
+        $group = $marker;
         $group =~ s/\W//g;
         my %curr_groups = &Apache::longroup::coursegroups($dom,$crs,$group);
         if (!%curr_groups) {
@@ -233,10 +236,12 @@ sub handler {
             }
             if ($group ne '') {
                 $syllabus{'uploaded.photourl'}=&Apache::lonnet::userfileupload(
-                                              'uploaddoc','coursedoc',"grouppage/$group");
+                                              'uploaddoc','coursedoc',
+                                              "grouppage/$group");
             } else {
                 $syllabus{'uploaded.photourl'}=
-                &Apache::lonnet::userfileupload('uploaddoc','coursedoc','simplepage');
+                &Apache::lonnet::userfileupload('uploaddoc','coursedoc',
+                                                "simplepage/$marker");
             }
         }
         $syllabus{'uploaded.lastmodified'}=time;
@@ -253,10 +258,8 @@ sub handler {
         foreach my $syl_field (keys(%syllabusfields)) {
             my $field=$env{'form.'.$syl_field};
             chomp($field);
-            $field=~s/\s+$//s;
-            $field=~s/^\s+//s;
-            $field=~s/\<br\s*\/*\>$//s;
-            $field=&Apache::lonfeedback::clear_out_html($field,1);
+            my $gateway = Apache::lonhtmlgateway->new();
+            $field = $gateway->process_incoming_html($field,1);
             $syllabus{$syl_field}=$field;
         }
         $syllabus{'uploaded.lastmodified'}=time;