From febbe6233a226b98206bb205b9359e41e8c810d8 Mon Sep 17 00:00:00 2001
From: Alex Pena <alexpena916@gmail.com>
Date: Wed, 16 Dec 2020 01:28:14 -0500
Subject: [PATCH] Alphanumeric order for Track Types in dropdown menu

---
 .../application/controllers/plugins/PageLayoutInitPlugin.php | 5 +++++
 airtime_mvc/application/forms/EditAudioMD.php                | 5 +++++
 airtime_mvc/application/models/Library.php                   | 5 +++++
 airtime_mvc/application/views/scripts/plupload/index.phtml   | 5 +++++
 4 files changed, 20 insertions(+)

diff --git a/airtime_mvc/application/controllers/plugins/PageLayoutInitPlugin.php b/airtime_mvc/application/controllers/plugins/PageLayoutInitPlugin.php
index 37cc9202e..de6584180 100644
--- a/airtime_mvc/application/controllers/plugins/PageLayoutInitPlugin.php
+++ b/airtime_mvc/application/controllers/plugins/PageLayoutInitPlugin.php
@@ -144,6 +144,11 @@ class PageLayoutInitPlugin extends Zend_Controller_Plugin_Abstract
 
         $track_type_options = array();
         $track_types = Application_Model_Tracktype::getTracktypes();
+        
+        array_multisort(array_map(function($element) {
+            return $element['type_name'];
+        }, $track_types), SORT_ASC, $track_types);
+        
         foreach ($track_types as $key => $tt) {
             $track_type_options[$tt['code']] = $tt['type_name'];
         }
diff --git a/airtime_mvc/application/forms/EditAudioMD.php b/airtime_mvc/application/forms/EditAudioMD.php
index 1e73c9522..95be04500 100644
--- a/airtime_mvc/application/forms/EditAudioMD.php
+++ b/airtime_mvc/application/forms/EditAudioMD.php
@@ -94,6 +94,11 @@ class Application_Form_EditAudioMD extends Zend_Form
         // Add track type dropdown
         $track_type_options = array();
         $track_types = Application_Model_Tracktype::getTracktypes();
+        
+        array_multisort(array_map(function($element) {
+            return $element['type_name'];
+        }, $track_types), SORT_ASC, $track_types);
+        
         $track_type_options[""] = _('Select a Type');
         foreach ($track_types as $key => $tt) {
             $track_type_options[$tt['code']] = $tt['type_name'];
diff --git a/airtime_mvc/application/models/Library.php b/airtime_mvc/application/models/Library.php
index 8beb142eb..6f4c36a30 100644
--- a/airtime_mvc/application/models/Library.php
+++ b/airtime_mvc/application/models/Library.php
@@ -61,6 +61,11 @@ class Application_Model_Library
     {
         $track_type_options = array(NULL  => _("None"));
         $track_types = Application_Model_Tracktype::getTracktypes();
+        
+        array_multisort(array_map(function($element) {
+            return $element['type_name'];
+        }, $track_types), SORT_ASC, $track_types);
+        
         foreach ($track_types as $key => $tt) {
             $track_type_options[$tt['code']] = $tt['type_name'];
         }
diff --git a/airtime_mvc/application/views/scripts/plupload/index.phtml b/airtime_mvc/application/views/scripts/plupload/index.phtml
index 269e54fa4..b140be513 100644
--- a/airtime_mvc/application/views/scripts/plupload/index.phtml
+++ b/airtime_mvc/application/views/scripts/plupload/index.phtml
@@ -14,6 +14,11 @@
     $used = $disk->totalSpace-$disk->totalFreeSpace;
     $total = $disk->totalSpace;
     $tracktypes = Application_Model_Tracktype::getTracktypes();
+    
+    array_multisort(array_map(function($element) {
+        return $element['type_name'];
+    }, $tracktypes), SORT_ASC, $tracktypes);
+    
     if(count($tracktypes) == 0) {
         $hasTracktypes = "disabled";
         $showTracktypesDropdown = false;