Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

chore(legacy): use Config::getBasePath helper 

Replace Application_Common_OsPath::getBaseDir with Config::getBasePath.
This commit is contained in:
jo 2022-07-07 23:27:28 +02:00 committed by Kyle Robbertze
parent 712ecd70b4
commit 72960593c7
34 changed files with 288 additions and 297 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
legacy/application/Bootstrap.php
View File

@ -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',

16
legacy/application/common/OsPath.php
View File

@ -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] != '/') {

2
legacy/application/controllers/ApiController.php
View File

@ -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');

12
legacy/application/controllers/AudiopreviewController.php
View File

@ -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);

4
legacy/application/controllers/DashboardController.php
View File

@ -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']);

4
legacy/application/controllers/EmbeddablewidgetsController.php
View File

@ -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) . ';');

2
legacy/application/controllers/ErrorController.php
View File

@ -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;
}

2
legacy/application/controllers/IndexController.php
View File

@ -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');

2
legacy/application/controllers/LibraryController.php
View File

@ -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

4
legacy/application/controllers/ListenerstatController.php
View File

@ -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');

6
legacy/application/controllers/LoginController.php
View File

@ -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');

2
legacy/application/controllers/PlayouthistoryController.php
View File

@ -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');

4
legacy/application/controllers/PlayouthistorytemplateController.php
View File

@ -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');

2
legacy/application/controllers/PluploadController.php
View File

@ -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');

2
legacy/application/controllers/PodcastController.php
View File

@ -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']);

4
legacy/application/controllers/PreferenceController.php
View File

@ -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');

2
legacy/application/controllers/ScheduleController.php
View File

@ -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());

6
legacy/application/controllers/ShowbuilderController.php
View File

@ -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));

2
legacy/application/controllers/SystemstatusController.php
View File

@ -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'];
}

2
legacy/application/controllers/TracktypeController.php
View File

@ -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?',

2
legacy/application/controllers/UserController.php
View File

@ -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?',

6
legacy/application/controllers/plugins/PageLayoutInitPlugin.php
View File

@ -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')

1
legacy/application/forms/EditAudioMD.php
View File

@ -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');

2
legacy/application/forms/Preferences.php
View File

@ -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']],
]);

29
legacy/application/layouts/scripts/layout.phtml
View File

