Merge pull request #46 from DanielnetoDotCom/master

update
WWBN · Apr 9, 2018 · ac55119 · ac55119
2 parents 983a2a4 + 3ca9cc4
commit ac55119
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 18 deletions.
diff --git a/plugin/Gallery/functions.php b/plugin/Gallery/functions.php
@@ -1,5 +1,4 @@
 <?php
-
 function createOrderInfo($getName, $mostWord, $lessWord, $orderString) {
     $upDown = "";
     $mostLess = "";
@@ -31,7 +30,7 @@ function createOrderInfo($getName, $mostWord, $lessWord, $orderString) {
     return array($tmpOrderString, $upDown, $mostLess);
 }
 
-function createGalerySection($videos) {
+function createGallerySection($videos) {
     global $global, $config, $obj;
     ?>
     <?php

diff --git a/plugin/Gallery/view/BigVideo.php b/plugin/Gallery/view/BigVideo.php
@@ -27,8 +27,8 @@
                 <div class="text-muted galeryDetails">
                     <div>
                         <?php
-                        $value['tags'] = Video::getTags($video['id']);
-                        foreach ($value['tags'] as $value2) {
+                        $video['tags'] = Video::getTags($video['id']);
+                        foreach ($video['tags'] as $value2) {
                             if ($value2->label === __("Group")) {
                                 ?>
                                 <span class="label label-<?php echo $value2->type; ?>"><?php echo $value2->text; ?></span>

diff --git a/plugin/Gallery/view/modeGallery.php b/plugin/Gallery/view/modeGallery.php
@@ -66,8 +66,8 @@
 <html lang="<?php echo $_SESSION['language']; ?>">
     <head>
         <title><?php
-echo $config->getWebSiteTitle();
-?></title>
+            echo $config->getWebSiteTitle();
+            ?></title>
         <meta name="generator"
               content="YouPHPTube - A Free Youtube Clone Script" />
               <?php include $global['systemRootPath'] . 'view/include/head.php';
@@ -108,9 +108,9 @@
             </div>
             <div class="col-sm-10 col-sm-offset-1 list-group-item">
                 <?php
-		if (!empty($currentCat)) {
-                        include $global['systemRootPath'] . 'plugin/Gallery/view/Category.php';
-                    }
+                if (!empty($currentCat)) {
+                    include $global['systemRootPath'] . 'plugin/Gallery/view/Category.php';
+                }
                 if (!empty($video)) {
                     $name = User::getNameIdentificationById($video['users_id']);
                     $img_portrait = ($video['rotation'] === "90" || $video['rotation'] === "270") ? "img-portrait" : "";
@@ -134,6 +134,9 @@ function afterExtraVideos($liveLi) {
                                 return $liveLi;
                             }
                         </script>
+                        <?php
+                        echo YouPHPTubePlugin::getGallerySection();
+                        ?>
                         <!-- For Live Videos End -->    
                         <?php if ($obj->SortByName) { ?>   
                             <div class="clear clearfix">
@@ -159,7 +162,7 @@ function afterExtraVideos($liveLi) {
                                 $_POST['current'] = $_GET['page'];
                                 $_POST['rowCount'] = $obj->SortByNameRowCount;
                                 $videos = Video::getAllVideos();
-                                createGalerySection($videos);
+                                createGallerySection($videos);
                                 ?>
                                 <div class="row">
                                     <ul class="pages">
@@ -184,12 +187,12 @@ function afterExtraVideos($liveLi) {
                                     ?>
                                 </h3>
                                 <div class="row"><?php
-                            $countCols = 0;
-                            unset($_POST['sort']);
-                            $_POST['sort']['created'] = $_GET['dateAddedOrder'];
-                            $_POST['rowCount'] = $obj->DateAddedRowCount;
-                            $videos = Video::getAllVideos();
-                            createGalerySection($videos);
+                                    $countCols = 0;
+                                    unset($_POST['sort']);
+                                    $_POST['sort']['created'] = $_GET['dateAddedOrder'];
+                                    $_POST['rowCount'] = $obj->DateAddedRowCount;
+                                    $videos = Video::getAllVideos();
+                                    createGallerySection($videos);
                                     ?>
                                 </div>
                                 <div class="row">
@@ -221,7 +224,7 @@ function afterExtraVideos($liveLi) {
                                     $_POST['current'] = $_GET['page'];
                                     $_POST['rowCount'] = $obj->MostWatchedRowCount;
                                     $videos = Video::getAllVideos();
-                                    createGalerySection($videos);
+                                    createGallerySection($videos);
                                     ?>
                                 </div>
                                 <div class="row">
@@ -253,7 +256,7 @@ function afterExtraVideos($liveLi) {
                                     $_POST['current'] = $_GET['page'];
                                     $_POST['rowCount'] = $obj->MostPopularRowCount;
                                     $videos = Video::getAllVideos();
-                                    createGalerySection($videos);
+                                    createGallerySection($videos);
                                     ?>
                                 </div>
                                 <div class="row">

diff --git a/plugin/Plugin.abstract.php b/plugin/Plugin.abstract.php
@@ -51,6 +51,10 @@ public function getVideosManagerListButton() {
     public function getTags() {
 
     }
+
+    public function getGallerySection(){
+        return "";
+    }
 
     public function getDataObject() {
         $obj = Plugin::getPluginByUUID($this->getUUID());

diff --git a/plugin/YouPHPTubePlugin.php b/plugin/YouPHPTubePlugin.php
@@ -10,6 +10,15 @@ public static function getHeadCode(){
         }
         return $str;
     }
+    public static function getGallerySection(){
+        $plugins = Plugin::getAllEnabled();
+        $str = "";
+        foreach ($plugins as $value) {
+            $p = static::loadPlugin($value['dirName']);
+            $str .= $p->getGallerySection();
+        }
+        return $str;
+    }
     public static function getFooterCode(){
         $plugins = Plugin::getAllEnabled();
         $str = "";