From b12e5c300e5a0cd3efe9c9a1765d76af6c5a5bf8 Mon Sep 17 00:00:00 2001 From: DanielnetoDotCom Date: Sat, 23 Jan 2021 00:56:34 -0300 Subject: [PATCH] Improving Sockets --- admin/index.php | 4 +++- locale/index.php | 4 +++- objects/functions.php | 30 ++++++++++++++++++++++++ objects/userRecoverPass.php | 27 ++++++++++----------- plugin/AD_Server/index.php | 4 +++- plugin/API/info.php | 6 +++-- plugin/Audit/page/editor.php | 4 +++- plugin/BlockonomicsYPT/invoice.php | 4 +++- plugin/BulkEmbed/search.php | 4 +++- plugin/CloneSite/index.php | 4 +++- plugin/CombineSites/page/editor.php | 4 +++- plugin/CombineSites/page/modeGallery.php | 6 ++--- plugin/Socket/Message.php | 9 +++---- plugin/Socket/Socket.php | 2 +- plugin/Socket/script.js | 10 ++++---- plugin/Socket/server.php | 2 +- view/js/script.js | 23 ++++++++++++++++-- 17 files changed, 107 insertions(+), 40 deletions(-) diff --git a/admin/index.php b/admin/index.php index d8667a1555..6afef91855 100644 --- a/admin/index.php +++ b/admin/index.php @@ -173,7 +173,9 @@ switch ($_GET['page']) { - <?php echo __("Administration") . $config->getPageTitleSeparator() . $config->getWebSiteTitle(); ?> + - <?php __("Translate AVideo") . $config->getPageTitleSeparator() . $config->getWebSiteTitle(); ?> + getWebSiteTitle(); + + $title = implode($config->getPageTitleSeparator(), $titleArray); + $global['pageTitle'] = $title; + return "{$title}"; +} + +function getTitle(){ + global $global; + if(empty($global['pageTitle'])){ + $url = getSelfURI(); + + $global['pageTitle'] = str_replace($global['webSiteRootURL'], '', $url); + + if(preg_match('/\/plugin\/([^\/])/i', $url, $matches)){ + $global['pageTitle'] = __('Plugin').' '.__($matches[1]); + } + + $title = $global['pageTitle']; + } + + return $global['pageTitle']; } \ No newline at end of file diff --git a/objects/userRecoverPass.php b/objects/userRecoverPass.php index 876bd0dad1..b299493228 100644 --- a/objects/userRecoverPass.php +++ b/objects/userRecoverPass.php @@ -55,19 +55,19 @@ if (!(!empty($_GET['user']) && !empty($_GET['recoverpass']))) { - <?php echo __("Recover Password") . $config->getPageTitleSeparator() . $config->getWebSiteTitle(); ?> + echo getHTMLTitle(__("Recover Password")); + ?> + - +
- getRecoverPass() != $_GET['recoverpass']) { - ?> + getRecoverPass() != $_GET['recoverpass']) { + ?>
- +
- +
@@ -124,14 +122,13 @@ if (!(!empty($_GET['user']) && !empty($_GET['recoverpass']))) { - + - + diff --git a/plugin/Socket/Message.php b/plugin/Socket/Message.php index f6a170adb4..23611d33c4 100644 --- a/plugin/Socket/Message.php +++ b/plugin/Socket/Message.php @@ -22,12 +22,12 @@ class Message implements MessageComponentInterface { global $onMessageSentTo; $onMessageSentTo = array(); $query = $conn->httpRequest->getUri()->getQuery(); - parse_str($query, $wsocketToken); - if (empty($wsocketToken['webSocketToken'])) { + parse_str($query, $wsocketGetVars); + if (empty($wsocketGetVars['webSocketToken'])) { _log_message("Empty websocket token "); return false; } - $json = getDecryptedInfo($wsocketToken['webSocketToken']); + $json = getDecryptedInfo($wsocketGetVars['webSocketToken']); if (empty($json)) { _log_message("Invalid websocket token "); return false; @@ -43,7 +43,8 @@ class Message implements MessageComponentInterface { $client['browser'] = $json->browser; $client['yptDeviceId'] = $json->yptDeviceId; $client['selfURI'] = $json->selfURI; - $client['isCommandLine'] = $wsocketToken['isCommandLine']; + $client['isCommandLine'] = $wsocketGetVars['isCommandLine']; + $client['page_title'] = utf8_encode($wsocketGetVars['page_title']); $client['videos_id'] = $json->videos_id; $client['live_key'] = object_to_array(@$json->live_key); $client['autoEvalCodeOnHTML'] = $json->autoEvalCodeOnHTML; diff --git a/plugin/Socket/Socket.php b/plugin/Socket/Socket.php index 39da73c2d2..455d0abde1 100644 --- a/plugin/Socket/Socket.php +++ b/plugin/Socket/Socket.php @@ -37,7 +37,7 @@ class Socket extends PluginAbstract { } public static function getServerVersion() { - return "2.0"; + return "2.1"; } public function updateScript() { diff --git a/plugin/Socket/script.js b/plugin/Socket/script.js index 5afb20ea3d..aa4cbc824b 100644 --- a/plugin/Socket/script.js +++ b/plugin/Socket/script.js @@ -5,13 +5,15 @@ function socketConnect() { return false; } socketConnectRequested = 1; - console.log('Trying to reconnect on socket...'); - conn = new WebSocket(webSocketURL); + var url = addGetParam(webSocketURL, 'page_title', $(document).find("title").text()); + console.log('Trying to reconnect on socket... ' + url); + conn = new WebSocket(url); conn.onopen = function (e) { console.log("Socket onopen"); return false; }; conn.onmessage = function (e) { + console.log(e.data); var json = JSON.parse(e.data); parseSocketResponse(json); if (json.type == webSocketTypes.ON_VIDEO_MSG) { @@ -90,7 +92,7 @@ function defaultCallback(json) { function parseSocketResponse(json) { console.log("parseSocketResponse", json); if(json.isAdmin && webSocketServerVersion!==json.webSocketServerVersion){ - avideoToast("Please restart your socket server. You are running (v"+json.webSocketServerVersion+") and your client is expecting (v"+webSocketServerVersion+")"); + avideoToastWarning("Please restart your socket server. You are running (v"+json.webSocketServerVersion+") and your client is expecting (v"+webSocketServerVersion+")"); } if (json && typeof json.autoUpdateOnHTML !== 'undefined') { $('.total_on').text(0); @@ -128,7 +130,7 @@ function parseSocketResponse(json) { if (json.users_uri[prop][prop2][prop3] === false || typeof json.users_uri[prop][prop2][prop3] !== 'object') { continue; } - var html = '
IP: ' + json.users_uri[prop][prop2][prop3].ip + ' (' + json.users_uri[prop][prop2][prop3].user_name + ')
' + var html = '
(' + json.users_uri[prop][prop2][prop3].page_title + ') ' + json.users_uri[prop][prop2][prop3].user_name + ' IP: ' + json.users_uri[prop][prop2][prop3].ip + '
' //console.log(json.users_uri[prop]); $('#socketUsersURI').append(html); } diff --git a/plugin/Socket/server.php b/plugin/Socket/server.php index 74857e7715..6f90308ca5 100644 --- a/plugin/Socket/server.php +++ b/plugin/Socket/server.php @@ -24,7 +24,7 @@ _error_log("Starting Socket server at port {$SocketDataObj->port}"); killProcessOnPort(); $scheme = parse_url($global['webSiteRootURL'], PHP_URL_SCHEME); -echo "Starting server on port {$SocketDataObj->port}".PHP_EOL; +echo "Starting AVideo Socket server version {$SocketDataObj->serverVersion} on port {$SocketDataObj->port}".PHP_EOL; if(strtolower($scheme)!=='https'){ echo "Your socket server does NOT use a secure connection".PHP_EOL; diff --git a/view/js/script.js b/view/js/script.js index ebc977c857..7bbac33fb4 100644 --- a/view/js/script.js +++ b/view/js/script.js @@ -677,7 +677,7 @@ function playNext(url) { }); } } else if (isPlayerLoop()) { - $.toast("Looping video"); + avideoToast("Looping video"); userIsControling = false; playerPlayTimeout = setTimeout(function () { playerPlay(currentTime); @@ -861,8 +861,27 @@ function avideoAlert(title, msg, type) { } } +function _avideoToast(msg, icon) { + var options = {text:msg, hideAfter:7000}; + if(icon){ + options.icon = icon; + } + $.toast(options); +} function avideoToast(msg) { - $.toast({text:msg, hideAfter:7000}); + _avideoToast(msg, null); +} +function avideoToastInfo(msg) { + _avideoToast(msg, 'info'); +} +function avideoToastError(msg) { + _avideoToast(msg, 'error'); +} +function avideoToastSuccess(msg) { + _avideoToast(msg, 'success'); +} +function avideoToastWarning(msg) { + _avideoToast(msg, 'warning'); } function avideoAlertAJAXHTML(url) {