If the video comes from the channel it will keep showing the channel videos

objects/video.php

@@ -562,6 +562,10 @@ if (!class_exists('Video')) {
                 $sql .= " AND c.clean_name = '{$_GET['catName']}'";
             }
             
+            if (!empty($_GET['channelName'])) {
+                $user = User::getChannelOwner($_GET['channelName']);
+                $sql .= " AND v.users_id = {$user['id']} ";
+            }
 
             if (!empty($_GET['search'])) {
                 $_POST['searchPhrase'] = $_GET['search'];
@@ -700,6 +704,11 @@ if (!class_exists('Video')) {
                 $sql .= " AND (c.clean_name = '{$_GET['catName']}' OR c.parentId IN (SELECT cs.id from categories cs where cs.clean_name = '{$_GET['catName']}' ))";
             }
             
+            if (!empty($_GET['channelName'])) {
+                $user = User::getChannelOwner($_GET['channelName']);
+                $sql .= " AND v.users_id = {$user['id']} ";
+            }
+
             if (!empty($_GET['search'])) {
                 $_POST['searchPhrase'] = $_GET['search'];
             }
@@ -779,6 +788,13 @@ if (!class_exists('Video')) {
             } elseif (!empty($status)) {
                 $sql .= " AND v.status = '{$status}'";
             }
+            
+            
+            if (!empty($_GET['channelName'])) {
+                $user = User::getChannelOwner($_GET['channelName']);
+                $sql .= " AND v.users_id = {$user['id']} ";
+            }
+            
             $res = sqlDAL::readSql($sql);
             $fullData = sqlDAL::fetchAllAssoc($res);
             sqlDAL::close($res);
@@ -836,6 +852,11 @@ if (!class_exists('Video')) {
                     $sql .= " AND v.type = '{$_SESSION['type']}' ";
                 }
             }
+            
+            if (!empty($_GET['channelName'])) {
+                $user = User::getChannelOwner($_GET['channelName']);
+                $sql .= " AND v.users_id = {$user['id']} ";
+            }
             $sql .= BootGrid::getSqlSearchFromPost(array('v.title', 'v.description', 'c.name'));
             $res = sqlDAL::readSql($sql);
             $numRows = sqlDal::num_rows($res);