@ -1,12 +1,14 @@
<?php echo $this->doctype() ?>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<?php echo $this->headTitle() ?>
<?php echo $this->headLink() ?>
<?php echo $this->headScript() ?>
<?php $baseUrl = Application_Common_OsPath::getBaseDir(); ?>
<?php $baseUrl = Config::getBasePath(); ?>
</head>
<body>
<div id="Panel" class="sticky">
<?php
@ -18,8 +20,10 @@
$sss = $this->SourceSwitchStatus();
$scs = $this->SourceConnectionStatus();
?>
<?php echo $this->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'])) ?>
<?php echo $this->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']
)) ?>
<?php $partial = array('menu.phtml', 'default');
$this->navigation()->menu()->setPartial($partial); ?>
@ -34,11 +38,11 @@
parseItems(schedulePreLoaded.entries);
parseSourceStatus(schedulePreLoaded.source_status);
parseSwitchStatus(schedulePreLoaded.switch_status);
</script>
</div>
<div id="media_type_nav"> <!-- class="content-pane" -->
<div id="media_type_nav">
<!-- class="content-pane" -->
<div class="btn-group">
<ul class="dropdown-menu">
<li id="new-playlist">
@ -51,7 +55,7 @@
<a href="#"><?php echo _("Webstream") ?></a>
</li>
</ul>
<a href="<?php echo Application_Common_OsPath::getBaseDir() . 'plupload' ?>">
<a href="<?php echo Config::getBasePath() . 'plupload' ?>">
<button id="add_media_btn" class="btn btn-small dashboard-btn btn-new">
<span><?php echo _("Upload") ?></span>
</button>
@ -59,12 +63,13 @@
</div>
<div class="media_type_selector top-link" data-selection-id="<?php echo MediaType::getDefault(); ?>">
<a href="<?php echo Application_Common_OsPath::getBaseDir() . 'showbuilder#' ?>">
<a href="<?php echo Config::getBasePath() . 'showbuilder#' ?>">
<i class='icon-home icon-white'></i>
<?php echo _("Dashboard") ?>
</a>
</div>
<?php $subnavPrefix = "/showbuilder"; require_once APPLICATION_PATH . "/views/scripts/partialviews/dashboard-sub-nav.php"; ?>
<?php $subnavPrefix = "/showbuilder";
require_once APPLICATION_PATH . "/views/scripts/partialviews/dashboard-sub-nav.php"; ?>
<div class="media_type_selector dashboard_sub_nav" data-selection-id="<?php echo MediaType::PODCAST ?>">
<a href="<?php echo $subnavPrefix; ?>#podcasts">
<span class="selector-name"><i class='icon-headphones icon-white'></i><?php echo _("Podcasts") ?></span>
@ -93,7 +98,8 @@
<div class="disk_usage_used" style="width:<?php echo sprintf("%01.1f%%", min(100, $used / $total * 100)) ?>;"></div>
<!--<div style="margin-top: 15px; font-size: 12px;">
<?php //echo sprintf("%01.1fGB of %01.1fGB", $used/pow(2, 30), $total/pow(2, 30)); ?>
<?php //echo sprintf("%01.1fGB of %01.1fGB", $used/pow(2, 30), $total/pow(2, 30));
?>
</div>-->
</div>
@ -101,7 +107,9 @@
</div>
<?php $hint = Application_Common_UsabilityHints::getUsabilityHint(); ?>
<div class="usability_hint <?php if ($hint == "") { echo "hidden"; } ?>"><?php echo $hint; ?></div>
<div class="usability_hint <?php if ($hint == "") {
echo "hidden";
} ?>"><?php echo $hint; ?></div>
<div class="wrapper <?php if (isset($this->layout()->parent_page)) echo "wrapper_panel"; ?>" id="content">
<?php echo $this->layout()->content ?>
@ -206,4 +214,5 @@
</body>
</html>

4
legacy/application/models/Auth.php
View File

@ -140,11 +140,9 @@ class Application_Model_Auth
*/
public static function pinSessionToClient($auth)
{
$CC_CONFIG = Config::getConfig();
$serverName = isset($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : '';
$remoteAddr = isset($_SERVER['REMOTE_ADDR']) ? $_SERVER['REMOTE_ADDR'] : '';
$sessionIdentifier = 'Airtime' . '-' . $serverName . '-' . $remoteAddr . '-' . Application_Model_Preference::GetClientId() . '-' . $CC_CONFIG['baseDir'];
$sessionIdentifier = 'Airtime' . '-' . $serverName . '-' . $remoteAddr . '-' . Application_Model_Preference::GetClientId() . '-' . Config::getBasePath();
$auth->setStorage(new Zend_Auth_Storage_Session($sessionIdentifier));
}
}

2
legacy/application/models/StoredFile.php
View File

