CC-4090: Make code style PSR compliant

-User.php
-removed all trailing whitespace

airtime_mvc/application/Bootstrap.php

@@ -83,7 +83,7 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
 
         $view->headScript()->appendFile($baseUrl.'/js/airtime/common/common.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
 
-        $user = Application_Model_User::GetCurrentUser();
+        $user = Application_Model_User::getCurrentUser();
         if (!is_null($user)){
             $userType = $user->getType();
         } else {

airtime_mvc/application/controllers/LibraryController.php

@@ -111,7 +111,7 @@ class LibraryController extends Zend_Controller_Action
         //array containing id and type of media to delete.
         $mediaItems = $this->_getParam('media', null);
 
-        $user = Application_Model_User::GetCurrentUser();
+        $user = Application_Model_User::getCurrentUser();
         $isAdminOrPM = $user->isUserType(array(UTYPE_ADMIN, UTYPE_PROGRAM_MANAGER));
 
         $files = array();
@@ -204,7 +204,7 @@ class LibraryController extends Zend_Controller_Action
 
     public function editFileMdAction()
     {
-        $user = Application_Model_User::GetCurrentUser();
+        $user = Application_Model_User::getCurrentUser();
         $isAdminOrPM = $user->isUserType(array(UTYPE_ADMIN, UTYPE_PROGRAM_MANAGER));
         if(!$isAdminOrPM){
             return;

airtime_mvc/application/controllers/ScheduleController.php

@@ -90,7 +90,7 @@ class ScheduleController extends Zend_Controller_Action
 
         Application_Model_Schedule::createNewFormSections($this->view);
 
-        $user = Application_Model_User::GetCurrentUser();
+        $user = Application_Model_User::getCurrentUser();
         
         if($user->isUserType(array(UTYPE_ADMIN, UTYPE_PROGRAM_MANAGER))){
             $this->view->preloadShowForm = true;
@@ -689,7 +689,7 @@ class ScheduleController extends Zend_Controller_Action
 
     public function getFormAction() {
         
-        $user = Application_Model_User::GetCurrentUser();
+        $user = Application_Model_User::getCurrentUser();
         
         if($user->isUserType(array(UTYPE_ADMIN, UTYPE_PROGRAM_MANAGER))){
             Application_Model_Schedule::createNewFormSections($this->view);
@@ -822,7 +822,7 @@ class ScheduleController extends Zend_Controller_Action
 
     public function cancelShowAction()
     {
-        $user = Application_Model_User::GetCurrentUser();
+        $user = Application_Model_User::getCurrentUser();
 
         if ($user->isUserType(array(UTYPE_ADMIN, UTYPE_PROGRAM_MANAGER))) {
 		    $showInstanceId = $this->_getParam('id');
@@ -842,7 +842,7 @@ class ScheduleController extends Zend_Controller_Action
 
     public function cancelCurrentShowAction()
     {
-        $user = Application_Model_User::GetCurrentUser();
+        $user = Application_Model_User::getCurrentUser();
 
         if ($user->isUserType(array(UTYPE_ADMIN, UTYPE_PROGRAM_MANAGER))) {
             $id = $this->_getParam('id');

airtime_mvc/application/controllers/ShowbuilderController.php

@@ -22,7 +22,7 @@ class ShowbuilderController extends Zend_Controller_Action
         
         $request = $this->getRequest();
         $baseUrl = $request->getBaseUrl();
-        $user = Application_Model_User::GetCurrentUser();
+        $user = Application_Model_User::getCurrentUser();
         
         $userType = $user->getType();
         $this->view->headScript()->appendScript("localStorage.setItem( 'user-type', '$userType' );");
@@ -184,7 +184,7 @@ class ShowbuilderController extends Zend_Controller_Action
         $baseUrl = $request->getBaseUrl();
         $menu = array();
     
-        $user = Application_Model_User::GetCurrentUser();
+        $user = Application_Model_User::getCurrentUser();
     
         $item = CcScheduleQuery::create()->findPK($id);
         $instance = $item->getCcShowInstances();

airtime_mvc/application/forms/ShowBuilder.php

@@ -5,7 +5,7 @@ class Application_Form_ShowBuilder extends Zend_Form_SubForm
 
     public function init()
     {
-        $user = Application_Model_User::GetCurrentUser();
+        $user = Application_Model_User::getCurrentUser();
 
         $this->setDecorators(array(
             array('ViewScript', array('viewScript' => 'form/showbuilder.phtml'))

airtime_mvc/application/models/Scheduler.php

@@ -32,7 +32,7 @@ class Application_Model_Scheduler {
             $this->nowDT = DateTime::createFromFormat("U", time(), new DateTimeZone("UTC"));
         }
 
-        $this->user = Application_Model_User::GetCurrentUser();
+        $this->user = Application_Model_User::getCurrentUser();
     }
 
     public function setCheckUserPermissions($value) {

airtime_mvc/application/models/Show.php

@@ -303,8 +303,6 @@ class Application_Model_Show {
             ." AND starts > TIMESTAMP '$timestamp'"
             ." AND show_id = $showId";
 
-        //Logging::log($sql);
-
         $con->exec($sql);
     }
 

airtime_mvc/application/models/ShowBuilder.php

@@ -54,7 +54,7 @@ class Application_Model_ShowBuilder {
         $this->startDT = $p_startDT;
         $this->endDT = $p_endDT;
         $this->timezone = date_default_timezone_get();
-        $this->user = Application_Model_User::GetCurrentUser();
+        $this->user = Application_Model_User::getCurrentUser();
         $this->opts = $p_opts;
         $this->epoch_now = floatval(microtime(true));
         $this->currentShow = false;

airtime_mvc/application/models/User.php

@@ -13,8 +13,7 @@ class Application_Model_User {
     {
         if (empty($userId)) {
             $this->_userInstance = $this->createUser();
-        }
+        } else {
-        else {
             $this->_userInstance = CcSubjsQuery::create()->findPK($userId);
 
             if (is_null($this->_userInstance)) {
@@ -23,41 +22,47 @@ class Application_Model_User {
         }
     }
 
-    public function getId() {
+    public function getId()
+    {
         return $this->_userInstance->getDbId();
     }
 
-    public function isGuest() {
+    public function isGuest()
+    {
         return $this->getType() == UTYPE_GUEST;
     }
 
-    public function isHost($showId) {
+    public function isHost($showId)
+    {
         return $this->isUserType(UTYPE_HOST, $showId);
     }
 
-    public function isPM() {
+    public function isPM()
+    {
         return $this->isUserType(UTYPE_PROGRAM_MANAGER);
     }
 
-    public function isAdmin() {
+    public function isAdmin()
+    {
         return $this->isUserType(UTYPE_ADMIN);
     }
 
-    public function canSchedule($p_showId) {
+    public function canSchedule($p_showId)
+    {
         $type = $this->getType();
         $result = false;
 
         if ($type === UTYPE_ADMIN ||
             $type === UTYPE_PROGRAM_MANAGER ||
-            CcShowHostsQuery::create()->filterByDbShow($p_showId)->filterByDbHost($this->getId())->count() > 0 )
+            CcShowHostsQuery::create()->filterByDbShow($p_showId)->filterByDbHost($this->getId())->count() > 0) {
-       {
             $result = true;
         }
 
         return $result;
     }
 
-    public function isUserType($type, $showId=''){
+    public function isUserType($type, $showId='')
+    {
         if (is_array($type)) {
             $result = false;
             foreach ($type as $t) {
@@ -67,7 +72,9 @@ class Application_Model_User {
                         break;
                     case UTYPE_HOST:
                         $userId = $this->_userInstance->getDbId();
-		        		$result = CcShowHostsQuery::create()->filterByDbShow($showId)->filterByDbHost($userId)->count() > 0;
+                        $result = CcShowHostsQuery::create()
+                                    ->filterByDbShow($showId)
+                                    ->filterByDbHost($userId)->count() > 0;
                         break;
                     case UTYPE_PROGRAM_MANAGER:
                         $result = $this->_userInstance->getDbType() === 'P';
@@ -90,112 +97,134 @@ class Application_Model_User {
         }
     }
 
-    public function setLogin($login){
+    public function setLogin($login)
+    {
         $user = $this->_userInstance;
         $user->setDbLogin($login);
     }
 
-    public function setPassword($password){
+    public function setPassword($password)
+    {
         $user = $this->_userInstance;
         $user->setDbPass(md5($password));
     }
 
-    public function setFirstName($firstName){
+    public function setFirstName($firstName)
+    {
         $user = $this->_userInstance;
         $user->setDbFirstName($firstName);
     }
 
-    public function setLastName($lastName){
+    public function setLastName($lastName)
+    {
         $user = $this->_userInstance;
         $user->setDbLastName($lastName);
     }
 
-    public function setType($type){
+    public function setType($type)
+    {
         $user = $this->_userInstance;
         $user->setDbType($type);
     }
 
-    public function setEmail($email){
+    public function setEmail($email)
+    {
         $user = $this->_userInstance;
         $user->setDbEmail(strtolower($email));
     }
 
-    public function setCellPhone($cellPhone){
+    public function setCellPhone($cellPhone)
+    {
         $user = $this->_userInstance;
         $user->setDbCellPhone($cellPhone);
     }
 
-    public function setSkype($skype){
+    public function setSkype($skype)
+    {
         $user = $this->_userInstance;
         $user->setDbSkypeContact($skype);
     }
 
-    public function setJabber($jabber){
+    public function setJabber($jabber)
+    {
         $user = $this->_userInstance;
         $user->setDbJabberContact($jabber);
     }
 
-    public function getLogin(){
+    public function getLogin()
+    {
         $user = $this->_userInstance;
         return $user->getDbLogin();
     }
 
-    public function getPassword(){
+    public function getPassword()
+    {
         $user = $this->_userInstance;
         return $user->getDbPass();
     }
 
-    public function getFirstName(){
+    public function getFirstName()
+    {
         $user = $this->_userInstance;
         return $user->getDbFirstName();
     }
 
-    public function getLastName(){
+    public function getLastName()
+    {
         $user = $this->_userInstance;
         return $user->getDbLastName();
     }
 
-    public function getType(){
+    public function getType()
+    {
         $user = $this->_userInstance;
         return $user->getDbType();
     }
 
-    public function getEmail(){
+    public function getEmail()
+    {
         $user = $this->_userInstance;
         return $user->getDbEmail();
     }
 
-    public function getCellPhone(){
+    public function getCellPhone()
+    {
         $user = $this->_userInstance;
         return $user->getDbCellPhone();
     }
 
-    public function getSkype(){
+    public function getSkype()
+    {
         $user = $this->_userInstance;
         return $user->getDbSkypeContact();
     }
 
-    public function getJabber(){
+    public function getJabber()
+    {
         $user = $this->_userInstance;
         return $user->getDbJabberContact();
 
     }
 
-    public function save(){
+    public function save()
+    {
         $this->_userInstance->save();
     }
 
-    public function delete(){
+    public function delete()
-        if (!$this->_userInstance->isDeleted())
+    {
+        if (!$this->_userInstance->isDeleted()) {
             $this->_userInstance->delete();
         }
+    }
 
-    private function createUser() {
+    private function createUser()
+    {
         $user = new CcSubjs();
         return $user;
     }
 
-    public static function getUsers($type, $search=NULL)
+    public static function getUsers($type, $search=null)
     {
         $con = Propel::getConnection();
 
@@ -207,8 +236,7 @@ class Application_Model_User {
                 $type[$i] = "type = '{$type[$i]}'";
             }
             $sql_type = join(" OR ", $type);
-        }
+        } else {
-        else {
             $sql_type = "type = {$type}";
         }
 
@@ -225,22 +253,21 @@ class Application_Model_User {
         return $con->query($sql)->fetchAll();;
     }
 
-    public static function getUserCount($type=NULL){
+    public static function getUserCount($type=null)
+    {
         $con = Propel::getConnection();
         $sql = '';
         $sql_gen = "SELECT count(*) AS cnt FROM cc_subjs ";
 
         if (!isset($type)) {
             $sql = $sql_gen;
-        }
+        } else {
-        else{
             if (is_array($type)) {
                 for ($i=0; $i<count($type); $i++) {
                     $type[$i] = "type = '{$type[$i]}'";
                 }
                 $sql_type = join(" OR ", $type);
-	        }
+            } else {
-	        else {
                 $sql_type = "type = {$type}";
             }
 
@@ -248,14 +275,16 @@ class Application_Model_User {
         }
 
         $query = $con->query($sql)->fetchColumn(0);
-        return ($query !== false) ? $query : NULL;
+        return ($query !== false) ? $query : null;
     }
 
-    public static function getHosts($search=NULL) {
+    public static function getHosts($search=null)
+    {
         return Application_Model_User::getUsers(array('H'), $search);
     }
 
-    public static function getUsersDataTablesInfo($datatables) {
+    public static function getUsersDataTablesInfo($datatables)
+    {
 
         $con = Propel::getConnection(CcSubjsPeer::DATABASE_NAME);
 
@@ -284,7 +313,8 @@ class Application_Model_User {
         return $res;
     }
 
-    public static function getUserData($id){
+    public static function getUserData($id)
+    {
         $con = Propel::getConnection();
 
         $sql = "SELECT login, first_name, last_name, type, id, email, cell_phone, skype_contact, jabber_contact"
@@ -294,16 +324,8 @@ class Application_Model_User {
         return $con->query($sql)->fetch();
     }
 
-    public static function GetUserID($login){
+    public static function getCurrentUser()
-        $user = CcSubjsQuery::create()->findOneByDbLogin($login);
+    {
-        if (is_null($user)){
-            return -1;
-        } else {
-            return $user->getDbId();
-        }
-    }
-
-    public static function GetCurrentUser() {
         $userinfo = Zend_Auth::getInstance()->getStorage()->read();
 
         if (is_null($userinfo)) {

python_apps/pypo/liquidsoap_bin

@@ -1 +1 @@
-Subproject commit 492242f4bb7367afebbf2f096067cb5a5d3c0449
+Subproject commit 0653ec0b89362921f075af96ee8772538b801a7c