Adjustment to bulletin admin change major name

application/modules/bulletin/controllers/AdminController.php

@@ -145,6 +145,7 @@ class Bulletin_AdminController extends Creq_Controller_Action
 
         // get file content edits
         $fileContents = $in['file-contents'];
+        $fileContents = $this->cleanupHtml($fileContents);
 
         /* NOT USED
          // modify page title
@@ -480,7 +481,6 @@ class Bulletin_AdminController extends Creq_Controller_Action
         // success
         $this->_helper->getHelper('FlashMessenger')->addMessage("Major '" . $major . "' removed successfully.");
         $this->redirect('/bulletin/admin/remove-major');
-
     }
 
     protected function getCurrentEditingYear()
@@ -492,4 +492,18 @@ class Bulletin_AdminController extends Creq_Controller_Action
 
         return $currentYear;
     }
+
+    protected function cleanupHtml($html)
+    {
+        // replace ' & ' with '&'
+        $html = str_replace(' & ', ' & ', $html);
+
+        // replace '&' with '&'
+        $html = str_replace('&', '&', $html);
+
+        // replace CRLF with LF
+        $html = str_replace((chr(13).chr(10)), chr(10), $html);
+
+        return $html;
+    }
 }