diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 diff --git a/objects/video.php b/objects/video.php index a9cf5c7484..722093ad57 100644 --- a/objects/video.php +++ b/objects/video.php @@ -561,7 +561,11 @@ if (!class_exists('Video')) { if (!empty($_GET['catName'])) { $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']; @@ -699,6 +703,11 @@ if (!class_exists('Video')) { if (!empty($_GET['catName'])) { $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) { - return self::getLinkToVideo($videos_id, "", $embed, "permalink"); + static function getPermaLink($videos_id, $embed = false, $get = array()) { + return self::getLinkToVideo($videos_id, "", $embed, "permalink", $get); } - static function getURLFriendly($videos_id, $embed = false) { - return self::getLinkToVideo($videos_id, "", $embed, "URLFriendly"); + static function getURLFriendly($videos_id, $embed = false, $get = array()) { + return self::getLinkToVideo($videos_id, "", $embed, "URLFriendly", $get); } - static function getPermaLinkFromCleanTitle($clean_title, $embed = false) { - return self::getLinkToVideo("", $clean_title, $embed, "permalink"); + static function getPermaLinkFromCleanTitle($clean_title, $embed = false, $get = array()) { + return self::getLinkToVideo("", $clean_title, $embed, "permalink", $get); } - static function getURLFriendlyFromCleanTitle($clean_title, $embed = false) { - return self::getLinkToVideo("", $clean_title, $embed, "URLFriendly"); + static function getURLFriendlyFromCleanTitle($clean_title, $embed = false, $get = array()) { + 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) { diff --git a/plugin/AD_Server/AD_Server.php b/plugin/AD_Server/AD_Server.php old mode 100644 new mode 100755 diff --git a/plugin/AD_Server/Objects/VastCampaigns.php b/plugin/AD_Server/Objects/VastCampaigns.php old mode 100644 new mode 100755 diff --git a/plugin/AD_Server/Objects/VastCampaignsLogs.php b/plugin/AD_Server/Objects/VastCampaignsLogs.php old mode 100644 new mode 100755 diff --git a/plugin/AD_Server/Objects/VastCampaignsVideos.php b/plugin/AD_Server/Objects/VastCampaignsVideos.php old mode 100644 new mode 100755 diff --git a/plugin/AD_Server/VAST.php b/plugin/AD_Server/VAST.php old mode 100644 new mode 100755 diff --git a/plugin/AD_Server/VMAP.php b/plugin/AD_Server/VMAP.php old mode 100644 new mode 100755 diff --git a/plugin/AD_Server/footer.php b/plugin/AD_Server/footer.php old mode 100644 new mode 100755 diff --git a/plugin/AD_Server/index.php b/plugin/AD_Server/index.php old mode 100644 new mode 100755 diff --git a/plugin/AD_Server/install/install.sql b/plugin/AD_Server/install/install.sql old mode 100644 new mode 100755 diff --git a/plugin/AD_Server/log.php b/plugin/AD_Server/log.php old mode 100644 new mode 100755 diff --git a/plugin/AD_Server/pluginMenu.html b/plugin/AD_Server/pluginMenu.html old mode 100644 new mode 100755 diff --git a/plugin/AD_Server/videojs-ima/videojs.ima.css b/plugin/AD_Server/videojs-ima/videojs.ima.css old mode 100644 new mode 100755 diff --git a/plugin/AD_Server/videojs-ima/videojs.ima.js b/plugin/AD_Server/videojs-ima/videojs.ima.js old mode 100644 new mode 100755 diff --git a/plugin/AD_Server/videojs-ima/videojs.ima.min.js b/plugin/AD_Server/videojs-ima/videojs.ima.min.js old mode 100644 new mode 100755 diff --git a/plugin/AD_Server/videojs-ima/videojs.ima.scss b/plugin/AD_Server/videojs-ima/videojs.ima.scss old mode 100644 new mode 100755 diff --git a/plugin/AD_Server/videojs-markers/videojs-markers.js b/plugin/AD_Server/videojs-markers/videojs-markers.js old mode 100644 new mode 100755 diff --git a/plugin/AD_Server/videojs-markers/videojs-markers.js.map b/plugin/AD_Server/videojs-markers/videojs-markers.js.map old mode 100644 new mode 100755 diff --git a/plugin/AD_Server/videojs-markers/videojs-markers.min.js b/plugin/AD_Server/videojs-markers/videojs-markers.min.js old mode 100644 new mode 100755 diff --git a/plugin/AD_Server/videojs-markers/videojs.markers.css b/plugin/AD_Server/videojs-markers/videojs.markers.css old mode 100644 new mode 100755 diff --git a/plugin/AD_Server/videojs-markers/videojs.markers.min.css b/plugin/AD_Server/videojs-markers/videojs.markers.min.css old mode 100644 new mode 100755 diff --git a/plugin/AD_Server/view/addCampaign.php b/plugin/AD_Server/view/addCampaign.php old mode 100644 new mode 100755 diff --git a/plugin/AD_Server/view/addCampaignVideo.php b/plugin/AD_Server/view/addCampaignVideo.php old mode 100644 new mode 100755 diff --git a/plugin/AD_Server/view/campaigns.json.php b/plugin/AD_Server/view/campaigns.json.php old mode 100644 new mode 100755 diff --git a/plugin/AD_Server/view/campaignsVideos.json.php b/plugin/AD_Server/view/campaignsVideos.json.php old mode 100644 new mode 100755 diff --git a/plugin/AD_Server/view/deleteCampaign.json.php b/plugin/AD_Server/view/deleteCampaign.json.php old mode 100644 new mode 100755 diff --git a/plugin/AD_Server/view/deleteCampaignVideo.json.php b/plugin/AD_Server/view/deleteCampaignVideo.json.php old mode 100644 new mode 100755 diff --git a/plugin/AD_Server_Location/AD_Server_Location.php b/plugin/AD_Server_Location/AD_Server_Location.php old mode 100644 new mode 100755 diff --git a/plugin/AD_Server_Location/Objects/CampaignLocations.php b/plugin/AD_Server_Location/Objects/CampaignLocations.php old mode 100644 new mode 100755 diff --git a/plugin/AD_Server_Location/campaignPanel.php b/plugin/AD_Server_Location/campaignPanel.php old mode 100644 new mode 100755 diff --git a/plugin/AD_Server_Location/install/install.sql b/plugin/AD_Server_Location/install/install.sql old mode 100644 new mode 100755 diff --git a/plugin/Audit/Audit.php b/plugin/Audit/Audit.php old mode 100644 new mode 100755 diff --git a/plugin/Audit/Objects/AuditTable.php b/plugin/Audit/Objects/AuditTable.php old mode 100644 new mode 100755 diff --git a/plugin/Audit/install/audit.mwb b/plugin/Audit/install/audit.mwb old mode 100644 new mode 100755 diff --git a/plugin/Audit/install/audit.mwb.bak b/plugin/Audit/install/audit.mwb.bak old mode 100644 new mode 100755 diff --git a/plugin/Audit/install/install.sql b/plugin/Audit/install/install.sql old mode 100644 new mode 100755 diff --git a/plugin/Audit/page/audits.json.php b/plugin/Audit/page/audits.json.php old mode 100644 new mode 100755 diff --git a/plugin/Audit/page/editor.php b/plugin/Audit/page/editor.php old mode 100644 new mode 100755 diff --git a/plugin/Audit/pluginMenu.html b/plugin/Audit/pluginMenu.html old mode 100644 new mode 100755 diff --git a/plugin/Cache/Cache.php b/plugin/Cache/Cache.php old mode 100644 new mode 100755 diff --git a/plugin/CloneSite/CloneLog.php b/plugin/CloneSite/CloneLog.php old mode 100644 new mode 100755 diff --git a/plugin/CloneSite/CloneSite.php b/plugin/CloneSite/CloneSite.php old mode 100644 new mode 100755 diff --git a/plugin/CloneSite/Objects/Clones.php b/plugin/CloneSite/Objects/Clones.php old mode 100644 new mode 100755 diff --git a/plugin/CloneSite/Objects/cloneSiteModel.mwb b/plugin/CloneSite/Objects/cloneSiteModel.mwb old mode 100644 new mode 100755 diff --git a/plugin/CloneSite/changeStatus.json.php b/plugin/CloneSite/changeStatus.json.php old mode 100644 new mode 100755 diff --git a/plugin/CloneSite/cloneClient.json.php b/plugin/CloneSite/cloneClient.json.php old mode 100644 new mode 100755 diff --git a/plugin/CloneSite/cloneServer.json.php b/plugin/CloneSite/cloneServer.json.php old mode 100644 new mode 100755 diff --git a/plugin/CloneSite/clones.json.php b/plugin/CloneSite/clones.json.php old mode 100644 new mode 100755 diff --git a/plugin/CloneSite/delete.json.php b/plugin/CloneSite/delete.json.php old mode 100644 new mode 100755 diff --git a/plugin/CloneSite/functions.php b/plugin/CloneSite/functions.php old mode 100644 new mode 100755 diff --git a/plugin/CloneSite/index.php b/plugin/CloneSite/index.php old mode 100644 new mode 100755 diff --git a/plugin/CloneSite/install/install.sql b/plugin/CloneSite/install/install.sql old mode 100644 new mode 100755 diff --git a/plugin/CloneSite/pluginMenu.html b/plugin/CloneSite/pluginMenu.html old mode 100644 new mode 100755 diff --git a/plugin/CookieAlert/CookieAlert.php b/plugin/CookieAlert/CookieAlert.php old mode 100644 new mode 100755 diff --git a/plugin/CookieAlert/cookiealert-standalone.js b/plugin/CookieAlert/cookiealert-standalone.js old mode 100644 new mode 100755 diff --git a/plugin/CookieAlert/cookiealert.css b/plugin/CookieAlert/cookiealert.css old mode 100644 new mode 100755 diff --git a/plugin/CookieAlert/cubes.png b/plugin/CookieAlert/cubes.png old mode 100644 new mode 100755 diff --git a/plugin/CookieAlert/demo.html b/plugin/CookieAlert/demo.html old mode 100644 new mode 100755 diff --git a/plugin/CookieAlert/footer.php b/plugin/CookieAlert/footer.php old mode 100644 new mode 100755 diff --git a/plugin/CustomizeAdvanced/CustomizeAdvanced.php b/plugin/CustomizeAdvanced/CustomizeAdvanced.php old mode 100644 new mode 100755 diff --git a/plugin/CustomizeAdvanced/advancedCustom.json.php b/plugin/CustomizeAdvanced/advancedCustom.json.php old mode 100644 new mode 100755 diff --git a/plugin/FBTube/FBTube.php b/plugin/FBTube/FBTube.php old mode 100644 new mode 100755 diff --git a/plugin/FBTube/view/getVideos.php b/plugin/FBTube/view/getVideos.php old mode 100644 new mode 100755 diff --git a/plugin/FBTube/view/modeFacebook.php b/plugin/FBTube/view/modeFacebook.php old mode 100644 new mode 100755 diff --git a/plugin/FBTube/view/player.css b/plugin/FBTube/view/player.css old mode 100644 new mode 100755 diff --git a/plugin/FBTube/view/style.css b/plugin/FBTube/view/style.css old mode 100644 new mode 100755 diff --git a/plugin/FloatVideo/FloatVideo.php b/plugin/FloatVideo/FloatVideo.php old mode 100644 new mode 100755 diff --git a/plugin/Gallery/Gallery.php b/plugin/Gallery/Gallery.php old mode 100644 new mode 100755 diff --git a/plugin/Gallery/fullscreen.css b/plugin/Gallery/fullscreen.css old mode 100644 new mode 100755 diff --git a/plugin/Gallery/fullscreen.js b/plugin/Gallery/fullscreen.js old mode 100644 new mode 100755 diff --git a/plugin/Gallery/functions.php b/plugin/Gallery/functions.php old mode 100644 new mode 100755 index 3f5fb67f17..0efa2556cc --- a/plugin/Gallery/functions.php +++ b/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 ++; ?>
- + diff --git a/plugin/Gallery/script.js b/plugin/Gallery/script.js old mode 100644 new mode 100755 diff --git a/plugin/Gallery/style.css b/plugin/Gallery/style.css old mode 100644 new mode 100755 diff --git a/plugin/Gallery/view/BigVideo.php b/plugin/Gallery/view/BigVideo.php old mode 100644 new mode 100755 index f397010514..bb3d80053d --- a/plugin/Gallery/view/BigVideo.php +++ b/plugin/Gallery/view/BigVideo.php @@ -1,11 +1,14 @@ BigVideo && empty($_GET['showOnly'])) { $name = User::getNameIdentificationById($video['users_id']); + if(empty($get)){ + $get = array(); + } ?>