From 10f5dc18138f8168608fa9692885a85611f9213f Mon Sep 17 00:00:00 2001
From: Rod Roark <rod@sunsetsystems.com>
Date: Fri, 6 Jul 2012 12:16:23 -0700
Subject: [PATCH] More minor fixes for athletic teams: new language menu item,
 and sorting squads by their order attribute.

---
 interface/main/left_nav.php |  1 +
 library/acl.inc             | 14 +++++++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/interface/main/left_nav.php b/interface/main/left_nav.php
index 642808876..8e11144c5 100644
--- a/interface/main/left_nav.php
+++ b/interface/main/left_nav.php
@@ -1084,6 +1084,7 @@ if ($GLOBALS['athletic_team']) {
       <?php if ( ($GLOBALS['include_de_identification']) && (acl_check('admin', 'super'    )) ) genMiscLink('RTop','adm','0',xl('Re Identification'),'de_identification_forms/re_identification_input_screen.php'); ?>
       <li><a class="collapsed_lv2"><span><?php xl('Other','e') ?></span></a>
         <ul>
+          <?php if (acl_check('admin', 'language')) genMiscLink('RTop','adm','0',xl('Language'),'language/language.php'); ?>
           <?php if (acl_check('admin', 'forms'   )) genMiscLink('RTop','adm','0',xl('Forms'),'forms_admin/forms_admin.php'); ?>
           <?php if (acl_check('admin', 'calendar') && !$GLOBALS['disable_calendar']) genMiscLink('RTop','adm','0',xl('Calendar'),'main/calendar/index.php?module=PostCalendar&type=admin&func=modifyconfig'); ?>
           <?php if (acl_check('admin', 'users'   )) genMiscLink('RTop','adm','0',xl('Logs'),'logview/logview.php'); ?>
diff --git a/library/acl.inc b/library/acl.inc
index ecd0ad9ef..7700b776a 100644
--- a/library/acl.inc
+++ b/library/acl.inc
@@ -160,11 +160,23 @@
     return 0;
   }
 
+  // Sort squads by their order value.  Used only by acl_get_squads().
+  function _acl_squad_compare($a, $b) {
+    if ($a[2] == $b[2]) {
+      // If order value is the same, sort by squad name.
+      if ($a[3] == $b[3]) return 0;
+      return ($a[3] < $b[3]) ? -1 : 1;
+    }
+    return ($a[2] < $b[2]) ? -1 : 1;
+  }
+
   // Return an array keyed on squad ACO names.
   // This is only applicable for sports team use.
   //
   function acl_get_squads() {
-    return acl_get_section_acos('squads');
+    $squads = acl_get_section_acos('squads');
+    uasort($squads, "_acl_squad_compare");
+    return $squads;
   }
 
   // Return an array keyed on encounter sensitivity level ACO names.
-- 
2.11.4.GIT