From da175e07021e2c39ea5a8d873d3fc63f493caa5c Mon Sep 17 00:00:00 2001
From: Naomi <naomi@naomi-DX4840.(none)>
Date: Fri, 11 Feb 2011 11:43:03 -0500
Subject: [PATCH] admin users are hosts by default, host selection is no longer
 required, any admin user can schedule/maniuplate all shows.

---
 application/controllers/UserController.php | 71 +++++++++++-----------
 application/forms/AddShowWho.php           |  3 +-
 application/models/Users.php               |  2 +-
 3 files changed, 36 insertions(+), 40 deletions(-)

diff --git a/application/controllers/UserController.php b/application/controllers/UserController.php
index 2cb2db0b4..f487954f6 100644
--- a/application/controllers/UserController.php
+++ b/application/controllers/UserController.php
@@ -6,11 +6,11 @@ class UserController extends Zend_Controller_Action
     public function init()
     {
         $ajaxContext = $this->_helper->getHelper('AjaxContext');
-                                $ajaxContext->addActionContext('get-hosts', 'json')
-                                            ->addActionContext('get-user-data-table-info', 'json')
-                                            ->addActionContext('get-user-data', 'json')
-                                            ->addActionContext('remove-user', 'json')
-                                            ->initContext();
+        $ajaxContext->addActionContext('get-hosts', 'json')
+                    ->addActionContext('get-user-data-table-info', 'json')
+                    ->addActionContext('get-user-data', 'json')
+                    ->addActionContext('remove-user', 'json')
+                    ->initContext();
     }
 
     public function indexAction()
@@ -19,54 +19,51 @@ class UserController extends Zend_Controller_Action
 
     public function addUserAction()
     {
-        
-        
         $this->view->headScript()->appendFile('/js/datatables/js/jquery.dataTables.js','text/javascript');
-                        $this->view->headScript()->appendFile('/js/airtime/user/user.js','text/javascript');
-                        $request = $this->getRequest();
-                                $form = new Application_Form_AddUser();
-                         
-                                if ($request->isPost()) {
-                                    if ($form->isValid($request->getPost())) {  
-                            
-                        				$formdata = $form->getValues();
-                                        if ($form->validateLogin($formdata)){                                                                       
-                                            $user = new User($formdata['user_id']);
-                                            $user->setFirstName($formdata['first_name']);
-                                            $user->setLastName($formdata['last_name']);
-                                            $user->setLogin($formdata['login']);
-                                            if ($formdata['password'] != "xxxxxx")
-                                                $user->setPassword($formdata['password']);
-                                            $user->setType($formdata['type']);
-                                            $user->save();
-                                            
-                                            $form->reset();
-                                        }
-                                    }
-                                }
-                         
-                                $this->view->form = $form;
+        $this->view->headScript()->appendFile('/js/airtime/user/user.js','text/javascript');
+        $request = $this->getRequest();
+        $form = new Application_Form_AddUser();
+ 
+        if ($request->isPost()) {
+            if ($form->isValid($request->getPost())) {  
+    
+				$formdata = $form->getValues();
+                if ($form->validateLogin($formdata)){                                                                       
+                    $user = new User($formdata['user_id']);
+                    $user->setFirstName($formdata['first_name']);
+                    $user->setLastName($formdata['last_name']);
+                    $user->setLogin($formdata['login']);
+                    if ($formdata['password'] != "xxxxxx")
+                        $user->setPassword($formdata['password']);
+                    $user->setType($formdata['type']);
+                    $user->save();
+                    
+                    $form->reset();
+                }
+            }
+        }
+ 
+        $this->view->form = $form;
     }
 
     public function getHostsAction()
     {
         $search = $this->_getParam('term');
-                $this->view->hosts = User::getHosts($search);
+        $this->view->hosts = User::getHosts($search);
     }
 
     public function getUserDataTableInfoAction()
     {
         $post = $this->getRequest()->getPost();
-                $users = User::getUsersDataTablesInfo($post);
-                
-                        
-                die(json_encode($users));
+        $users = User::getUsersDataTablesInfo($post);
+                 
+        die(json_encode($users));
     }
 
     public function getUserDataAction()
     {
         $id = $this->_getParam('id');
-                $this->view->entries = User::GetUserData($id);
+        $this->view->entries = User::GetUserData($id);
     }
 
     public function removeUserAction()
diff --git a/application/forms/AddShowWho.php b/application/forms/AddShowWho.php
index 86981a28d..7c5a48fce 100644
--- a/application/forms/AddShowWho.php
+++ b/application/forms/AddShowWho.php
@@ -22,8 +22,7 @@ class Application_Form_AddShowWho extends Zend_Form_SubForm
 		//Add hosts selection
 		$hosts = new Zend_Form_Element_MultiCheckbox('add_show_hosts');
 		$hosts->setLabel('Hosts:')
-			->setMultiOptions($options)
-			->setRequired(true);
+			->setMultiOptions($options);
 
 		$this->addElement($hosts);
     }
diff --git a/application/models/Users.php b/application/models/Users.php
index 6cb618cbc..843dae81c 100644
--- a/application/models/Users.php
+++ b/application/models/Users.php
@@ -120,7 +120,7 @@ class User {
 	}
 
 	public static function getHosts($search=NULL) {
-		return User::getUsers(array('H', 'A'), $search);
+		return User::getUsers(array('H'), $search);
 	}
     
 	public static function getUsersDataTablesInfo($datatables_post) {