@ -682,7 +682,7 @@ SQL;
public static function searchLibraryFiles($datatables)
{
$baseUrl = Application_Common_OsPath::getBaseDir();
$baseUrl = Config::getBasePath();
$con = Propel::getConnection(CcFilesPeer::DATABASE_NAME);

2
legacy/application/services/CalendarService.php
View File

@ -27,7 +27,7 @@ class Application_Service_CalendarService
{
$menu = [];
$now = time();
$baseUrl = Application_Common_OsPath::getBaseDir();
$baseUrl = Config::getBasePath();
$isAdminOrPM = $this->currentUser->isAdminOrPM();
$isHostOfShow = $this->currentUser->isHostOfShow($this->ccShow->getDbId());

2
legacy/application/views/scripts/embeddablewidgets/facebook.phtml
View File

@ -1,6 +1,6 @@
<div id="weekly-schedule-widget" class="prefpanel ui-widget simple-formblock clearfix padded-strong ">
<?php $baseUrl = Application_Common_OsPath::getBaseDir(); ?>
<?php $baseUrl = Config::getBasePath(); ?>
<h2 style="text-align:center"><?php echo _("Facebook Radio Player") ?></h2>
<div style="clear:both"></div>

2
legacy/application/views/scripts/embeddablewidgets/player.phtml
View File

@ -1,6 +1,6 @@
<div id="player-widget" class="ui-widget prefpanel simple-formblock embed-player-form clearfix padded-strong ">
<?php $baseUrl = Application_Common_OsPath::getBaseDir(); ?>
<?php $baseUrl = Config::getBasePath(); ?>
<form method="post" id="player_form" enctype="multipart/form-data">
<h2 style="text-align:center"><?php echo _("Player") ?></h2>

5
legacy/application/views/scripts/embeddablewidgets/schedule.phtml
View File

@ -1,6 +1,6 @@
<div id="weekly-schedule-widget" class="prefpanel ui-widget simple-formblock clearfix padded-strong ">
<?php $baseUrl = Application_Common_OsPath::getBaseDir(); ?>
<?php $baseUrl = Config::getBasePath(); ?>
<h2 style="text-align:center"><?php echo _("Weekly Schedule") ?></h2>
<div style="clear:both"></div>
@ -20,7 +20,8 @@
<label><?php echo _("Embeddable code:") ?><br><br></label>
<textarea style="width:98%" rows="3" readonly="readonly"><iframe height="400px" width="550px" scrolling="no" frameborder="0" src="<?php echo Application_Common_HTTPHelper::getStationUrl() . "embed/weekly-program" ?>"></iframe>
</textarea>
<div><p>
<div>
<p>
<?php echo _("Copy this code and paste it into your website's HTML to embed the weekly schedule in your site. Adjust the height and width attributes to your desired size.") ?>
</p>
</div>

2
legacy/application/views/scripts/library/library.phtml
View File

@ -1,4 +1,4 @@
<?php $baseUrl = Application_Common_OsPath::getBaseDir(); ?>
<?php $baseUrl = Config::getBasePath(); ?>
<div id="import_status" class="library_import" style="display:none">
<?php echo _("File import in progress..."); ?>
<img src=<?php echo $baseUrl . "css/images/file_import_loader.gif" ?>></img>

2
legacy/application/views/scripts/preference/index.phtml
View File

@ -1,6 +1,6 @@
<div class="ui-widget prefpanel simple-formblock clearfix padded-strong preferences">
<h2 id="preferences_header"><?php echo _("General") ?></h2>
<?php $baseUrl = Application_Common_OsPath::getBaseDir(); ?>
<?php $baseUrl = Config::getBasePath(); ?>
<form method="post" id="pref_form" enctype="multipart/form-data">
<?php echo $this->form->getElement('submit')->render() ?>

6
legacy/application/views/scripts/preference/stream-setting.phtml
View File

@ -1,6 +1,6 @@
<div class="ui-widget prefpanel simple-formblock clearfix padded-strong stream-config">
<h2 style="float:left"><?php echo _("Stream Settings") ?></h2>
<?php $baseUrl = Application_Common_OsPath::getBaseDir(); ?>
<?php $baseUrl = Config::getBasePath(); ?>
<form method="post" id="stream_form" enctype="application/x-www-form-urlencoded">
<button name="stream_save" id="stream_save_top" type="button" class="btn right-floated"><?php echo _("Save") ?></button>
<?php echo $this->form->getElement('csrf') ?>
@ -49,7 +49,9 @@
?>
<?php foreach ($this->form->getElement('streamFormat')->getMultiOptions() as $radio) : ?>
<label for="streamFormat-<?php echo $i ?>">
<input type="radio" value="<?php echo $i ?>" id="streamFormat-<?php echo $i ?>" name="streamFormat" <?php if($i == $value){echo 'checked="checked"';}?> >
<input type="radio" value="<?php echo $i ?>" id="streamFormat-<?php echo $i ?>" name="streamFormat" <?php if ($i == $value) {
echo 'checked="checked"';
} ?>>
<?php echo $radio ?> <br><br>
</input>
</label>