From 2527fa2e1abd5789d7965369ed9ede062d0c9be2 Mon Sep 17 00:00:00 2001 From: denise Date: Fri, 19 Oct 2012 14:42:01 -0400 Subject: [PATCH] CC-2184: Hardcoded CSS path should be relative path instead --- airtime_mvc/application/Bootstrap.php | 2 -- .../controllers/AudiopreviewController.php | 4 ++-- .../application/controllers/LibraryController.php | 14 +++++++------- .../controllers/ShowbuilderController.php | 4 ++-- airtime_mvc/application/forms/EditAudioMD.php | 4 ++-- airtime_mvc/application/forms/Preferences.php | 6 +++--- .../application/layouts/scripts/layout.phtml | 4 ++-- airtime_mvc/application/models/StoredFile.php | 10 +++++----- .../views/scripts/library/library.phtml | 4 ++-- .../views/scripts/preference/index.phtml | 4 ++-- .../views/scripts/preference/stream-setting.phtml | 4 ++-- .../views/scripts/preference/support-setting.phtml | 4 ++-- 12 files changed, 31 insertions(+), 33 deletions(-) diff --git a/airtime_mvc/application/Bootstrap.php b/airtime_mvc/application/Bootstrap.php index 72902ab6a..6b52c2a9c 100644 --- a/airtime_mvc/application/Bootstrap.php +++ b/airtime_mvc/application/Bootstrap.php @@ -67,8 +67,6 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap $view = $this->getResource('view'); $baseUrl = Application_Common_OsPath::getBaseDir(); - - $CC_CONFIG['base_dir'] = $baseUrl; $view->headLink()->appendStylesheet($baseUrl.'/css/redmond/jquery-ui-1.8.8.custom.css?'.$CC_CONFIG['airtime_version']); $view->headLink()->appendStylesheet($baseUrl.'/css/pro_dropdown_3.css?'.$CC_CONFIG['airtime_version']); diff --git a/airtime_mvc/application/controllers/AudiopreviewController.php b/airtime_mvc/application/controllers/AudiopreviewController.php index 45f3f0cb8..afd413631 100644 --- a/airtime_mvc/application/controllers/AudiopreviewController.php +++ b/airtime_mvc/application/controllers/AudiopreviewController.php @@ -255,7 +255,7 @@ class AudiopreviewController extends Zend_Controller_Action */ public function getShowAction() { - global $CC_CONFIG; + $baseUrl = Application_Common_OsPath::getBaseDir(); // disable the view and the layout $this->view->layout()->disableLayout(); $this->_helper->viewRenderer->setNoRender(true); @@ -296,7 +296,7 @@ class AudiopreviewController extends Zend_Controller_Action throw new Exception("Unknown file type: $mime"); } - $elementMap['uri'] = $CC_CONFIG["base_dir"]."/api/get-media/file/".$track['item_id']; + $elementMap['uri'] = $baseUrl."/api/get-media/file/".$track['item_id']; } else { $elementMap['uri'] = $track['filepath']; } diff --git a/airtime_mvc/application/controllers/LibraryController.php b/airtime_mvc/application/controllers/LibraryController.php index 07c995f2f..514d08e16 100644 --- a/airtime_mvc/application/controllers/LibraryController.php +++ b/airtime_mvc/application/controllers/LibraryController.php @@ -142,7 +142,7 @@ class LibraryController extends Zend_Controller_Action public function contextMenuAction() { - global $CC_CONFIG; + $baseUrl = Application_Common_OsPath::getBaseDir(); $id = $this->_getParam('id'); $type = $this->_getParam('type'); //playlist||timeline @@ -184,8 +184,8 @@ class LibraryController extends Zend_Controller_Action } } if ($isAdminOrPM) { - $menu["del"] = array("name"=> "Delete", "icon" => "delete", "url" => $CC_CONFIG['base_dir']."/library/delete"); - $menu["edit"] = array("name"=> "Edit Metadata", "icon" => "edit", "url" => $CC_CONFIG['base_dir']."/library/edit-file-md/id/{$id}"); + $menu["del"] = array("name"=> "Delete", "icon" => "delete", "url" => $baseUrl."/library/delete"); + $menu["edit"] = array("name"=> "Edit Metadata", "icon" => "edit", "url" => $baseUrl."/library/edit-file-md/id/{$id}"); } $url = $file->getRelativeFileUrl($baseUrl).'/download/true'; @@ -212,7 +212,7 @@ class LibraryController extends Zend_Controller_Action } if ($isAdminOrPM || $obj->getCreatorId() == $user->getId()) { - $menu["del"] = array("name"=> "Delete", "icon" => "delete", "url" => $CC_CONFIG['base_dir']."/library/delete"); + $menu["del"] = array("name"=> "Delete", "icon" => "delete", "url" => $baseUrl."/library/delete"); } } elseif ($type == "stream") { @@ -227,9 +227,9 @@ class LibraryController extends Zend_Controller_Action } if ($isAdminOrPM || $obj->getCreatorId() == $user->getId()) { if ($screen == "playlist") { - $menu["edit"] = array("name"=> "Edit", "icon" => "edit", "url" => $CC_CONFIG['base_dir']."/library/edit-file-md/id/{$id}"); + $menu["edit"] = array("name"=> "Edit", "icon" => "edit", "url" => $baseUrl."/library/edit-file-md/id/{$id}"); } - $menu["del"] = array("name"=> "Delete", "icon" => "delete", "url" => $CC_CONFIG['base_dir']."/library/delete"); + $menu["del"] = array("name"=> "Delete", "icon" => "delete", "url" => $baseUrl."/library/delete"); } } @@ -255,7 +255,7 @@ class LibraryController extends Zend_Controller_Action $text = "Upload to SoundCloud"; } - $menu["soundcloud"]["items"]["upload"] = array("name" => $text, "icon" => "soundcloud", "url" => $CC_CONFIG['base_dir']."/library/upload-file-soundcloud/id/{$id}"); + $menu["soundcloud"]["items"]["upload"] = array("name" => $text, "icon" => "soundcloud", "url" => $baseUrl."/library/upload-file-soundcloud/id/{$id}"); } if (empty($menu)) { diff --git a/airtime_mvc/application/controllers/ShowbuilderController.php b/airtime_mvc/application/controllers/ShowbuilderController.php index d2d7a830a..8080bc536 100644 --- a/airtime_mvc/application/controllers/ShowbuilderController.php +++ b/airtime_mvc/application/controllers/ShowbuilderController.php @@ -174,7 +174,7 @@ class ShowbuilderController extends Zend_Controller_Action public function contextMenuAction() { - global $CC_CONFIG; + $baseUrl = Application_Common_OsPath::getBaseDir(); $id = $this->_getParam('id'); $now = floatval(microtime(true)); @@ -195,7 +195,7 @@ class ShowbuilderController extends Zend_Controller_Action if ($now < floatval($item->getDbEnds("U.u")) && $user->canSchedule($instance->getDbShowId())) { //remove/truncate the item from the schedule - $menu["del"] = array("name"=> "Delete", "icon" => "delete", "url" => $CC_CONFIG['base_dir']."/showbuilder/schedule-remove"); + $menu["del"] = array("name"=> "Delete", "icon" => "delete", "url" => $baseUrl."/showbuilder/schedule-remove"); } $this->view->items = $menu; diff --git a/airtime_mvc/application/forms/EditAudioMD.php b/airtime_mvc/application/forms/EditAudioMD.php index ba5b61fbf..219742b3f 100644 --- a/airtime_mvc/application/forms/EditAudioMD.php +++ b/airtime_mvc/application/forms/EditAudioMD.php @@ -4,7 +4,7 @@ class Application_Form_EditAudioMD extends Zend_Form { public function init() { - global $CC_CONFIG; + $baseUrl = Application_Common_OsPath::getBaseDir(); // Set the method for the display form to POST $this->setMethod('post'); @@ -136,7 +136,7 @@ class Application_Form_EditAudioMD extends Zend_Form 'ignore' => true, 'class' => 'btn md-cancel', 'label' => 'Cancel', - 'onclick' => 'javascript:document.location.href="'.$CC_CONFIG['base_dir'].'/Library"', + 'onclick' => 'javascript:document.location.href="'.$baseUrl.'/Library"', 'decorators' => array( 'ViewHelper' ) diff --git a/airtime_mvc/application/forms/Preferences.php b/airtime_mvc/application/forms/Preferences.php index 125cca392..ebce7f10e 100644 --- a/airtime_mvc/application/forms/Preferences.php +++ b/airtime_mvc/application/forms/Preferences.php @@ -6,9 +6,9 @@ class Application_Form_Preferences extends Zend_Form public function init() { - global $CC_CONFIG; - - $this->setAction($CC_CONFIG['base_dir'] . '/Preference'); + $baseUrl = Application_Common_OsPath::getBaseDir(); + + $this->setAction($baseUrl . '/Preference'); $this->setMethod('post'); $isSaas = Application_Model_Preference::GetPlanLevel() == 'disabled'?false:true; diff --git a/airtime_mvc/application/layouts/scripts/layout.phtml b/airtime_mvc/application/layouts/scripts/layout.phtml index 90e13246c..b25b8c9cf 100644 --- a/airtime_mvc/application/layouts/scripts/layout.phtml +++ b/airtime_mvc/application/layouts/scripts/layout.phtml @@ -6,7 +6,7 @@ headScript() ?> headLink() ?> google_analytics)?$this->google_analytics:"" ?> - + @@ -23,7 +23,7 @@ $this->navigation()->menu()->setPartial($partial); ?>
diff --git a/airtime_mvc/application/models/StoredFile.php b/airtime_mvc/application/models/StoredFile.php index ffdb31d1f..03b98c782 100644 --- a/airtime_mvc/application/models/StoredFile.php +++ b/airtime_mvc/application/models/StoredFile.php @@ -616,7 +616,7 @@ SQL; public static function searchLibraryFiles($datatables) { - global $CC_CONFIG; + $baseUrl = Application_Common_OsPath::getBaseDir(); $con = Propel::getConnection(CcFilesPeer::DATABASE_NAME); @@ -772,14 +772,14 @@ SQL; // ugly if ($type == "au") { $row['audioFile'] = $row['id'].".".pathinfo($row['filepath'], PATHINFO_EXTENSION); - $row['image'] = ''; + $row['image'] = ''; } elseif ($type == "pl") { - $row['image'] = ''; + $row['image'] = ''; } elseif ($type == "st") { $row['audioFile'] = $row['id']; - $row['image'] = ''; + $row['image'] = ''; } elseif ($type == "bl") { - $row['image'] = ''; + $row['image'] = ''; } } diff --git a/airtime_mvc/application/views/scripts/library/library.phtml b/airtime_mvc/application/views/scripts/library/library.phtml index d64a5d87e..0f13eedfa 100644 --- a/airtime_mvc/application/views/scripts/library/library.phtml +++ b/airtime_mvc/application/views/scripts/library/library.phtml @@ -1,5 +1,5 @@ - - + +
Advanced Search Options diff --git a/airtime_mvc/application/views/scripts/preference/index.phtml b/airtime_mvc/application/views/scripts/preference/index.phtml index 01a7a5bd4..faed63a15 100644 --- a/airtime_mvc/application/views/scripts/preference/index.phtml +++ b/airtime_mvc/application/views/scripts/preference/index.phtml @@ -1,7 +1,7 @@

Preferences

- -
enctype="application/x-www-form-urlencoded"> + + enctype="application/x-www-form-urlencoded">
diff --git a/airtime_mvc/application/views/scripts/preference/stream-setting.phtml b/airtime_mvc/application/views/scripts/preference/stream-setting.phtml index a022f5acc..336657627 100644 --- a/airtime_mvc/application/views/scripts/preference/stream-setting.phtml +++ b/airtime_mvc/application/views/scripts/preference/stream-setting.phtml @@ -1,8 +1,8 @@

enable_stream_conf == "true"){?>style="float:left">Stream Settings

- + enable_stream_conf == "true"){?> - enctype="application/x-www-form-urlencoded" onsubmit="return confirm('confirm_pypo_restart_text ?>');"> + enctype="application/x-www-form-urlencoded" onsubmit="return confirm('confirm_pypo_restart_text ?>');">
diff --git a/airtime_mvc/application/views/scripts/preference/support-setting.phtml b/airtime_mvc/application/views/scripts/preference/support-setting.phtml index 45486b542..d4889103a 100644 --- a/airtime_mvc/application/views/scripts/preference/support-setting.phtml +++ b/airtime_mvc/application/views/scripts/preference/support-setting.phtml @@ -1,7 +1,7 @@

section_title?>

- - enctype="multipart/form-data"> + + enctype="multipart/form-data">
statusMsg ?> form ?>