From b5b3d96b48b6f829ef157e79a7308e5743efff19 Mon Sep 17 00:00:00 2001
From: Albert Santoni <albert.santoni@sourcefabric.org>
Date: Fri, 5 Jun 2015 12:34:15 -0400
Subject: [PATCH 1/2] CC-6050: User management bugfix

---
 airtime_mvc/application/controllers/UserController.php |  1 -
 airtime_mvc/application/models/User.php                | 10 ++--------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/airtime_mvc/application/controllers/UserController.php b/airtime_mvc/application/controllers/UserController.php
index c75e2b49e..c2cc9f0a6 100644
--- a/airtime_mvc/application/controllers/UserController.php
+++ b/airtime_mvc/application/controllers/UserController.php
@@ -95,7 +95,6 @@ class UserController extends Zend_Controller_Action
     public function getHostsAction()
     {
         $search            = $this->_getParam('term');
-        $res               = Application_Model_User::getHosts($search);
         $this->view->hosts = Application_Model_User::getHosts($search);
     }
 
diff --git a/airtime_mvc/application/models/User.php b/airtime_mvc/application/models/User.php
index 8a1008577..8b97fef22 100644
--- a/airtime_mvc/application/models/User.php
+++ b/airtime_mvc/application/models/User.php
@@ -263,7 +263,6 @@ class Application_Model_User
         $con     = Propel::getConnection();
 
         $sql_gen = "SELECT login AS value, login AS label, id as index FROM cc_subjs ";
-        $sql     = $sql_gen;
 
         $types = array();
         $params = array();
@@ -277,13 +276,8 @@ class Application_Model_User
 
         $sql      = $sql_gen ." WHERE (". $sql_type.") ";
 
-        if (!is_null($search)) {
-            //need to use addslashes for 'LIKE' values
-            $search = addslashes($search);
-            $like = "login ILIKE '%{$search}%'";
-
-            $sql  = $sql . " AND ".$like;
-        }
+        $sql .= " AND login ILIKE :search";
+        $params[":search"] = "%$search%";
 
         $sql = $sql ." ORDER BY login";
 

From 57d63ebb196cbf4748b7c2d63421a3102041b529 Mon Sep 17 00:00:00 2001
From: Albert Santoni <albert.santoni@sourcefabric.org>
Date: Tue, 16 Jun 2015 11:17:41 -0400
Subject: [PATCH 2/2] Backport some CSS fixes

---
 airtime_mvc/public/css/styles.css | 43 +++++++++++++++++++------------
 1 file changed, 26 insertions(+), 17 deletions(-)

diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css
index 16f0fc8fc..86674d5a7 100644
--- a/airtime_mvc/public/css/styles.css
+++ b/airtime_mvc/public/css/styles.css
@@ -150,7 +150,7 @@ select {
     width: 100%;
     left: 0;
     top: 0;
-    z-index: 2000;
+    z-index: 1000;
     border-top: 0;
 }
 
@@ -377,8 +377,9 @@ select {
 
 .wrapper {
     position: absolute;
-    top: 139px;
-    margin: 0 5px 0 5px;
+    top: 141px;
+    left: 10px;
+    right: 10px;
     padding:10px 0 0 0;
 }
 
@@ -435,7 +436,7 @@ fieldset.plain {
     box-shadow: 0 2px 2px rgba(0, 0, 0, 0.2) inset;
 }
 
-input[readonly]{
+input[readonly], textarea[readonly] {
     background-color:#b1b1b1
 }
 
@@ -912,11 +913,15 @@ input[type="checkbox"] {
 }
 /*---//////////////////// LOGIN & PASSWORD RESET  ////////////////////---*/
 
-#csrf-label, #csrf-element {
-    /* Remove any visible csrf form token footprint */
-    height: 0;
+/* Remove any visible csrf form token footprint */
+#csrf-label {
+    display: none;
+}
+
+#csrf-element {
     padding: 0;
     margin: 0;
+    display: inline-block;
 }
 
 .login_box {
@@ -1036,7 +1041,6 @@ input[type="checkbox"] {
 #pref_form p.description {
     color: #3b3b3b;
     font-size: 12px;
-    float: left;
 }
 
   dt.block-display, dd.block-display {
@@ -1715,7 +1719,7 @@ ul.errors {
     width:278px;
 }
 
-ul.errors li {
+ul.errors li, .warning {
     color:#902d2d;
     font-size:11px;
     padding:2px 4px;
@@ -1725,6 +1729,11 @@ ul.errors li {
     list-style: none;
 }
 
+.warning-label {
+    font-size: medium;
+    text-align: center;
+}
+
 div.success{
     color:#3B5323;
     font-size:11px;
@@ -2182,13 +2191,8 @@ dd.radio-inline-list, .preferences dd.radio-inline-list, .stream-config dd.radio
 .radio-inline-list label {
     margin-right:12px;
 }
-.preferences.simple-formblock dd.block-display {
-    width: 100%;
-}
-
-.preferences.simple-formblock dd.block-display select, .stream-config.simple-formblock dd.block-display select {
-    width: 100%;
-}
+.preferences.simple-formblock dd.block-display,
+ .preferences.simple-formblock dd.block-display select, .stream-config.simple-formblock dd.block-display select,
 .preferences dd.block-display .input_select, .stream-config dd.block-display .input_select {
     width: 100%;
 }
@@ -2207,7 +2211,7 @@ dd.radio-inline-list, .preferences dd.radio-inline-list, .stream-config dd.radio
 }
 
 .preferences #logo-remove-btn {
-    float: right;
+    /*float: left;*/
     margin-bottom: 4px;
 }
 
@@ -2215,6 +2219,11 @@ dd.radio-inline-list, .preferences dd.radio-inline-list, .stream-config dd.radio
     margin-top: 30px;
 }
 
+.centered {
+    margin: 0 auto;
+    display: block;
+}
+
 #show_time_info {
     font-size:12px;
     height:30px;