From 72960593c7b6f0ac9cd84df3b921a0a241fd659e Mon Sep 17 00:00:00 2001 From: jo Date: Thu, 7 Jul 2022 23:27:28 +0200 Subject: [PATCH] chore(legacy): use Config::getBasePath helper Replace Application_Common_OsPath::getBaseDir with Config::getBasePath. --- legacy/application/Bootstrap.php | 2 +- legacy/application/common/OsPath.php | 16 -- .../application/controllers/ApiController.php | 2 +- .../controllers/AudiopreviewController.php | 12 +- .../controllers/DashboardController.php | 4 +- .../EmbeddablewidgetsController.php | 4 +- .../controllers/ErrorController.php | 2 +- .../controllers/IndexController.php | 2 +- .../controllers/LibraryController.php | 2 +- .../controllers/ListenerstatController.php | 4 +- .../controllers/LoginController.php | 6 +- .../controllers/PlayouthistoryController.php | 2 +- .../PlayouthistorytemplateController.php | 4 +- .../controllers/PluploadController.php | 2 +- .../controllers/PodcastController.php | 2 +- .../controllers/PreferenceController.php | 4 +- .../controllers/ScheduleController.php | 2 +- .../controllers/ShowbuilderController.php | 6 +- .../controllers/SystemstatusController.php | 2 +- .../controllers/TracktypeController.php | 2 +- .../controllers/UserController.php | 2 +- .../plugins/PageLayoutInitPlugin.php | 6 +- legacy/application/forms/EditAudioMD.php | 1 - legacy/application/forms/Preferences.php | 2 - .../application/layouts/scripts/layout.phtml | 219 +++++++++-------- legacy/application/models/Auth.php | 4 +- legacy/application/models/StoredFile.php | 2 +- .../application/services/CalendarService.php | 2 +- .../scripts/embeddablewidgets/facebook.phtml | 6 +- .../scripts/embeddablewidgets/player.phtml | 2 +- .../scripts/embeddablewidgets/schedule.phtml | 11 +- .../views/scripts/library/library.phtml | 14 +- .../views/scripts/preference/index.phtml | 4 +- .../scripts/preference/stream-setting.phtml | 228 +++++++++--------- 34 files changed, 288 insertions(+), 297 deletions(-) diff --git a/legacy/application/Bootstrap.php b/legacy/application/Bootstrap.php index 68a494f1d..a9882feca 100644 --- a/legacy/application/Bootstrap.php +++ b/legacy/application/Bootstrap.php @@ -50,7 +50,7 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap { $front = Zend_Controller_Front::getInstance(); $router = $front->getRouter(); - $front->setBaseUrl(Application_Common_OsPath::getBaseDir()); + $front->setBaseUrl(Config::getBasePath()); $router->addRoute( 'password-change', diff --git a/legacy/application/common/OsPath.php b/legacy/application/common/OsPath.php index 71b62d6bc..aaf43aec3 100644 --- a/legacy/application/common/OsPath.php +++ b/legacy/application/common/OsPath.php @@ -73,22 +73,6 @@ class Application_Common_OsPath return implode(DIRECTORY_SEPARATOR, $paths); } - public static function getBaseDir() - { - $CC_CONFIG = Config::getConfig(); - $baseUrl = $CC_CONFIG['baseDir']; - - if ($baseUrl[0] != '/') { - $baseUrl = '/' . $baseUrl; - } - - if ($baseUrl[strlen($baseUrl) - 1] != '/') { - $baseUrl = $baseUrl . '/'; - } - - return $baseUrl; - } - public static function formatDirectoryWithDirectorySeparators($dir) { if ($dir[0] != '/') { diff --git a/legacy/application/controllers/ApiController.php b/legacy/application/controllers/ApiController.php index bea4e790d..6b66ef63c 100644 --- a/legacy/application/controllers/ApiController.php +++ b/legacy/application/controllers/ApiController.php @@ -1516,7 +1516,7 @@ class ApiController extends Zend_Controller_Action */ public function showTracksAction() { - $baseUrl = Application_Common_OsPath::getBaseDir(); + $baseUrl = Config::getBasePath(); $prefTimezone = Application_Model_Preference::GetTimezone(); $instanceId = $this->_getParam('instance_id'); diff --git a/legacy/application/controllers/AudiopreviewController.php b/legacy/application/controllers/AudiopreviewController.php index 9fbc06d30..913619fbb 100644 --- a/legacy/application/controllers/AudiopreviewController.php +++ b/legacy/application/controllers/AudiopreviewController.php @@ -24,7 +24,7 @@ class AudiopreviewController extends Zend_Controller_Action $audioFileID = $this->_getParam('audioFileID'); $type = $this->_getParam('type'); - $baseUrl = Application_Common_OsPath::getBaseDir(); + $baseUrl = Config::getBasePath(); $this->view->headScript()->appendFile( $baseUrl . 'js/airtime/audiopreview/preview_jplayer.js?' . $CC_CONFIG['airtime_version'], @@ -81,7 +81,7 @@ class AudiopreviewController extends Zend_Controller_Action $playlistIndex = $this->_getParam('playlistIndex'); $playlistID = $this->_getParam('playlistID'); - $baseUrl = Application_Common_OsPath::getBaseDir(); + $baseUrl = Config::getBasePath(); $this->view->headScript()->appendFile($baseUrl . 'js/airtime/audiopreview/preview_jplayer.js?' . $CC_CONFIG['airtime_version'], 'text/javascript'); $this->view->headScript()->appendFile($baseUrl . 'js/jplayer/jplayer.playlist.min.js?' . $CC_CONFIG['airtime_version'], 'text/javascript'); @@ -107,7 +107,7 @@ class AudiopreviewController extends Zend_Controller_Action $blockIndex = $this->_getParam('blockIndex'); $blockId = $this->_getParam('blockId'); - $baseUrl = Application_Common_OsPath::getBaseDir(); + $baseUrl = Config::getBasePath(); $this->view->headScript()->appendFile($baseUrl . 'js/airtime/audiopreview/preview_jplayer.js?' . $CC_CONFIG['airtime_version'], 'text/javascript'); $this->view->headScript()->appendFile($baseUrl . 'js/jplayer/jplayer.playlist.min.js?' . $CC_CONFIG['airtime_version'], 'text/javascript'); @@ -182,7 +182,7 @@ class AudiopreviewController extends Zend_Controller_Action private function createElementMap($track) { - $baseUrl = Application_Common_OsPath::getBaseDir(); + $baseUrl = Config::getBasePath(); $elementMap = [ 'element_title' => isset($track['track_title']) ? $track['track_title'] : '', @@ -229,7 +229,7 @@ class AudiopreviewController extends Zend_Controller_Action $showID = $this->_getParam('showID'); $showIndex = $this->_getParam('showIndex'); - $baseUrl = Application_Common_OsPath::getBaseDir(); + $baseUrl = Config::getBasePath(); $this->view->headScript()->appendFile($baseUrl . 'js/airtime/audiopreview/preview_jplayer.js?' . $CC_CONFIG['airtime_version'], 'text/javascript'); $this->view->headScript()->appendFile($baseUrl . 'js/jplayer/jplayer.playlist.min.js?' . $CC_CONFIG['airtime_version'], 'text/javascript'); @@ -254,7 +254,7 @@ class AudiopreviewController extends Zend_Controller_Action */ public function getShowAction() { - $baseUrl = Application_Common_OsPath::getBaseDir(); + $baseUrl = Config::getBasePath(); // disable the view and the layout $this->view->layout()->disableLayout(); $this->_helper->viewRenderer->setNoRender(true); diff --git a/legacy/application/controllers/DashboardController.php b/legacy/application/controllers/DashboardController.php index 707b1ca51..a54f21043 100644 --- a/legacy/application/controllers/DashboardController.php +++ b/legacy/application/controllers/DashboardController.php @@ -95,7 +95,7 @@ class DashboardController extends Zend_Controller_Action { $CC_CONFIG = Config::getConfig(); - $baseUrl = Application_Common_OsPath::getBaseDir(); + $baseUrl = Config::getBasePath(); $this->view->headLink()->appendStylesheet($baseUrl . 'js/jplayer/skin/jplayer.blue.monday.css?' . $CC_CONFIG['airtime_version']); $this->_helper->layout->setLayout('livestream'); @@ -122,7 +122,7 @@ class DashboardController extends Zend_Controller_Action $CC_CONFIG = Config::getConfig(); - $baseUrl = Application_Common_OsPath::getBaseDir(); + $baseUrl = Config::getBasePath(); $headScript = $this->view->headScript(); AirtimeTableView::injectTableJavaScriptDependencies($headScript, $baseUrl, $CC_CONFIG['airtime_version']); diff --git a/legacy/application/controllers/EmbeddablewidgetsController.php b/legacy/application/controllers/EmbeddablewidgetsController.php index 80d725d0c..2242db977 100644 --- a/legacy/application/controllers/EmbeddablewidgetsController.php +++ b/legacy/application/controllers/EmbeddablewidgetsController.php @@ -11,7 +11,7 @@ class EmbeddableWidgetsController extends Zend_Controller_Action Zend_Layout::getMvcInstance()->assign('parent_page', 'Widgets'); $CC_CONFIG = Config::getConfig(); - $baseUrl = Application_Common_OsPath::getBaseDir(); + $baseUrl = Config::getBasePath(); $this->view->headLink()->appendStylesheet($baseUrl . 'css/player-form.css?' . $CC_CONFIG['airtime_version']); $this->view->headScript()->appendFile($baseUrl . 'js/airtime/player/player.js?' . $CC_CONFIG['airtime_version']); @@ -54,7 +54,7 @@ class EmbeddableWidgetsController extends Zend_Controller_Action } $CC_CONFIG = Config::getConfig(); - $baseUrl = Application_Common_OsPath::getBaseDir(); + $baseUrl = Config::getBasePath(); $facebookAppId = $CC_CONFIG['facebook-app-id']; $this->view->headScript()->appendScript('var FACEBOOK_APP_ID = ' . json_encode($facebookAppId) . ';'); diff --git a/legacy/application/controllers/ErrorController.php b/legacy/application/controllers/ErrorController.php index 5c2a5e241..a81e1e1d5 100644 --- a/legacy/application/controllers/ErrorController.php +++ b/legacy/application/controllers/ErrorController.php @@ -13,7 +13,7 @@ class ErrorController extends Zend_Controller_Action try { $service_user = new Application_Service_UserService(); $service_user->getCurrentUser(); - $this->view->helpUrl = Application_Common_OsPath::getBaseDir() . 'dashboard/help'; + $this->view->helpUrl = Config::getBasePath() . 'dashboard/help'; } catch (Exception $e) { $this->view->helpUrl = HELP_URL; } diff --git a/legacy/application/controllers/IndexController.php b/legacy/application/controllers/IndexController.php index ca2e15ea0..5d9f97f10 100644 --- a/legacy/application/controllers/IndexController.php +++ b/legacy/application/controllers/IndexController.php @@ -9,7 +9,7 @@ class IndexController extends Zend_Controller_Action public function indexAction() { $CC_CONFIG = Config::getConfig(); - $baseUrl = Application_Common_OsPath::getBaseDir(); + $baseUrl = Config::getBasePath(); $this->view->headTitle(Application_Model_Preference::GetHeadTitle()); $this->view->headScript()->appendFile($baseUrl . 'js/libs/jquery-1.8.3.min.js?' . $CC_CONFIG['airtime_version'], 'text/javascript'); diff --git a/legacy/application/controllers/LibraryController.php b/legacy/application/controllers/LibraryController.php index e92f8144e..f2311f532 100644 --- a/legacy/application/controllers/LibraryController.php +++ b/legacy/application/controllers/LibraryController.php @@ -76,7 +76,7 @@ class LibraryController extends Zend_Controller_Action public function contextMenuAction() { - $baseUrl = Application_Common_OsPath::getBaseDir(); + $baseUrl = Config::getBasePath(); $id = $this->_getParam('id'); $type = $this->_getParam('type'); // playlist||timeline diff --git a/legacy/application/controllers/ListenerstatController.php b/legacy/application/controllers/ListenerstatController.php index 1d1e31f72..e07cad215 100644 --- a/legacy/application/controllers/ListenerstatController.php +++ b/legacy/application/controllers/ListenerstatController.php @@ -15,7 +15,7 @@ class ListenerstatController extends Zend_Controller_Action $CC_CONFIG = Config::getConfig(); $request = $this->getRequest(); - $baseUrl = Application_Common_OsPath::getBaseDir(); + $baseUrl = Config::getBasePath(); Zend_Layout::getMvcInstance()->assign('parent_page', 'Analytics'); @@ -61,7 +61,7 @@ class ListenerstatController extends Zend_Controller_Action $CC_CONFIG = Config::getConfig(); $request = $this->getRequest(); - $baseUrl = Application_Common_OsPath::getBaseDir(); + $baseUrl = Config::getBasePath(); $headScript = $this->view->headScript(); AirtimeTableView::injectTableJavaScriptDependencies($headScript, $baseUrl, $CC_CONFIG['airtime_version']); Zend_Layout::getMvcInstance()->assign('parent_page', 'Analytics'); diff --git a/legacy/application/controllers/LoginController.php b/legacy/application/controllers/LoginController.php index 6148c6d1c..392cee93e 100644 --- a/legacy/application/controllers/LoginController.php +++ b/legacy/application/controllers/LoginController.php @@ -5,7 +5,7 @@ class LoginController extends Zend_Controller_Action public function init() { $CC_CONFIG = Config::getConfig(); - $baseUrl = Application_Common_OsPath::getBaseDir(); + $baseUrl = Config::getBasePath(); $this->view->headLink(['rel' => 'icon', 'href' => $baseUrl . 'favicon.ico?' . $CC_CONFIG['airtime_version'], 'type' => 'image/x-icon'], 'PREPEND') ->appendStylesheet($baseUrl . 'css/bootstrap.css?' . $CC_CONFIG['airtime_version']) @@ -43,7 +43,7 @@ class LoginController extends Zend_Controller_Action $this->view->error = false; - $baseUrl = Application_Common_OsPath::getBaseDir(); + $baseUrl = Config::getBasePath(); $form = new Application_Form_Login(); @@ -113,7 +113,7 @@ class LoginController extends Zend_Controller_Action { $CC_CONFIG = Config::getConfig(); - $baseUrl = Application_Common_OsPath::getBaseDir(); + $baseUrl = Config::getBasePath(); $this->view->headScript()->appendFile($baseUrl . 'js/airtime/login/password-restore.js?' . $CC_CONFIG['airtime_version'], 'text/javascript'); diff --git a/legacy/application/controllers/PlayouthistoryController.php b/legacy/application/controllers/PlayouthistoryController.php index d46783b22..46f87802e 100644 --- a/legacy/application/controllers/PlayouthistoryController.php +++ b/legacy/application/controllers/PlayouthistoryController.php @@ -22,7 +22,7 @@ class PlayouthistoryController extends Zend_Controller_Action public function indexAction() { $CC_CONFIG = Config::getConfig(); - $baseUrl = Application_Common_OsPath::getBaseDir(); + $baseUrl = Config::getBasePath(); Zend_Layout::getMvcInstance()->assign('parent_page', 'Analytics'); diff --git a/legacy/application/controllers/PlayouthistorytemplateController.php b/legacy/application/controllers/PlayouthistorytemplateController.php index f56b1ae80..717c0b1d6 100644 --- a/legacy/application/controllers/PlayouthistorytemplateController.php +++ b/legacy/application/controllers/PlayouthistorytemplateController.php @@ -16,7 +16,7 @@ class PlayouthistorytemplateController extends Zend_Controller_Action public function indexAction() { $CC_CONFIG = Config::getConfig(); - $baseUrl = Application_Common_OsPath::getBaseDir(); + $baseUrl = Config::getBasePath(); Zend_Layout::getMvcInstance()->assign('parent_page', 'Analytics'); @@ -32,7 +32,7 @@ class PlayouthistorytemplateController extends Zend_Controller_Action public function configureTemplateAction() { $CC_CONFIG = Config::getConfig(); - $baseUrl = Application_Common_OsPath::getBaseDir(); + $baseUrl = Config::getBasePath(); Zend_Layout::getMvcInstance()->assign('parent_page', 'Analytics'); diff --git a/legacy/application/controllers/PluploadController.php b/legacy/application/controllers/PluploadController.php index 9584adf69..c79fe0cec 100644 --- a/legacy/application/controllers/PluploadController.php +++ b/legacy/application/controllers/PluploadController.php @@ -14,7 +14,7 @@ class PluploadController extends Zend_Controller_Action { $CC_CONFIG = Config::getConfig(); - $baseUrl = Application_Common_OsPath::getBaseDir(); + $baseUrl = Config::getBasePath(); $locale = Application_Model_Preference::GetLocale(); $this->view->headScript()->appendFile($baseUrl . 'js/datatables/js/jquery.dataTables.js?' . $CC_CONFIG['airtime_version'], 'text/javascript'); diff --git a/legacy/application/controllers/PodcastController.php b/legacy/application/controllers/PodcastController.php index 7821f5838..99f517b40 100644 --- a/legacy/application/controllers/PodcastController.php +++ b/legacy/application/controllers/PodcastController.php @@ -5,7 +5,7 @@ class PodcastController extends Zend_Controller_Action public function init() { $CC_CONFIG = Config::getConfig(); - $baseUrl = Application_Common_OsPath::getBaseDir(); + $baseUrl = Config::getBasePath(); $headScript = $this->view->headScript(); AirtimeTableView::injectTableJavaScriptDependencies($headScript, $baseUrl, $CC_CONFIG['airtime_version']); diff --git a/legacy/application/controllers/PreferenceController.php b/legacy/application/controllers/PreferenceController.php index 40b254da2..c28a587e6 100644 --- a/legacy/application/controllers/PreferenceController.php +++ b/legacy/application/controllers/PreferenceController.php @@ -25,7 +25,7 @@ class PreferenceController extends Zend_Controller_Action Zend_Layout::getMvcInstance()->assign('parent_page', 'Settings'); - $baseUrl = Application_Common_OsPath::getBaseDir(); + $baseUrl = Config::getBasePath(); $this->view->headScript()->appendFile($baseUrl . 'js/airtime/preferences/preferences.js?' . $CC_CONFIG['airtime_version'], 'text/javascript'); $this->view->statusMsg = ''; @@ -137,7 +137,7 @@ class PreferenceController extends Zend_Controller_Action Zend_Layout::getMvcInstance()->assign('parent_page', 'Settings'); - $baseUrl = Application_Common_OsPath::getBaseDir(); + $baseUrl = Config::getBasePath(); $this->view->headScript()->appendFile($baseUrl . 'js/airtime/preferences/streamsetting.js?' . $CC_CONFIG['airtime_version'], 'text/javascript'); diff --git a/legacy/application/controllers/ScheduleController.php b/legacy/application/controllers/ScheduleController.php index 76fa1bc50..9b4b99a56 100644 --- a/legacy/application/controllers/ScheduleController.php +++ b/legacy/application/controllers/ScheduleController.php @@ -44,7 +44,7 @@ class ScheduleController extends Zend_Controller_Action { $CC_CONFIG = Config::getConfig(); - $baseUrl = Application_Common_OsPath::getBaseDir(); + $baseUrl = Config::getBasePath(); // Embed the schedule in our page response so we don't have to make an AJAX request to get this data after the page load. $scheduleController = new ScheduleController($this->getRequest(), $this->getResponse()); diff --git a/legacy/application/controllers/ShowbuilderController.php b/legacy/application/controllers/ShowbuilderController.php index e3ccf6943..f82592434 100644 --- a/legacy/application/controllers/ShowbuilderController.php +++ b/legacy/application/controllers/ShowbuilderController.php @@ -18,7 +18,7 @@ class ShowbuilderController extends Zend_Controller_Action public function indexAction() { $CC_CONFIG = Config::getConfig(); - $baseUrl = Application_Common_OsPath::getBaseDir(); + $baseUrl = Config::getBasePath(); $userType = Application_Model_User::GetCurrentUser()->getType(); // $this->_helper->layout->setLayout("showbuilder"); @@ -100,7 +100,7 @@ class ShowbuilderController extends Zend_Controller_Action public function checkAndShowSetupPopup($request) { $CC_CONFIG = Config::getConfig(); - $baseUrl = Application_Common_OsPath::getBaseDir(); + $baseUrl = Config::getBasePath(); $setupComplete = Application_Model_Preference::getLangTimezoneSetupComplete(); $previousPage = strtolower($request->getHeader('Referer')); $userService = new Application_Service_UserService(); @@ -119,7 +119,7 @@ class ShowbuilderController extends Zend_Controller_Action public function contextMenuAction() { - $baseUrl = Application_Common_OsPath::getBaseDir(); + $baseUrl = Config::getBasePath(); $id = $this->_getParam('id'); $now = floatval(microtime(true)); diff --git a/legacy/application/controllers/SystemstatusController.php b/legacy/application/controllers/SystemstatusController.php index 8cc7cb433..85d57a4ba 100644 --- a/legacy/application/controllers/SystemstatusController.php +++ b/legacy/application/controllers/SystemstatusController.php @@ -7,7 +7,7 @@ class SystemstatusController extends Zend_Controller_Action public function init() { $config = Config::getConfig(); - $baseUrl = Application_Common_OsPath::getBaseDir(); + $baseUrl = Config::getBasePath(); $this->view->headScript()->appendFile($baseUrl . 'js/airtime/status/status.js?' . $config['airtime_version'], 'text/javascript'); $this->version = $config['airtime_version']; } diff --git a/legacy/application/controllers/TracktypeController.php b/legacy/application/controllers/TracktypeController.php index 615136a6e..7de28c2d8 100644 --- a/legacy/application/controllers/TracktypeController.php +++ b/legacy/application/controllers/TracktypeController.php @@ -22,7 +22,7 @@ class TracktypeController extends Zend_Controller_Action Zend_Layout::getMvcInstance()->assign('parent_page', 'Settings'); - $baseUrl = Application_Common_OsPath::getBaseDir(); + $baseUrl = Config::getBasePath(); $js_files = [ 'js/datatables/js/jquery.dataTables.js?', diff --git a/legacy/application/controllers/UserController.php b/legacy/application/controllers/UserController.php index efd3b0c26..b49f4ce9e 100644 --- a/legacy/application/controllers/UserController.php +++ b/legacy/application/controllers/UserController.php @@ -24,7 +24,7 @@ class UserController extends Zend_Controller_Action Zend_Layout::getMvcInstance()->assign('parent_page', 'Settings'); - $baseUrl = Application_Common_OsPath::getBaseDir(); + $baseUrl = Config::getBasePath(); $js_files = [ 'js/datatables/js/jquery.dataTables.js?', diff --git a/legacy/application/controllers/plugins/PageLayoutInitPlugin.php b/legacy/application/controllers/plugins/PageLayoutInitPlugin.php index 9e06a2b1f..1d640a99d 100644 --- a/legacy/application/controllers/plugins/PageLayoutInitPlugin.php +++ b/legacy/application/controllers/plugins/PageLayoutInitPlugin.php @@ -73,7 +73,7 @@ class PageLayoutInitPlugin extends Zend_Controller_Plugin_Abstract } $view = $this->_bootstrap->getResource('view'); - $baseUrl = Application_Common_OsPath::getBaseDir(); + $baseUrl = Config::getBasePath(); $view->headScript()->appendScript("var baseUrl = '{$baseUrl}';"); $this->_initTranslationGlobals($view); @@ -156,7 +156,7 @@ class PageLayoutInitPlugin extends Zend_Controller_Plugin_Abstract $view = $this->_bootstrap->getResource('view'); - $baseUrl = Application_Common_OsPath::getBaseDir(); + $baseUrl = Config::getBasePath(); $view->headLink(['rel' => 'icon', 'href' => $baseUrl . 'favicon.ico?' . $CC_CONFIG['airtime_version'], 'type' => 'image/x-icon'], 'PREPEND') ->appendStylesheet($baseUrl . 'css/bootstrap.css?' . $CC_CONFIG['airtime_version']) @@ -178,7 +178,7 @@ class PageLayoutInitPlugin extends Zend_Controller_Plugin_Abstract $view = $this->_bootstrap->getResource('view'); - $baseUrl = Application_Common_OsPath::getBaseDir(); + $baseUrl = Config::getBasePath(); $view->headScript()->appendFile($baseUrl . 'js/libs/jquery-1.8.3.min.js?' . $CC_CONFIG['airtime_version'], 'text/javascript') ->appendFile($baseUrl . 'js/libs/jquery-ui-1.8.24.min.js?' . $CC_CONFIG['airtime_version'], 'text/javascript') diff --git a/legacy/application/forms/EditAudioMD.php b/legacy/application/forms/EditAudioMD.php index 3bb20071e..e46954a94 100644 --- a/legacy/application/forms/EditAudioMD.php +++ b/legacy/application/forms/EditAudioMD.php @@ -8,7 +8,6 @@ class Application_Form_EditAudioMD extends Zend_Form public function startForm($p_id) { - $baseUrl = Application_Common_OsPath::getBaseDir(); // Set the method for the display form to POST $this->setMethod('post'); diff --git a/legacy/application/forms/Preferences.php b/legacy/application/forms/Preferences.php index 58fd218e9..ff5489bf9 100644 --- a/legacy/application/forms/Preferences.php +++ b/legacy/application/forms/Preferences.php @@ -4,8 +4,6 @@ class Application_Form_Preferences extends Zend_Form { public function init() { - $baseUrl = Application_Common_OsPath::getBaseDir(); - $this->setDecorators([ ['ViewScript', ['viewScript' => 'form/preferences.phtml']], ]); diff --git a/legacy/application/layouts/scripts/layout.phtml b/legacy/application/layouts/scripts/layout.phtml index 808479d1f..746148273 100644 --- a/legacy/application/layouts/scripts/layout.phtml +++ b/legacy/application/layouts/scripts/layout.phtml @@ -1,125 +1,133 @@ doctype() ?> + - + headTitle() ?> - headLink() ?> - headScript() ?> - + headLink() ?> + headScript() ?> + +
- Status. */ - //echo $this->versionNotify(); - $sss = $this->SourceSwitchStatus(); - $scs = $this->SourceConnectionStatus(); - ?> - partial('partialviews/header.phtml', array("live_dj_switch"=>$sss['live_dj'], "live_dj_connection"=>$scs['live_dj'], "master_dj_switch"=>$sss['master_dj'], "master_dj_connection"=>$scs['master_dj'], - "scheduled_play_switch"=>$sss['scheduled_play'])) ?> -navigation()->menu()->setPartial($partial); ?> + //echo $this->versionNotify(); + $sss = $this->SourceSwitchStatus(); + $scs = $this->SourceConnectionStatus(); + ?> + partial('partialviews/header.phtml', array( + "live_dj_switch" => $sss['live_dj'], "live_dj_connection" => $scs['live_dj'], "master_dj_switch" => $sss['master_dj'], "master_dj_connection" => $scs['master_dj'], + "scheduled_play_switch" => $sss['scheduled_play'] + )) ?> + navigation()->menu()->setPartial($partial); ?> - -
- -
-
-
    -
  • - -
    • -
  • - -
    • -
  • - -
    • -
- - - +
-
- - - - -
- -
- - - -
+
+ +
+
    +
  • + +
    • +
  • + +
    • +
  • + +
    • +
+ + + +
-
- +
+ + + + +
+ +
+ + + +
- -
- -
-
-
;">
+
+ - +
+
+
;">
+ + +
+
-
+ +
">
- -
">
- -
" id="content"> - layout()->content ?> -
-layout()->parent_page)) { ?> -