@@ -1803,8 +1824,14 @@ if (!class_exists('Video')) {
          * @param type $type URLFriendly or permalink
          * @return String a web link
          */
-        static function getLinkToVideo($videos_id, $clean_title = "", $embed = false, $type = "URLFriendly") {
+        static function getLinkToVideo($videos_id, $clean_title = "", $embed = false, $type = "URLFriendly", $get = array()) {
             global $global;
+            $get_http = http_build_query($get);
+            if(empty($get_http)){
+                $get_http = "";
+            }else{
+                $get_http = "?{$get_http}";
+            }
             if ($type == "URLFriendly") {
                 $cat = "";
                 if (!empty($_GET['catName'])) {
@@ -1815,39 +1842,39 @@ if (!class_exists('Video')) {
                     $clean_title = self::get_clean_title($videos_id);
                 }
                 if ($embed) {
-                    return "{$global['webSiteRootURL']}videoEmbed/{$clean_title}";
+                    return "{$global['webSiteRootURL']}videoEmbed/{$clean_title}{$get_http}";
                 } else {
-                    return "{$global['webSiteRootURL']}{$cat}video/{$clean_title}";
+                    return "{$global['webSiteRootURL']}{$cat}video/{$clean_title}{$get_http}";
                 }
             } else {
                 if (empty($videos_id) && !empty($clean_title)) {
                     $videos_id = self::get_id_from_clean_title($clean_title);
                 }
                 if ($embed) {
-                    return "{$global['webSiteRootURL']}vEmbed/{$videos_id}";
+                    return "{$global['webSiteRootURL']}vEmbed/{$videos_id}{$get_http}";
                 } else {
-                    return "{$global['webSiteRootURL']}v/{$videos_id}";
+                    return "{$global['webSiteRootURL']}v/{$videos_id}{$get_http}";
                 }
             }
         }
 
-        static function getPermaLink($videos_id, $embed = false) {
+        static function getPermaLink($videos_id, $embed = false, $get = array()) {
-            return self::getLinkToVideo($videos_id, "", $embed, "permalink");
+            return self::getLinkToVideo($videos_id, "", $embed, "permalink", $get);
         }
 
-        static function getURLFriendly($videos_id, $embed = false) {
+        static function getURLFriendly($videos_id, $embed = false, $get = array()) {
-            return self::getLinkToVideo($videos_id, "", $embed, "URLFriendly");
+            return self::getLinkToVideo($videos_id, "", $embed, "URLFriendly", $get);
         }
 
-        static function getPermaLinkFromCleanTitle($clean_title, $embed = false) {
+        static function getPermaLinkFromCleanTitle($clean_title, $embed = false, $get = array()) {
-            return self::getLinkToVideo("", $clean_title, $embed, "permalink");
+            return self::getLinkToVideo("", $clean_title, $embed, "permalink", $get);
         }
 
-        static function getURLFriendlyFromCleanTitle($clean_title, $embed = false) {
+        static function getURLFriendlyFromCleanTitle($clean_title, $embed = false, $get = array()) { 
-            return self::getLinkToVideo("", $clean_title, $embed, "URLFriendly");
+            return self::getLinkToVideo("", $clean_title, $embed, "URLFriendly", $get);
         }
 
-        static function getLink($videos_id, $clean_title, $embed = false) {
+        static function getLink($videos_id, $clean_title, $embed = false, $get = array()) {
             global $advancedCustom;
             if (!empty($advancedCustom->usePermalinks)) {
                 $type = "permalink";
@@ -1855,7 +1882,7 @@ if (!class_exists('Video')) {
                 $type = "URLFriendly";
             }
 
-            return self::getLinkToVideo($videos_id, $clean_title, $embed, $type);
+            return self::getLinkToVideo($videos_id, $clean_title, $embed, $type, $get);
         }
 
         static function getTotalVideosThumbsUpFromUser($users_id, $startDate, $endDate) {

plugin/Gallery/functions.php

@@ -106,7 +106,7 @@ function createOrderInfo($getName, $mostWord, $lessWord, $orderString) {
     return array($tmpOrderString, $upDown, $mostLess);
 }
 
-function createGallerySection($videos, $crc = "") {
+function createGallerySection($videos, $crc = "", $get = array()) {
     global $global, $config, $obj, $advancedCustom;
     $countCols = 0;
 
@@ -121,7 +121,7 @@ function createGallerySection($videos, $crc = "") {
         $countCols ++;
         ?>
         <div class="col-lg-2 col-md-4 col-sm-4 col-xs-6 galleryVideo thumbsImage fixPadding" style="z-index: 2; min-height: 175px;">
-            <a class="galleryLink" videos_id="<?php echo $value['id']; ?>" href="<?php echo Video::getLink($value['id'], $value['clean_title']); ?>" title="<?php echo $value['title']; ?>">
+            <a class="galleryLink" videos_id="<?php echo $value['id']; ?>" href="<?php echo Video::getLink($value['id'], $value['clean_title'], false, $get); ?>" title="<?php echo $value['title']; ?>">
                 <?php
                 $images = Video::getImageFromFilename($value['filename'], $value['type']);
                 $imgGif = $images->thumbsGif;
@@ -135,7 +135,7 @@ function createGallerySection($videos, $crc = "") {
                 </div>
                 <span class="duration"><?php echo Video::getCleanDuration($value['duration']); ?></span>
             </a>
-            <a class="h6 galleryLink" videos_id="<?php echo $value['id']; ?>" href="<?php echo Video::getLink($value['id'], $value['clean_title']); ?>" title="<?php echo $value['title']; ?>">
+            <a class="h6 galleryLink" videos_id="<?php echo $value['id']; ?>" href="<?php echo Video::getLink($value['id'], $value['clean_title'], false, $get); ?>" title="<?php echo $value['title']; ?>">
                 <h2><?php echo $value['title']; ?></h2>
             </a>
 

plugin/Gallery/view/BigVideo.php

@@ -1,11 +1,14 @@
 <?php
 if ($obj->BigVideo && empty($_GET['showOnly'])) {
     $name = User::getNameIdentificationById($video['users_id']);
+    if(empty($get)){
+        $get = array();
+    }
     ?>
     <div class="clear clearfix">
         <div class="row thumbsImage">
             <div class="col-sm-6">
-                <a class="galleryLink" videos_id="<?php echo $video['id']; ?>" href="<?php echo Video::getLink($video['id'], $video['clean_title']); ?>" title="<?php echo $video['title']; ?>" style="">
+                <a class="galleryLink" videos_id="<?php echo $video['id']; ?>" href="<?php echo Video::getLink($video['id'], $video['clean_title'], false, $get); ?>" title="<?php echo $video['title']; ?>" style="">
                     <?php
                     $images = Video::getImageFromFilename($video['filename'], $video['type']);
                     $imgGif = $images->thumbsGif;
@@ -21,7 +24,7 @@ if ($obj->BigVideo && empty($_GET['showOnly'])) {
                 </a>
             </div>
             <div class="col-sm-6">
-                <a class="h6 galleryLink" videos_id="<?php echo $video['id']; ?>" href="<?php echo Video::getLink($video['id'], $video['clean_title']); ?>" title="<?php echo $video['title']; ?>">
+                <a class="h6 galleryLink" videos_id="<?php echo $video['id']; ?>" href="<?php echo Video::getLink($video['id'], $video['clean_title'], false, $get); ?>" title="<?php echo $video['title']; ?>">
                     <h1><?php echo $video['title']; ?></h1>
                 </a>
                 <div class="mainAreaDescriptionContainer">
@@ -30,7 +33,7 @@ if ($obj->BigVideo && empty($_GET['showOnly'])) {
                 <div class="text-muted galeryDetails">
                     <div>
                             <?php if (empty($_GET['catName'])) { ?>
-                            <a class="label label-default" href="<?php echo Video::getLink($video['id'], $video['clean_title']); ?>/">
+                            <a class="label label-default" href="<?php echo Video::getLink($video['id'], $video['clean_title'], false, $get); ?>/">
                                 <?php
                                 if (!empty($video['iconClass'])) {
                                     ?>