https://github.com/WWBN/AVideo/issues/9395

WWBN · Sep 11, 2024 · bd6b3b0 · bd6b3b0
1 parent 76211c1
commit bd6b3b0
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 6 deletions.
diff --git a/objects/functionCountDownPage.php b/objects/functionCountDownPage.php
@@ -25,7 +25,9 @@
             .p-b-9 {padding-bottom: 9px;}
             .p-b-45 {padding-bottom: 45px;}
             .p-b-60 {padding-bottom: 60px;}
+            .p-l-50 {padding-left: 50px;}
             .p-l-75 {padding-left: 75px;}
+            .p-r-50 {padding-right: 50px;}
             .p-r-75 {padding-right: 75px;}
 
             .m-t-15 {margin-top: 15px;}
@@ -595,7 +597,7 @@
                 }
                 ?>
             </div>
-            <div class="size3 flex-col-sb flex-w p-l-75 p-r-75 p-t-20 p-b-45 respon1">
+            <div class="size3 flex-col-sb flex-w p-l-50 p-r-50 p-t-20 p-b-45 respon1">
 
                 <div class="p-t-20 p-b-60">
                     <div class="wrap-pic1">

diff --git a/objects/functiongetShareMenu.php b/objects/functiongetShareMenu.php
@@ -1,4 +1,5 @@
 <?php
+global $global, $advancedCustom;
 $objSecure = AVideoPlugin::getObjectDataIfEnabled('SecureVideosDirectory');
 $search = ['{permaLink}', '{imgSRC}', '{title}', '{embedURL}', '{videoLengthInSeconds}'];
 $replace = [$permaLink, $img, $title, $embedURL, $videoLengthInSeconds];

diff --git a/objects/functions.php b/objects/functions.php
@@ -4327,9 +4327,34 @@ function getSEOTitle($text, $maxChars = 120)
 function getShareMenu($title, $permaLink, $URLFriendly, $embedURL, $img, $class = "row bgWhite list-group-item menusDiv", $videoLengthInSeconds = 0, $bitLyLink = '')
 {
     global $global, $advancedCustom;
-    include $global['systemRootPath'] . 'objects/functiongetShareMenu.php';
+
+    $varsArray = array(
+        'title' => $title,
+        'permaLink' => $permaLink,
+        'URLFriendly' => $URLFriendly,
+        'embedURL' => $embedURL,
+        'img' => $img,
+        'class' => $class,
+        'videoLengthInSeconds' => $videoLengthInSeconds,
+        'bitLyLink' => $bitLyLink,
+    );
+    return getIncludeFileContent($global['systemRootPath'] . 'objects/functiongetShareMenu.php', $varsArray);
+    //include $global['systemRootPath'] . 'objects/functiongetShareMenu.php';
 }
 
+function getShareSocialIcons($title, $url)
+{
+    global $global;
+
+    $varsArray = array(
+        'title' => $title,
+        'url' => $url,
+    );
+    return getIncludeFileContent($global['systemRootPath'] . 'view/include/social.php', $varsArray);
+    //include $global['systemRootPath'] . 'objects/functiongetShareMenu.php';
+}
+
+
 function getCaptcha($uid = "", $forceCaptcha = false)
 {
     global $global;

diff --git a/plugin/Live/view/modeYoutubeLive.php b/plugin/Live/view/modeYoutubeLive.php
@@ -221,7 +221,7 @@
                         $link = addQueryStringParameter($link, 'live_schedule', intval($_REQUEST['live_schedule']));
                     }
                     if (isShareEnabled()) {
-                        getShareMenu($liveTitle, $link, $link, addQueryStringParameter($link, 'embed', 1), $img, "row bgWhite list-group-item menusDiv");
+                        echo getShareMenu($liveTitle, $link, $link, addQueryStringParameter($link, 'embed', 1), $img, "row bgWhite list-group-item menusDiv");
                     }
                     ?>
                     <div class="row">

diff --git a/plugin/LiveLinks/view/Live.php b/plugin/LiveLinks/view/Live.php
@@ -44,7 +44,11 @@
 }
 
 if ($toTime > time()) {
-    $message = "<strong>{$t['title']}</strong><br>{$t['description']}";
+    $link = LiveLinks::getLinkToLiveFromId($_GET['link']);
+    //$linkEmbed = LiveLinks::getLinkToLiveFromId($_GET['link'], true);
+    //$share = getShareMenu($t['title'], $link, $link, $linkEmbed, $img, "row");
+    $share = getShareSocialIcons($t['title'], $link);
+    $message = "<strong>{$t['title']}</strong><div>{$share}</div>{$t['description']}";
     $image = User::getPhoto($t['users_id']);
     $bgImage = LiveLinks::getImage($t['id']);
     $title = $t['title'];
@@ -180,7 +184,7 @@
                          */
                         $link = LiveLinks::getLinkToLiveFromId($_GET['link']);
                         $linkEmbed = LiveLinks::getLinkToLiveFromId($_GET['link'], true);
-                        getShareMenu($t['title'], $link, $link, $linkEmbed, $img, "row");
+                        echo getShareMenu($t['title'], $link, $link, $linkEmbed, $img, "row");
                     }
                     ?>
                     <div class="row">

diff --git a/view/modeYoutubeBottom.php b/view/modeYoutubeBottom.php
@@ -333,7 +333,7 @@
                 $bitLyLink = BitLy::getLink($video['id']);
             }
 
-            getShareMenu($video['title'], Video::getPermaLink($video['id']), Video::getURLFriendly($video['id']), Video::getLink($video['id'], $video['clean_title'], true), $img, "row bgWhite list-group-item menusDiv", parseDurationToSeconds($video['duration']), $bitLyLink);
+            echo getShareMenu($video['title'], Video::getPermaLink($video['id']), Video::getURLFriendly($video['id']), Video::getLink($video['id'], $video['clean_title'], true), $img, "row bgWhite list-group-item menusDiv", parseDurationToSeconds($video['duration']), $bitLyLink);
         }
         ?>
     </div>