Merge pull request #67 from hersche/master

update unstable out of mistake
WWBN · May 7, 2018 · b4ac8f3 · b4ac8f3
2 parents 494298d + d91d92a
commit b4ac8f3
Show file tree

Hide file tree

Showing 11 changed files with 25 additions and 35 deletions.
diff --git a/locale/index.php b/locale/index.php
@@ -51,7 +51,7 @@ function listAll($dir) {
 
     <body>
         <?php
-        include '../view/include/navbar.php';
+        include $global['systemRootPath'].'view/include/navbar.php';
         ?>
         <div class="container-fluid">
 
@@ -111,7 +111,7 @@ function listAll($dir) {
             ?>
         </div><!--/.container-->
         <?php
-        include '../view/include/footer.php';
+        include $global['systemRootPath'].'view/include/footer.php';
         ?>
         <script>
             var arrayLocale = <?php echo json_encode(array_values($vars)); ?>;

diff --git a/plugin/Gallery/view/modeGallery.php b/plugin/Gallery/view/modeGallery.php
@@ -78,7 +78,7 @@
     </head>
 
     <body>
-        <?php include 'include/navbar.php'; ?>
+        <?php include $global['systemRootPath'].'view/include/navbar.php'; ?>
         <div class="container-fluid gallery" itemscope itemtype="http://schema.org/VideoObject">
             <div class="row text-center" style="padding: 10px;">
                 <?php echo $config->getAdsense(); ?>
@@ -176,7 +176,7 @@ function afterExtraVideos($liveLi) {
             </div>
         </div>
     </div>
-    <?php include 'include/footer.php'; ?>
+    <?php include $global['systemRootPath'] . 'view/include/footer.php'; ?>
 </body>
 </html>
 <?php include $global['systemRootPath'] . 'objects/include_end.php'; ?>
diff --git a/plugin/Hotkeys/Hotkeys.php b/plugin/Hotkeys/Hotkeys.php
@@ -37,16 +37,8 @@ public function getTags() {
     public function getFooterCode() {
         global $global;
         $obj = $this->getDataObject();
-
-        $url = $_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'];
-
-        $httpSpacer = 7;
-        if(strpos($global['webSiteRootURL'],"https://")!==false){
-           $httpSpacer = 8;    
-        }
-        $catUrlResult;
-        preg_match("/cat\/(.*)\/video\/(.*)/", $url, $catUrlResult);
-        if((strpos($url,substr($global['webSiteRootURL'],$httpSpacer)."video/")!==false)||(sizeof($catUrlResult)>0)){
+
+        if(!empty($_GET['isMediaPlaySite'])){
             $tmp = "<script src=\"{$global['webSiteRootURL']}plugin/Hotkeys/videojs.hotkeys.min.js\"> </script><script> $( document ).ready(function() {";
             if($_SESSION['type']=="audio"){
                 $tmp .= "videojs('mainAudio').ready(function() {";

diff --git a/plugin/Live/index.php b/plugin/Live/index.php
@@ -5,13 +5,13 @@
 $p = YouPHPTubePlugin::loadPlugin("Live");
 
 if (!empty($_GET['u']) && !empty($_GET['embedv2'])) {
-    include './view/videoEmbededV2.php';
+    include $global['systemRootPath'].'plugin/Live/view/videoEmbededV2.php';
     exit;
 } else if (!empty($_GET['u']) && !empty($_GET['embed'])) {
-    include './view/videoEmbeded.php';
+    include $global['systemRootPath'].'plugin/Live/view/videoEmbeded.php';
     exit;
 } else if (!empty($_GET['u'])) {
-    include './view/modeYoutubeLive.php';
+    include $global['systemRootPath'].'plugin/Live/view/modeYoutubeLive.php';
     exit;
 } else if (!User::canStream()) {
     header("Location: {$global['webSiteRootURL']}?error=" . __("You can not stream live videos"));
@@ -127,7 +127,7 @@
                     <div class="panel-heading">
                         <?php
                         $streamName = $trasnmition['key'];
-                        include './view/onlineLabel.php';
+                        include $global['systemRootPath'].'plugin/Live/view/onlineLabel.php';
                         ?>
                     </div>
                     <div class="panel-body">          

diff --git a/plugin/YouPHPFlix/view/firstPage.php b/plugin/YouPHPFlix/view/firstPage.php
@@ -122,15 +122,15 @@
                             <?php if ((!empty($imgGif)) && (!$o->LiteGalleryNoGifs)) { ?>
                                     <img src="<?php echo $imgGif; ?>" style="position: absolute; top: 0; display: none;" alt="" data-toggle="tooltip" title="<?php echo $description; ?>" id="thumbsGIF<?php echo $value['id']; ?>" class="thumbsGIF img-responsive <?php echo $img_portrait; ?>  rotate<?php echo $value['rotation']; ?>" height="130" />
                         <?php }
-                        $videoCount = $global['mysqli']->query("SELECT COUNT(title) FROM videos WHERE categories_id = " . $value['categories_id'] . ";");
+                        $videoCount = $global['mysqli']->query("SELECT COUNT(title) FROM videos WHERE status='a' AND categories_id = " . $value['categories_id'] . ";");
                         break;
                     }
                 } else {
                     $poster = $global['webSiteRootURL'] . "view/img/notfound.jpg";
                     ?>
 				    <img src="<?php echo $poster; ?>" alt="" data-toggle="tooltip" title="<?php echo $description; ?>" class="thumbsJPG img img-responsive" id="thumbsJPG<?php echo $cat['id']; ?>" />
                     <?php
-                        $videoCount = $global['mysqli']->query("SELECT COUNT(title) FROM videos WHERE categories_id = " . $cat['id'] . ";");
+                        $videoCount = $global['mysqli']->query("SELECT COUNT(title) FROM videos WHERE status='a' AND categories_id = " . $cat['id'] . ";");
                 }
                 ?>
                             </div>
@@ -763,7 +763,7 @@
                                 <img src="<?php echo $imgGif; ?>" style="position: absolute; top: 0; display: none;" alt="" data-toggle="tooltip" title="<?php echo $description; ?>" id="thumbsGIF<?php echo $value['id']; ?>" class="thumbsGIF img-responsive <?php echo $img_portrait; ?>  rotate<?php echo $value['rotation']; ?>" height="130" />
                         <?php
                             }
-                            $videoCount = $global['mysqli']->query("SELECT COUNT(title) FROM videos WHERE categories_id = " . $value['categories_id'] . ";");
+                            $videoCount = $global['mysqli']->query("SELECT COUNT(title) FROM videos WHERE status='a' AND categories_id = " . $value['categories_id'] . ";");
                         ?>
                     </div>
 						<div class="videoInfo">
@@ -829,7 +829,7 @@
                                     <img style="position: absolute; top: 0; display: none;" alt="<?php echo $value['title']; ?>" id="tile__img thumbsGIF<?php echo $value['id']; ?>" class="thumbsGIF img-responsive img carousel-cell-image" data-flickity-lazyload="<?php echo $imgGif; ?>" />
                                     <?php
                                     }
-                                    $videoCount = $global['mysqli']->query("SELECT COUNT(title) FROM videos WHERE categories_id = " . $value['categories_id'] . ";"); ?>
+                                    $videoCount = $global['mysqli']->query("SELECT COUNT(title) FROM videos WHERE status='a' AND categories_id = " . $value['categories_id'] . ";"); ?>
                                 </div>
                                 <div class="">
                                     <div class="videoInfo">
@@ -891,7 +891,7 @@
             </a>
             <?php } ?>
         </div>        
-        <?php include 'include/footer.php'; ?>
+        <?php include $global['systemRootPath'] . 'view/include/footer.php'; ?>
         <script src="<?php echo $global['webSiteRootURL']; ?>js/bootstrap-list-filter/bootstrap-list-filter.min.js" type="text/javascript"></script>
         <script src="<?php echo $global['webSiteRootURL']; ?>plugin/YouPHPFlix/view/js/flickty/flickity.pkgd.min.js" type="text/javascript"></script>
         <script src="<?php echo $global['webSiteRootURL']; ?>js/webui-popover/jquery.webui-popover.min.js" type="text/javascript"></script>

diff --git a/view/channel.php b/view/channel.php
@@ -263,7 +263,7 @@
         </div>
 
         <?php
-        include 'include/footer.php';
+        include $global['systemRootPath'] . 'view/include/footer.php';
         ?>
         <script>
             var currentObject;

diff --git a/view/channels.php b/view/channels.php
@@ -71,7 +71,7 @@ class="img img-thumbnail img-responsive pull-left" style="max-height: 100px; mar
         </div>
 
         <?php
-        include 'include/footer.php';
+        include $global['systemRootPath'] . 'view/include/footer.php';
         ?>
         <script>
             $(function () {

diff --git a/view/downloadExternalVideo.php b/view/downloadExternalVideo.php
@@ -170,7 +170,7 @@ function () {
         </div><!--/.container-->
 
         <?php
-        include 'include/footer.php';
+        include $global['systemRootPath'] . 'view/include/footer.php';
         ?>
 
     </body>

diff --git a/view/managerPlugins.php b/view/managerPlugins.php
@@ -289,7 +289,7 @@
 
         </div><!--/.container-->
         <?php
-        include 'include/footer.php';
+        include $global['systemRootPath'] . 'view/include/footer.php';
         ?>
 
         <script>

diff --git a/view/mini-upload-form/index.php b/view/mini-upload-form/index.php
@@ -28,7 +28,7 @@
 
     <body>
         <?php
-        include '../include/navbar.php';
+        include $global['systemRootPath'].'view/include/navbar.php';
         ?>
 
         <div class="container">
@@ -78,7 +78,7 @@
         </div><!--/.container-->
 
 <?php
-include '../include/footer.php';
+include $global['systemRootPath'].'view/include/footer.php';
 ?>
 
 

diff --git a/view/modeYoutube.php b/view/modeYoutube.php
@@ -33,9 +33,7 @@
 } else {
     unset($_SESSION['type']);
 }
-if (empty($_POST['dontLoadVideoPhP'])) {
-    require_once $global['systemRootPath'] . 'objects/video.php';
-}
+require_once $global['systemRootPath'] . 'objects/video.php';
 require_once $global['systemRootPath'] . 'objects/video_ad.php';
 
 $catLink = "";
@@ -462,7 +460,7 @@ function loadPlayLists() {
                                             <?php
                                             $url = urlencode($global['webSiteRootURL'] . "{$catLink}video/" . $video['clean_title']);
                                             $title = urlencode($video['title']);
-                                            include './include/social.php';
+                                            include $global['systemRootPath'].'view/include/social.php';
                                             ?>
                                         </div>
                                         <div class="tab-pane" id="tabEmbed">
@@ -592,7 +590,7 @@ function loadPlayLists() {
                     <div class="col-sm-4 col-md-4 bgWhite list-group-item rightBar">
                         <?php
                         if (!empty($playlist_id)) {
-                            include './include/playlist.php';
+                            include $global['systemRootPath'].'view/include/playlist.php';
                             ?>
                             <script>
                                 $(document).ready(function () {
@@ -738,7 +736,7 @@ function loadPlayLists() {
         </script>
         <script src="<?php echo $global['webSiteRootURL']; ?>js/video.js/video.js" type="text/javascript"></script>
         <script src="<?php echo $global['webSiteRootURL']; ?>js/videojs-contrib-ads/videojs.ads.min.js" type="text/javascript"></script>
-        <?php include 'include/footer.php'; ?>
+        <?php include $global['systemRootPath'] . 'view/include/footer.php'; ?>
         <script src="<?php echo $global['webSiteRootURL']; ?>js/videojs-rotatezoom/videojs.zoomrotate.js" type="text/javascript"></script>
         <script src="<?php echo $global['webSiteRootURL']; ?>js/videojs-persistvolume/videojs.persistvolume.js" type="text/javascript"></script>
         <script src="<?php echo $global['webSiteRootURL']; ?>js/webui-popover/jquery.webui-popover.min.js" type="text/javascript"></script>
-Original file line number
+Diff line change
@@ Expand Up / @@ -170,7 +170,7 @@ function () { @@
             </div><!--/.container-->
             <?php
-            include 'include/footer.php';
+            include $global['systemRootPath'] . 'view/include/footer.php';
             ?>
         </body>
@@ Expand Down @@