Merge pull request #1131 from UniversityRadioYork/patches-23-10-06

Patches 23 10 06
UniversityRadioYork · Oct 6, 2023 · 660d48b · 660d48b
2 parents 620534a + 00739ec
commit 660d48b
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 1 deletion.
diff --git a/src/Classes/ServiceAPI/MyRadio_Season.php b/src/Classes/ServiceAPI/MyRadio_Season.php
@@ -1068,7 +1068,7 @@ public function schedule($params, $num_weeks)
         /*
          * Since terms start on the Monday, we just +1 day to it
          */
-        $start_day = MyRadio_Term::getTermStartDate() + ($req_time['day'] * 86400);
+        $start_day = (MyRadio_Term::getActiveApplicationTerm())->getTermStartDate() + ($req_time['day'] * 86400);
 
         //Now it's time to BEGIN to COMMIT!
         self::$db->query('BEGIN');

diff --git a/src/Classes/ServiceAPI/MyRadio_Term.php b/src/Classes/ServiceAPI/MyRadio_Term.php
@@ -101,6 +101,7 @@ public static function getAllTerms($currentOnly = false)
      */
     public static function isTerm()
     {
+    	return true;
         return (!empty(self::getAllTerms(true)));
     }
 

diff --git a/src/Controllers/Profile/assignOfficer.php b/src/Controllers/Profile/assignOfficer.php
@@ -24,6 +24,9 @@
     if (isset($_REQUEST['officerid'])) {
         //assign form
         $officer = MyRadio_Officer::getInstance($_REQUEST['officerid']);
+	if ($officer->getStatus() == "h") {
+		throw new MyRadioException("Officer is historical.", 400);
+	}
 
         MyRadio_Officer::getAssignForm()
             ->editMode(

diff --git a/src/Menus/menu.json b/src/Menus/menu.json
@@ -74,6 +74,11 @@
                             "url": "module=Mail,action=send,list=30",
                             "description": "Having a problem? Report it here and Computing and/or Engineering team will fix it for you. Or at least try."
                         },
+			{
+                            "title": "Request Songs",
+                            "url": "https://song-requests.ury.org.uk/",
+                            "description": "Want to play a song that we don't have? Request it here and we can buy it!"
+			},
                         {
                             "title": "Request Songs",
                             "url": "https://song-requests.ury.org.uk/",