diff --git a/admin/index.php b/admin/index.php index 1d5837edc2..d8667a1555 100644 --- a/admin/index.php +++ b/admin/index.php @@ -173,7 +173,7 @@ switch ($_GET['page']) { - <?php echo __("Administration"); ?> :: <?php echo $config->getWebSiteTitle(); ?> + <?php echo __("Administration") . $config->getPageTitleSeparator() . $config->getWebSiteTitle(); ?> - <?php __("Translate AVideo"); ?> :: <?php echo $config->getWebSiteTitle();?> + <?php __("Translate AVideo") . $config->getPageTitleSeparator() . $config->getWebSiteTitle(); ?> encoderURL = $encoderURL; } + + function getPageTitleSeparator() { + define("PAGE_TITLE_SEPARATOR", "::"); // This is ready to be configurable, if needed + return " " . PAGE_TITLE_SEPARATOR . " "; + } } diff --git a/objects/userRecoverPass.php b/objects/userRecoverPass.php index e8fe2a8e1f..f579d9f5c2 100644 --- a/objects/userRecoverPass.php +++ b/objects/userRecoverPass.php @@ -57,7 +57,7 @@ if (!(!empty($_GET['user']) && !empty($_GET['recoverpass']))) { - <?php echo __("Recover Password"); ?> :: <?php echo $config->getWebSiteTitle(); ?> + <?php echo __("Recover Password") . $config->getPageTitleSeparator() . $config->getWebSiteTitle(); ?> diff --git a/plugin/AD_Server/index.php b/plugin/AD_Server/index.php index 854c756082..bc594e9588 100644 --- a/plugin/AD_Server/index.php +++ b/plugin/AD_Server/index.php @@ -12,7 +12,7 @@ if (!User::isAdmin()) { - <?php echo __("VAST"); ?> :: <?php echo $config->getWebSiteTitle(); ?> + <?php echo __("VAST") . $config->getPageTitleSeparator() . $config->getWebSiteTitle(); ?> - <?php echo __("API"); ?> :: <?php echo $config->getWebSiteTitle(); ?> + <?php echo __("API") . $config->getPageTitleSeparator() . $config->getWebSiteTitle(); ?> diff --git a/plugin/Audit/page/editor.php b/plugin/Audit/page/editor.php index 6511dd23f6..2b24d78cb8 100644 --- a/plugin/Audit/page/editor.php +++ b/plugin/Audit/page/editor.php @@ -9,7 +9,7 @@ if (!User::isAdmin()) { - <?php echo __("Audit"); ?> :: <?php echo $config->getWebSiteTitle(); ?> + <?php echo __("Audit") . $config->getPageTitleSeparator() . $config->getWebSiteTitle(); ?> diff --git a/plugin/BlockonomicsYPT/invoice.php b/plugin/BlockonomicsYPT/invoice.php index 81f709710b..44183c454c 100644 --- a/plugin/BlockonomicsYPT/invoice.php +++ b/plugin/BlockonomicsYPT/invoice.php @@ -14,7 +14,7 @@ $order = new BlockonomicsOrder($order_id); - <?php echo __("Invoice"); ?> :: <?php echo $config->getWebSiteTitle(); ?> + <?php echo __("Invoice") . $config->getPageTitleSeparator() . $config->getWebSiteTitle(); ?> diff --git a/plugin/BulkEmbed/search.php b/plugin/BulkEmbed/search.php index 00dc9746ac..7dca4630e9 100644 --- a/plugin/BulkEmbed/search.php +++ b/plugin/BulkEmbed/search.php @@ -9,7 +9,7 @@ $obj = AVideoPlugin::getObjectData("BulkEmbed"); - <?php echo __("Bulk Embed"); ?> :: <?php echo $config->getWebSiteTitle(); ?> + <?php echo __("Bulk Embed") . $config->getPageTitleSeparator() . $config->getWebSiteTitle(); ?> diff --git a/plugin/CloneSite/index.php b/plugin/CloneSite/index.php index e25dca2033..14b69d48de 100644 --- a/plugin/CloneSite/index.php +++ b/plugin/CloneSite/index.php @@ -14,7 +14,7 @@ if (!User::isAdmin()) { - <?php echo __("Clone Site"); ?> :: <?php echo $config->getWebSiteTitle(); ?> + <?php echo __("Clone Site") . $config->getPageTitleSeparator() . $config->getWebSiteTitle(); ?> diff --git a/plugin/CombineSites/page/editor.php b/plugin/CombineSites/page/editor.php index eaa44d1deb..fcd3ca0670 100644 --- a/plugin/CombineSites/page/editor.php +++ b/plugin/CombineSites/page/editor.php @@ -12,7 +12,7 @@ require_once $global['systemRootPath'] . 'plugin/CombineSites/Objects/CombineSit - <?php echo __("Combine Sites"); ?> :: <?php echo $config->getWebSiteTitle(); ?> + <?php echo __("Combine Sites") . $config->getPageTitleSeparator() . $config->getWebSiteTitle(); ?> diff --git a/plugin/CustomizeAdvanced/confirmRating.php b/plugin/CustomizeAdvanced/confirmRating.php index a4634bdf78..70b982b63d 100644 --- a/plugin/CustomizeAdvanced/confirmRating.php +++ b/plugin/CustomizeAdvanced/confirmRating.php @@ -12,7 +12,7 @@ $imgh = 720; - <?php echo __("Confirm Rating"); ?> :: <?php echo $config->getWebSiteTitle(); ?> + <?php echo __("Confirm Rating") . $config->getPageTitleSeparator() . $config->getWebSiteTitle(); ?> diff --git a/plugin/CustomizeUser/confirmVideoPassword.php b/plugin/CustomizeUser/confirmVideoPassword.php index e7bba87b3d..7d6c5ac87b 100644 --- a/plugin/CustomizeUser/confirmVideoPassword.php +++ b/plugin/CustomizeUser/confirmVideoPassword.php @@ -12,7 +12,7 @@ $imgh = 720; - <?php echo __("Confirm Password"); ?> :: <?php echo $config->getWebSiteTitle(); ?> + <?php echo __("Confirm Password") . $config->getPageTitleSeparator() . $config->getWebSiteTitle(); ?> diff --git a/plugin/Gallery/view/topLogic.php b/plugin/Gallery/view/topLogic.php index 35e720c70d..d539b91ccc 100644 --- a/plugin/Gallery/view/topLogic.php +++ b/plugin/Gallery/view/topLogic.php @@ -67,11 +67,11 @@ if(!empty($video)){ $metaDescription = " ".$video['id']; // make sure the www has a different title and description than non www if(strrpos($_SERVER['HTTP_HOST'], 'www.')=== false){ - $siteTitle .= " :: ".__("Home"); - $metaDescription .= " :: ".__("Home"); + $siteTitle .= $config->getPageTitleSeparator() . __("Home"); + $metaDescription .= $config->getPageTitleSeparator() . __("Home"); } } else { - $siteTitle .= (!empty($siteTitle) ? " :: " : "") . __("Video Not Available"); + $siteTitle .= (!empty($siteTitle) ? $config->getPageTitleSeparator() : "") . __("Video Not Available"); } -$siteTitle .= " :: " . $config->getWebSiteTitle(); +$siteTitle .= $config->getPageTitleSeparator() . $config->getWebSiteTitle(); diff --git a/plugin/Live/index.php b/plugin/Live/index.php index 2faece05eb..4ede568962 100644 --- a/plugin/Live/index.php +++ b/plugin/Live/index.php @@ -75,7 +75,7 @@ if (!empty($chat2) && !empty($chat2->useStaticLayout)) { - <?php echo __("Live"); ?> :: <?php echo $config->getWebSiteTitle(); ?> + <?php echo __("Live") . $config->getPageTitleSeparator() . $config->getWebSiteTitle(); ?> - <?php echo __("Live"); ?> :: <?php echo $config->getWebSiteTitle(); ?> + <?php echo __("Live") . $config->getPageTitleSeparator() . $config->getWebSiteTitle(); ?> - <?php echo __("Live"); ?> :: <?php echo $config->getWebSiteTitle(); ?> + <?php echo __("Live") . $config->getPageTitleSeparator() . $config->getWebSiteTitle(); ?> - <?php echo __("Live"); ?> :: <?php echo $config->getWebSiteTitle(); ?> + <?php echo __("Live") . $config->getPageTitleSeparator() . $config->getWebSiteTitle(); ?> diff --git a/plugin/Live/view/modeYoutubeLive.php b/plugin/Live/view/modeYoutubeLive.php index d52ad8edc9..67e182f28e 100644 --- a/plugin/Live/view/modeYoutubeLive.php +++ b/plugin/Live/view/modeYoutubeLive.php @@ -69,7 +69,7 @@ if (empty($sideAd) && !AVideoPlugin::loadPluginIfEnabled("Chat2")) { - <?php echo $liveTitle; ?> :: <?php echo __("Live"); ?> - <?php echo $config->getWebSiteTitle(); ?> + <?php echo $liveTitle . $config->getPageTitleSeparator() . __("Live") . $config->getPageTitleSeparator() . $config->getWebSiteTitle(); ?> diff --git a/plugin/LiveChat/index.php b/plugin/LiveChat/index.php index b322d9020a..6fabb7c9fb 100644 --- a/plugin/LiveChat/index.php +++ b/plugin/LiveChat/index.php @@ -5,7 +5,7 @@ require_once '../../videos/configuration.php'; - <?php echo __("Live Chat"); ?> :: <?php echo $config->getWebSiteTitle(); ?> + <?php echo __("Live Chat") . $config->getPageTitleSeparator() . $config->getWebSiteTitle(); ?> diff --git a/plugin/LiveLinks/index.php b/plugin/LiveLinks/index.php index 38ad5a1107..931c957e0d 100644 --- a/plugin/LiveLinks/index.php +++ b/plugin/LiveLinks/index.php @@ -11,7 +11,7 @@ if (empty($plugin) || !$plugin->canAddLinks()) { - <?php echo __("Live Links"); ?> :: <?php echo $config->getWebSiteTitle(); ?> + <?php echo __("Live Links") . $config->getPageTitleSeparator() . $config->getWebSiteTitle(); ?> diff --git a/plugin/LiveLinks/view/Live.php b/plugin/LiveLinks/view/Live.php index 2ae1668c21..c8a7528094 100644 --- a/plugin/LiveLinks/view/Live.php +++ b/plugin/LiveLinks/view/Live.php @@ -60,7 +60,7 @@ if (empty($sideAd) && !AVideoPlugin::loadPluginIfEnabled("Chat2")) { - <?php echo $t['title']; ?> :: <?php echo __("Live Links"); ?> :: <?php echo $config->getWebSiteTitle(); ?> + <?php echo $t['title'] . $config->getPageTitleSeparator() . __("Live Links") . $config->getPageTitleSeparator() . $config->getWebSiteTitle(); ?> diff --git a/plugin/LoginControl/View/Users_login_history/index.php b/plugin/LoginControl/View/Users_login_history/index.php index 3ae2d0895d..c8e7f7eb49 100644 --- a/plugin/LoginControl/View/Users_login_history/index.php +++ b/plugin/LoginControl/View/Users_login_history/index.php @@ -12,7 +12,7 @@ if (!User::isAdmin()) { - <?php echo __("Login Control"); ?> :: <?php echo $config->getWebSiteTitle(); ?> + <?php echo __("Login Control") . $config->getPageTitleSeparator() . $config->getWebSiteTitle(); ?> - <?php echo __("Login Control"); ?> :: <?php echo $config->getWebSiteTitle(); ?> + <?php echo __("Login Control") . $config->getPageTitleSeparator() . $config->getWebSiteTitle(); ?> diff --git a/plugin/Meet/View/Meet_join_log/index.php b/plugin/Meet/View/Meet_join_log/index.php index 6fc363c0af..9973eddf25 100644 --- a/plugin/Meet/View/Meet_join_log/index.php +++ b/plugin/Meet/View/Meet_join_log/index.php @@ -12,7 +12,7 @@ if (!User::isAdmin()) { - <?php echo __("Meet"); ?> :: <?php echo $config->getWebSiteTitle(); ?> + <?php echo __("Meet") . $config->getPageTitleSeparator() . $config->getWebSiteTitle(); ?> - <?php echo __("Meet"); ?> :: <?php echo $config->getWebSiteTitle(); ?> + <?php echo __("Meet") . $config->getPageTitleSeparator() . $config->getWebSiteTitle(); ?> - <?php echo __("Meet"); ?> :: <?php echo $config->getWebSiteTitle(); ?> + <?php echo __("Meet") . $config->getPageTitleSeparator() . $config->getWebSiteTitle(); ?> - <?php echo __("Meet"); ?> :: <?php echo $config->getWebSiteTitle(); ?> + <?php echo __("Meet") . $config->getPageTitleSeparator() . $config->getWebSiteTitle(); ?> diff --git a/plugin/Meet/checkServers.php b/plugin/Meet/checkServers.php index 6c9d84d817..cb1b4ea318 100644 --- a/plugin/Meet/checkServers.php +++ b/plugin/Meet/checkServers.php @@ -31,7 +31,7 @@ $timeouts = 2000; - <?php echo __("Check Meet Servers"); ?> :: <?php echo $config->getWebSiteTitle(); ?> + <?php echo __("Check Meet Servers") . $config->getPageTitleSeparator() . $config->getWebSiteTitle(); ?> diff --git a/plugin/Meet/confirmMeetPassword.php b/plugin/Meet/confirmMeetPassword.php index 82db0aa98f..315dad34b9 100644 --- a/plugin/Meet/confirmMeetPassword.php +++ b/plugin/Meet/confirmMeetPassword.php @@ -16,7 +16,7 @@ $photo = User::getPhoto($meet->getUsers_id()); - <?php echo __("Confirm Meet Password"); ?> :: <?php echo $config->getWebSiteTitle(); ?> + <?php echo __("Confirm Meet Password") . $config->getPageTitleSeparator() . $config->getWebSiteTitle(); ?> diff --git a/plugin/Meet/index.php b/plugin/Meet/index.php index 34e579f396..31e5b65e6f 100644 --- a/plugin/Meet/index.php +++ b/plugin/Meet/index.php @@ -24,7 +24,7 @@ if (User::isAdmin() && !empty($_GET['newServer'])) { - <?php echo __("Meet"); ?> :: <?php echo $config->getWebSiteTitle(); ?> + <?php echo __("Meet") . $config->getPageTitleSeparator() . $config->getWebSiteTitle(); ?> diff --git a/plugin/Permissions/View/Users_groups_permissions/index.php b/plugin/Permissions/View/Users_groups_permissions/index.php index 7beb9d1afd..506594f553 100644 --- a/plugin/Permissions/View/Users_groups_permissions/index.php +++ b/plugin/Permissions/View/Users_groups_permissions/index.php @@ -12,7 +12,7 @@ if (!User::isAdmin()) { - <?php echo __("Permissions"); ?> :: <?php echo $config->getWebSiteTitle(); ?> + <?php echo __("Permissions") . $config->getPageTitleSeparator() . $config->getWebSiteTitle(); ?> - <?php echo __("Permissions"); ?> :: <?php echo $config->getWebSiteTitle(); ?> + <?php echo __("Permissions") . $config->getPageTitleSeparator() . $config->getWebSiteTitle(); ?> diff --git a/plugin/PlayLists/View/Playlists_schedules/index.php b/plugin/PlayLists/View/Playlists_schedules/index.php index aebe0fa2fa..7bab9500e0 100644 --- a/plugin/PlayLists/View/Playlists_schedules/index.php +++ b/plugin/PlayLists/View/Playlists_schedules/index.php @@ -12,7 +12,7 @@ if (!User::isAdmin()) { - <?php echo __("PlayLists"); ?> :: <?php echo $config->getWebSiteTitle(); ?> + <?php echo __("PlayLists") . $config->getPageTitleSeparator() . $config->getWebSiteTitle(); ?> - <?php echo __("PlayLists"); ?> :: <?php echo $config->getWebSiteTitle(); ?> + <?php echo __("PlayLists") . $config->getPageTitleSeparator() . $config->getWebSiteTitle(); ?> diff --git a/plugin/PlayLists/epg.php b/plugin/PlayLists/epg.php index feff76a504..c3b131c305 100644 --- a/plugin/PlayLists/epg.php +++ b/plugin/PlayLists/epg.php @@ -6,7 +6,7 @@ if (!isset($global['systemRootPath'])) { - <?php echo __("EPG"); ?> :: <?php echo $config->getWebSiteTitle(); ?> + <?php echo __("EPG") . $config->getPageTitleSeparator() . $config->getWebSiteTitle(); ?> diff --git a/plugin/PlayLists/player.php b/plugin/PlayLists/player.php index 803226d4b5..f9973919e1 100644 --- a/plugin/PlayLists/player.php +++ b/plugin/PlayLists/player.php @@ -52,7 +52,7 @@ if (!empty($video['id'])) { - <?php echo $playListObj->getName(); ?> :: <?php echo $config->getWebSiteTitle(); ?> + <?php echo $playListObj->getName() . $config->getPageTitleSeparator() . $config->getWebSiteTitle(); ?> diff --git a/plugin/PlayerSkins/playerSample.php b/plugin/PlayerSkins/playerSample.php index 5ef668e1a7..18004946a7 100644 --- a/plugin/PlayerSkins/playerSample.php +++ b/plugin/PlayerSkins/playerSample.php @@ -22,7 +22,7 @@ foreach (glob($dir . '*.css') as $file) { - <?php echo __("Player Sample"); ?> :: <?php echo $config->getWebSiteTitle(); ?> + <?php echo __("Player Sample") . $config->getPageTitleSeparator() . $config->getWebSiteTitle(); ?> diff --git a/plugin/PredefinedCategory/page/editor.php b/plugin/PredefinedCategory/page/editor.php index 256f71f417..302d9d2648 100644 --- a/plugin/PredefinedCategory/page/editor.php +++ b/plugin/PredefinedCategory/page/editor.php @@ -15,7 +15,7 @@ $o = AVideoPlugin::getObjectData("PredefinedCategory"); - <?php echo __("Predefined Category"); ?> :: <?php echo $config->getWebSiteTitle(); ?> + <?php echo __("Predefined Category") . $config->getPageTitleSeparator() . $config->getWebSiteTitle(); ?> diff --git a/plugin/StripeYPT/listSubscriptions.php b/plugin/StripeYPT/listSubscriptions.php index 89501501cd..ee8bee47cb 100644 --- a/plugin/StripeYPT/listSubscriptions.php +++ b/plugin/StripeYPT/listSubscriptions.php @@ -13,7 +13,7 @@ if (!empty($_GET['subscription_id'])) { - <?php echo __("Stripe Subscription"); ?> :: <?php echo $config->getWebSiteTitle(); ?> + <?php echo __("Stripe Subscription") . $config->getPageTitleSeparator() . $config->getWebSiteTitle(); ?> diff --git a/plugin/TopMenu/index.php b/plugin/TopMenu/index.php index ca7e46a025..17c82fa900 100644 --- a/plugin/TopMenu/index.php +++ b/plugin/TopMenu/index.php @@ -9,7 +9,7 @@ $url = $menuItem->getUrl(); - <?php echo $menuItem->getTitle(); ?> :: <?php echo $config->getWebSiteTitle(); ?> + <?php echo $menuItem->getTitle() . $config->getPageTitleSeparator() . $config->getWebSiteTitle(); ?> diff --git a/plugin/TopMenu/page/editor.php b/plugin/TopMenu/page/editor.php index 51527220fe..72b552ab1d 100644 --- a/plugin/TopMenu/page/editor.php +++ b/plugin/TopMenu/page/editor.php @@ -17,7 +17,7 @@ $groups = UserGroups::getAllUsersGroups(); - <?php echo __("Top Menu"); ?> :: <?php echo $config->getWebSiteTitle(); ?> + <?php echo __("Top Menu") . $config->getPageTitleSeparator() . $config->getWebSiteTitle(); ?> diff --git a/plugin/VideoLogoOverlay/page/editor.php b/plugin/VideoLogoOverlay/page/editor.php index b8b4a96011..eae47f57a4 100644 --- a/plugin/VideoLogoOverlay/page/editor.php +++ b/plugin/VideoLogoOverlay/page/editor.php @@ -10,7 +10,7 @@ $o = AVideoPlugin::getObjectData("VideoLogoOverlay"); - <?php echo __("Customize"); ?> :: <?php echo $config->getWebSiteTitle(); ?> + <?php echo __("Customize") . $config->getPageTitleSeparator() . $config->getWebSiteTitle(); ?> diff --git a/plugin/VideoTags/index.php b/plugin/VideoTags/index.php index 49ec09e969..87b56f2c4f 100644 --- a/plugin/VideoTags/index.php +++ b/plugin/VideoTags/index.php @@ -12,7 +12,7 @@ if (!User::isAdmin()) { - <?php echo __("Tags"); ?> :: <?php echo $config->getWebSiteTitle(); ?> + <?php echo __("Tags") . $config->getPageTitleSeparator() . $config->getWebSiteTitle(); ?> diff --git a/plugin/WWBN/page/info.php b/plugin/WWBN/page/info.php index 989fdaa652..511ed279e2 100644 --- a/plugin/WWBN/page/info.php +++ b/plugin/WWBN/page/info.php @@ -17,7 +17,7 @@ if(empty($obj)){ - <?php echo __("WWBN"); ?> :: <?php echo $config->getWebSiteTitle(); ?> + <?php echo __("WWBN") . $config->getPageTitleSeparator() . $config->getWebSiteTitle(); ?> diff --git a/plugin/WWBN/page/wwbn_signup.php b/plugin/WWBN/page/wwbn_signup.php index 396ddddca9..2dcb17550f 100644 --- a/plugin/WWBN/page/wwbn_signup.php +++ b/plugin/WWBN/page/wwbn_signup.php @@ -13,7 +13,7 @@ if(empty($obj)){ - <?php echo __("WWBN"); ?> :: <?php echo $config->getWebSiteTitle(); ?> + <?php echo __("WWBN") . $config->getPageTitleSeparator() . $config->getWebSiteTitle(); ?> diff --git a/plugin/YPTWallet/view/addFunds.php b/plugin/YPTWallet/view/addFunds.php index e87ccf42cd..44e9dfa60d 100644 --- a/plugin/YPTWallet/view/addFunds.php +++ b/plugin/YPTWallet/view/addFunds.php @@ -17,7 +17,7 @@ unset($_SESSION['addFunds_Fail']); - <?php echo __("Add Funds"); ?> :: <?php echo $config->getWebSiteTitle(); ?> + <?php echo __("Add Funds") . $config->getPageTitleSeparator() . $config->getWebSiteTitle(); ?> diff --git a/plugin/YPTWallet/view/adminManageWallets.php b/plugin/YPTWallet/view/adminManageWallets.php index fbf1507419..18340ae6a5 100644 --- a/plugin/YPTWallet/view/adminManageWallets.php +++ b/plugin/YPTWallet/view/adminManageWallets.php @@ -14,7 +14,7 @@ $obj = $plugin->getDataObject(); - <?php echo __("Support Author"); ?> :: <?php echo $config->getWebSiteTitle(); ?> + <?php echo __("Support Author") . $config->getPageTitleSeparator() . $config->getWebSiteTitle(); ?> diff --git a/plugin/YPTWallet/view/configuration.php b/plugin/YPTWallet/view/configuration.php index 59f80e8b96..8978e42c0c 100644 --- a/plugin/YPTWallet/view/configuration.php +++ b/plugin/YPTWallet/view/configuration.php @@ -16,7 +16,7 @@ $wallet->setUsers_id(User::getId()); - <?php echo __("Configuration"); ?> :: <?php echo $config->getWebSiteTitle(); ?> + <?php echo __("Configuration") . $config->getPageTitleSeparator() . $config->getWebSiteTitle(); ?> diff --git a/plugin/YPTWallet/view/history.php b/plugin/YPTWallet/view/history.php index 200cfb3b49..5ae68a85d2 100644 --- a/plugin/YPTWallet/view/history.php +++ b/plugin/YPTWallet/view/history.php @@ -18,7 +18,7 @@ if (!empty($_GET['users_id'])) { - <?php echo __("History"); ?> :: <?php echo $config->getWebSiteTitle(); ?> + <?php echo __("History") . $config->getPageTitleSeparator() . $config->getWebSiteTitle(); ?> diff --git a/plugin/YPTWallet/view/manualAddFunds.php b/plugin/YPTWallet/view/manualAddFunds.php index 469534ba40..5b29706047 100644 --- a/plugin/YPTWallet/view/manualAddFunds.php +++ b/plugin/YPTWallet/view/manualAddFunds.php @@ -14,7 +14,7 @@ $options = json_decode($obj->addFundsOptions); - <?php echo __("Add Funds"); ?> :: <?php echo $config->getWebSiteTitle(); ?> + <?php echo __("Add Funds") . $config->getPageTitleSeparator() . $config->getWebSiteTitle(); ?> diff --git a/plugin/YPTWallet/view/manualWithdrawFunds.php b/plugin/YPTWallet/view/manualWithdrawFunds.php index 4964320d7d..125355f034 100644 --- a/plugin/YPTWallet/view/manualWithdrawFunds.php +++ b/plugin/YPTWallet/view/manualWithdrawFunds.php @@ -14,7 +14,7 @@ $options = json_decode($obj->withdrawFundsOptions); - <?php echo __("Withdraw Funds"); ?> :: <?php echo $config->getWebSiteTitle(); ?> + <?php echo __("Withdraw Funds") . $config->getPageTitleSeparator() . $config->getWebSiteTitle(); ?> diff --git a/plugin/YPTWallet/view/pendingRequests.php b/plugin/YPTWallet/view/pendingRequests.php index ee32b47fea..afedf44281 100644 --- a/plugin/YPTWallet/view/pendingRequests.php +++ b/plugin/YPTWallet/view/pendingRequests.php @@ -11,7 +11,7 @@ if (!User::isAdmin()) { - <?php echo __("Pending Requests"); ?> :: <?php echo $config->getWebSiteTitle(); ?> + <?php echo __("Pending Requests") . $config->getPageTitleSeparator() . $config->getWebSiteTitle(); ?> diff --git a/plugin/YPTWallet/view/transferFunds.php b/plugin/YPTWallet/view/transferFunds.php index 33281ed49b..b76b8a0363 100644 --- a/plugin/YPTWallet/view/transferFunds.php +++ b/plugin/YPTWallet/view/transferFunds.php @@ -12,7 +12,7 @@ $obj = AVideoPlugin::getObjectDataIfEnabled("YPTWallet"); - <?php echo __("Transfer Funds"); ?> :: <?php echo $config->getWebSiteTitle(); ?> + <?php echo __("Transfer Funds") . $config->getPageTitleSeparator() . $config->getWebSiteTitle(); ?> diff --git a/view/about.php b/view/about.php index d235077fc3..236d554b38 100644 --- a/view/about.php +++ b/view/about.php @@ -8,7 +8,7 @@ $metaDescription = "About Page"; - <?php echo __("About") . getSEOComplement(); ?> :: <?php echo $config->getWebSiteTitle(); ?> + <?php echo __("About") . getSEOComplement() . $config->getPageTitleSeparator() . $config->getWebSiteTitle(); ?> diff --git a/view/channel.php b/view/channel.php index 292737fa87..279862ec88 100644 --- a/view/channel.php +++ b/view/channel.php @@ -29,7 +29,7 @@ $metaDescription = " Channel - {$_GET['channelName']}"; - <?php echo @$_GET['channelName'].getSEOComplement(); ?> :: <?php echo __("Channel"); ?> :: <?php echo $config->getWebSiteTitle(); ?> + <?php echo @$_GET['channelName'] . getSEOComplement() . $config->getPageTitleSeparator() . __("Channel") . $config->getPageTitleSeparator() . $config->getWebSiteTitle(); ?> - <?php echo __("Program"); ?> :: <?php echo $config->getWebSiteTitle(); ?> + <?php echo __("Program") . $config->getPageTitleSeparator() . $config->getWebSiteTitle(); ?> diff --git a/view/channels.php b/view/channels.php index c60bef246b..2d0c64a061 100644 --- a/view/channels.php +++ b/view/channels.php @@ -33,7 +33,7 @@ $metaDescription = __("Channels"); - <?php echo __("Channels") . getSEOComplement(); ?> :: <?php echo $config->getWebSiteTitle(); ?> + <?php echo __("Channels") . getSEOComplement() . $config->getPageTitleSeparator() . $config->getWebSiteTitle(); ?> diff --git a/view/charts.php b/view/charts.php index edf8daef6e..e3b6d4a756 100644 --- a/view/charts.php +++ b/view/charts.php @@ -8,7 +8,7 @@ if(!isset($global['systemRootPath'])){ - <?php echo __("Dashboard"); ?> :: <?php echo $config->getWebSiteTitle(); ?> + <?php echo __("Dashboard") . $config->getPageTitleSeparator() . $config->getWebSiteTitle(); ?> - <?php echo __("Configuration"); ?> :: <?php echo $config->getWebSiteTitle(); ?> + <?php echo __("Configuration") . $config->getPageTitleSeparator() . $config->getWebSiteTitle(); ?> - <?php echo __("Contact"); ?> :: <?php echo $config->getWebSiteTitle(); ?> + <?php echo __("Contact") . $config->getPageTitleSeparator() . $config->getWebSiteTitle(); ?> diff --git a/view/downloadExternalVideo.php b/view/downloadExternalVideo.php index 9231fdaa7b..0d9fa386e2 100644 --- a/view/downloadExternalVideo.php +++ b/view/downloadExternalVideo.php @@ -16,7 +16,7 @@ function isYoutubeDl() { - <?php echo __("User"); ?> :: <?php echo $config->getWebSiteTitle(); ?> + <?php echo __("User") . $config->getPageTitleSeparator() . $config->getWebSiteTitle(); ?> diff --git a/view/forbiddenPage.php b/view/forbiddenPage.php index 36cd996c79..2e229d1c3c 100644 --- a/view/forbiddenPage.php +++ b/view/forbiddenPage.php @@ -6,7 +6,7 @@ $global['isForbidden'] = true; - <?php echo __("Forbidden"); ?> :: <?php echo $config->getWebSiteTitle(); ?> + <?php echo __("Forbidden") . $config->getPageTitleSeparator() . $config->getWebSiteTitle(); ?> diff --git a/view/help.php b/view/help.php index 465caa851e..6a55005505 100644 --- a/view/help.php +++ b/view/help.php @@ -8,7 +8,7 @@ require_once $global['systemRootPath'] . 'plugin/AVideoPlugin.php'; - <?php echo __("Help"); ?> :: <?php echo $config->getWebSiteTitle(); ?> + <?php echo __("Help") . $config->getPageTitleSeparator() . $config->getWebSiteTitle(); ?> diff --git a/view/iframe.php b/view/iframe.php index fa86236907..9a58582656 100644 --- a/view/iframe.php +++ b/view/iframe.php @@ -63,7 +63,7 @@ if(empty($iframeURL)){ - <?php echo $titleTag . " :: " . $config->getWebSiteTitle(); ?> + <?php echo $titleTag . $config->getPageTitleSeparator() . $config->getWebSiteTitle(); ?> diff --git a/view/import.php b/view/import.php index 1c9821e1d6..53ea839529 100644 --- a/view/import.php +++ b/view/import.php @@ -10,7 +10,7 @@ if (!User::canUpload() || !empty($advancedCustom->doNotShowImportMP4Button)) { - <?php echo __("Import"); ?> :: <?php echo $config->getWebSiteTitle(); ?> + <?php echo __("Import") . $config->getPageTitleSeparator() . $config->getWebSiteTitle(); ?> diff --git a/view/logs.php b/view/logs.php index 9dece48fb7..8894842911 100644 --- a/view/logs.php +++ b/view/logs.php @@ -129,7 +129,7 @@ $outputText .= $collapsibleClose; - <?php echo __("Logs") . " " . date("Y-M-d H:i:s"); ?> :: <?php echo $config->getWebSiteTitle(); ?> + <?php echo __("Logs") . " " . date("Y-M-d H:i:s") . $config->getPageTitleSeparator() . $config->getWebSiteTitle(); ?>