Allow also create actions menu

also users can now customize the action menu links on their videos

.gitignore

@@ -67,6 +67,7 @@
 /plugin/ZoomMeetingRecorder/
 /plugin/oncologytube/
 /plugin/predefinedCategory/
+/plugin/Pedagoflix/
 /videos/
 *.ser
 sitemap.xml

objects/pluginSwitch.json.php

@@ -28,9 +28,11 @@ $obj->setStatus($_POST['status']);
 if(empty($obj->pluginversion)||is_null($obj->pluginversion)){
     require_once $global['systemRootPath'] . 'plugin/AVideoPlugin.php';
     $p=AVideoPlugin::loadPlugin($_POST['dir']);
-    $currentVersion=$p->getPluginVersion();
-    $obj->setPluginversion($currentVersion);
-    Plugin::setCurrentVersionByUuid($_POST['uuid'], $currentVersion);
+    if(is_object($p)){
+        $currentVersion=$p->getPluginVersion();
+        $obj->setPluginversion($currentVersion);
+        Plugin::setCurrentVersionByUuid($_POST['uuid'], $currentVersion);
+    }
 
 }
 

plugin/CDN/CDN.php

@@ -50,7 +50,15 @@ class CDN extends PluginAbstract {
     public function getPluginMenu() {
         global $global;
         $fileAPIName = $global['systemRootPath'] . 'plugin/CDN/pluginMenu.html';
-        return file_get_contents($fileAPIName);
+        $content = file_get_contents($fileAPIName);
+        $obj = $this->getDataObject();
+        
+        $url = "http://192.168.1.4/youphptube.com/marketplace/CDN/iframe.php?hash={hash}";
+        
+        $url = addQueryStringParameter($url, 'hash', $obj->key);
+        $url = addQueryStringParameter($url, 'webSiteRootURL', $global['webSiteRootURL']);
+        
+        return str_replace('{url}', $url, $content);
     }
 
     /**

plugin/CDN/pluginMenu.html

@@ -1 +1 @@
-<button class="btn btn-primary btn-sm btn-xs btn-block" onclick="avideoModalIframeLarge('http://192.168.1.4/youphptube.com/marketplace/CDN/iframe.php?webSiteRootURL='+webSiteRootURL)"><i class="fas fa-project-diagram"></i> CDN</button>
+<button class="btn btn-primary btn-sm btn-xs btn-block" onclick="avideoModalIframeLarge('{url}')"><i class="fas fa-project-diagram"></i> CDN</button>

plugin/CustomizeUser/actionButton.php

@@ -5,7 +5,7 @@ if ($obj->allowDonationLink && !empty($video['users_id'])) {
     if (!empty($donationLink)) {
         ?>
         <a class="btn btn-success no-outline" href="<?php echo $donationLink; ?>" target="_blank">
-            <i class="fas fa-donate"></i> <small><?php echo __($obj->donationButtonLabel); ?> <i class="fas fa-external-link-alt"></i></small>
+            <i class="fas fa-donate"></i> <small class="hidden-sm hidden-xs"><?php echo __($obj->donationButtonLabel); ?> <i class="fas fa-external-link-alt"></i></small>
         </a>    
         <?php
     }
@@ -14,7 +14,7 @@ if ($obj->allowWalletDirectTransferDonation && !empty($video['users_id']) && cla
     if (!User::isLogged()) {
         ?>
         <a class="btn btn-warning no-outline" href="<?php echo $global['webSiteRootURL']; ?>user">
-            <i class="fas fa-donate"></i> <small><?php echo __("Please login to donate"); ?></small>
+            <i class="fas fa-donate"></i> <small class="hidden-sm hidden-xs"><?php echo __("Please login to donate"); ?></small>
         </a>    
         <?php
     } else if (class_exists("YPTWallet")) {
@@ -23,14 +23,18 @@ if ($obj->allowWalletDirectTransferDonation && !empty($video['users_id']) && cla
         $captcha = User::getCaptchaForm($uid);
         ?>
         <button class="btn btn-success no-outline" onclick="openDonationMoodal<?php echo $uid; ?>();">
-            <i class="fas fa-donate"></i> <small><?php echo __($obj->donationWalletButtonLabel); ?></small>
+            <i class="fas fa-donate"></i> <small class="hidden-sm hidden-xs"><?php echo __($obj->donationWalletButtonLabel); ?></small>
         </button>   
         <div id="donationModal<?php echo $uid; ?>" class="modal fade" tabindex="-1" role="dialog" >
             <div class="modal-dialog" role="document">
                 <div class="modal-content">
                     <div class="modal-header">
                         <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                        <h4 class="modal-title"><img src="<?php echo $u->getPhotoDB(); ?>" class="img img-circle img-responsive " style="height: 30px; float: left;" > <strong style="margin: 10px 0 0 10px;"><?php echo $u->getNameIdentificationBd(); ?></strong></h4>
+                        <h4 class="modal-title">
+                            <img src="<?php echo $u->getPhotoDB(); ?>" class="img img-circle img-responsive " style="height: 30px; float: left;" > 
+                            <strong style="margin: 10px 0 0 10px;"><?php echo $u->getNameIdentificationBd(); ?>
+                            </strong>
+                        </h4>
                     </div>
                     <div class="modal-body">
 

plugin/LoginControl/LoginControl.php

@@ -448,7 +448,7 @@ Best regards,
 
     function onUserSocketConnect() {
         $obj = $this->getDataObject();
-        if ($obj->singleDeviceLogin && !preg_match('/Chat2/', $_SERVER["SCRIPT_FILENAME"])) {
+        if (!User::isAdmin() && $obj->singleDeviceLogin && !preg_match('/Chat2/', $_SERVER["SCRIPT_FILENAME"])) {
             echo ' if(response.msg.users_id && response.msg.users_id == "' . User::getId() . '" && response.msg.yptDeviceId  && response.msg.yptDeviceId !== "' . getDeviceID(false) . '"){
                 $.ajax({
                     url: webSiteRootURL + "logoff",

plugin/PlayLists/actionButton.php

@@ -5,7 +5,7 @@ $crc = uniqid();
     <?php if ((empty($_POST['disableAddTo'])) && (( ($advancedCustom != false) && ($advancedCustom->disableShareAndPlaylist == false)) || ($advancedCustom == false))) { ?>
        <a href="#" class="<?php echo $btnClass; ?>" id="addBtn<?php echo $videos_id . $crc; ?>" onclick="loadPlayLists('<?php echo $videos_id; ?>', '<?php echo $crc; ?>');">
             <span class="fa fa-plus"></span> 
-            <span class="hidden-xs"><?php echo __("Add to"); ?></span>
+            <span class="hidden-sm hidden-xs"><?php echo __("Add to"); ?></span>
         </a>
         <div class="webui-popover-content" >
             <?php if (User::isLogged()) { ?>

plugin/PlayLists/player.php

@@ -8,7 +8,7 @@ require_once $global['systemRootPath'] . 'objects/playlist.php';
 require_once $global['systemRootPath'] . 'plugin/PlayLists/PlayListElement.php';
 
 if (!PlayList::canSee($_GET['playlists_id'], User::getId())) {
-    die('{"error":"' . __("Permission denied") . '"}');
+    forbiddenPage(_('You cannot see this playlist'));
 }
 
 $video = PlayLists::isPlayListASerie($_GET['playlists_id']);

plugin/TopMenu/Objects/Menu.php

@@ -10,12 +10,16 @@ class Menu extends ObjectYPT {
     static $typeTopMenu = 2;
     static $typeActionMenu = 3;
     static $typeActionMenuCustomURL = 4;
+    static $typeActionMenuCustomURLForLoggedUsers = 5;
+    static $typeActionMenuCustomURLForUsersThatCanWatchVideo = 6;
     
     static $typeName = array(
         1=>'Left', 
         2=>'Top', 
         3=>'Action', 
-        4=>'Action Custom URL Per Video');
+        4=>'Action Custom URL Per Video', 
+        5=>'Action Custom URL Per Video For Logged Users Only', 
+        6=>'Action Custom URL Per Video For Users That can Watch Video');
 
     protected $id, $menuName, $categories_id, $users_groups_id, $menu_order, $status, $position, $type, $icon, $menuSeoUrl;
 

plugin/TopMenu/TopMenu.php

@@ -151,10 +151,6 @@ class TopMenu extends PluginAbstract {
         if (!User::canUpload()) {
             return "";
         }
-        $menu = Menu::getAllActive(Menu::$typeActionMenuCustomURL);
-        if(empty($menu)){
-            return '';
-        }
         
         $obj = $this->getDataObject();
         $btn = '';

plugin/TopMenu/actionButtonGallery.php

@@ -23,7 +23,7 @@ foreach ($menu as $key => $value) {
                     <?php
                 }
                 ?>
-                <span class="hidden-xs">
+                <span  class="hidden-sm hidden-xs">
                     <?php echo __($value2['title']); ?>
                 </span>
             </a> 
@@ -49,7 +49,7 @@ foreach ($menu as $key => $value) {
                     <?php
                 }
                 ?>
-                <span class="hidden-xs">
+                <span  class="hidden-sm hidden-xs">
                     <?php echo __($value2['title']); ?>
                 </span>
             </a> 
@@ -57,5 +57,61 @@ foreach ($menu as $key => $value) {
         <?php
     }
 }
+if (User::isLogged()) {
+    $menu = Menu::getAllActive(Menu::$typeActionMenuCustomURLForLoggedUsers);
+    foreach ($menu as $key => $value) {
+        $menuItems = MenuItem::getAllFromMenu($value['id'], true);
+        foreach ($menuItems as $key2 => $value2) {
+            $url = TopMenu::getVideoMenuURL($videos_id, $value2['id']);
+            if (empty($url)) {
+                continue;
+            }
+            ?>
+            <div>
+                <a href="<?php echo $url; ?>" <?php echo $value2['target']; ?>  class="text-primary">
+                    <?php
+                    if (!empty($value2['icon'])) {
+                        ?>
+                        <i class="<?php echo $value2['icon'] ?>"></i> 
+                        <?php
+                    }
+                    ?>
+                    <span  class="hidden-sm hidden-xs">
+                        <?php echo __($value2['title']); ?>
+                    </span>
+                </a> 
+            </div>  
+            <?php
+        }
+    }
+    if (User::canWatchVideo($videos_id)) {
+        $menu = Menu::getAllActive(Menu::$typeActionMenuCustomURLForUsersThatCanWatchVideo);
+        foreach ($menu as $key => $value) {
+            $menuItems = MenuItem::getAllFromMenu($value['id'], true);
+            foreach ($menuItems as $key2 => $value2) {
+                $url = TopMenu::getVideoMenuURL($videos_id, $value2['id']);
+                if (empty($url)) {
+                    continue;
+                }
+                ?>
+                <div>
+                    <a href="<?php echo $url; ?>" <?php echo $value2['target']; ?>  class="text-primary">
+                        <?php
+                        if (!empty($value2['icon'])) {
+                            ?>
+                            <i class="<?php echo $value2['icon'] ?>"></i> 
+                            <?php
+                        }
+                        ?>
+                        <span  class="hidden-sm hidden-xs">
+                            <?php echo __($value2['title']); ?>
+                        </span>
+                    </a> 
+                </div>  
+                <?php
+            }
+        }
+    }
+}
 ?>
 <!-- action menu start -->

plugin/TopMenu/actionButtonNetflix.php

@@ -14,7 +14,7 @@ foreach ($menu as $key => $value) {
     $menuItems = MenuItem::getAllFromMenu($value['id'], true);
     foreach ($menuItems as $key2 => $value2) {
         ?>
-        <a href="<?php echo $value2['finalURL']; ?>" <?php echo $value2['target']; ?> class="btn btn-default">
+        <a href="<?php echo $value2['finalURL']; ?>" <?php echo $value2['target']; ?> class="btn btn-default no-outline">
             <?php
             if (!empty($value2['icon'])) {
                 ?>
@@ -22,7 +22,7 @@ foreach ($menu as $key => $value) {
                 <?php
             }
             ?>
-            <span class="hidden-xs">
+            <span class="hidden-sm hidden-xs">
                 <?php echo __($value2['title']); ?>
             </span>
         </a> 
@@ -35,11 +35,11 @@ foreach ($menu as $key => $value) {
     $menuItems = MenuItem::getAllFromMenu($value['id'], true);
     foreach ($menuItems as $key2 => $value2) {
         $url = TopMenu::getVideoMenuURL($videos_id, $value2['id']);
-        if(empty($url)){
+        if (empty($url)) {
             continue;
         }
         ?>
-        <a href="<?php echo $url; ?>" <?php echo $value2['target']; ?> class="btn btn-default">
+        <a href="<?php echo $url; ?>" <?php echo $value2['target']; ?> class="btn btn-default no-outline">
             <?php
             if (!empty($value2['icon'])) {
                 ?>
@@ -47,12 +47,65 @@ foreach ($menu as $key => $value) {
                 <?php
             }
             ?>
-            <span class="hidden-xs">
+            <span class="hidden-sm hidden-xs">
                 <?php echo __($value2['title']); ?>
             </span>
         </a> 
         <?php
     }
 }
+
+if (User::isLogged()) {
+    $menu = Menu::getAllActive(Menu::$typeActionMenuCustomURLForLoggedUsers);
+    foreach ($menu as $key => $value) {
+        $menuItems = MenuItem::getAllFromMenu($value['id'], true);
+        foreach ($menuItems as $key2 => $value2) {
+            $url = TopMenu::getVideoMenuURL($videos_id, $value2['id']);
+            if (empty($url)) {
+                continue;
+            }
+            ?>
+            <a href="<?php echo $url; ?>" <?php echo $value2['target']; ?> class="btn btn-default no-outline">
+                <?php
+                if (!empty($value2['icon'])) {
+                    ?>
+                    <i class="<?php echo $value2['icon'] ?>"></i> 
+                    <?php
+                }
+                ?>
+                <span class="hidden-sm hidden-xs">
+                    <?php echo __($value2['title']); ?>
+                </span>
+            </a>  
+            <?php
+        }
+    }
+    if (User::canWatchVideo($videos_id)) {
+        $menu = Menu::getAllActive(Menu::$typeActionMenuCustomURLForUsersThatCanWatchVideo);
+        foreach ($menu as $key => $value) {
+            $menuItems = MenuItem::getAllFromMenu($value['id'], true);
+            foreach ($menuItems as $key2 => $value2) {
+                $url = TopMenu::getVideoMenuURL($videos_id, $value2['id']);
+                if (empty($url)) {
+                    continue;
+                }
+                ?>
+                <a href="<?php echo $url; ?>" <?php echo $value2['target']; ?> class="btn btn-default no-outline">
+                    <?php
+                    if (!empty($value2['icon'])) {
+                        ?>
+                        <i class="<?php echo $value2['icon'] ?>"></i> 
+                        <?php
+                    }
+                    ?>
+                    <span class="hidden-sm hidden-xs">
+                        <?php echo __($value2['title']); ?>
+                    </span>
+                </a>   
+                <?php
+            }
+        }
+    }
+}
 ?>
 <!-- action menu start -->

plugin/TopMenu/addVideoInfo.php

@@ -82,12 +82,130 @@ $img = Video::getPoster($videos_id);
                     }
 
                 </script>
-
-
                 <?php
             }
         }
         ?>
+        
+                
+        <?php
+        $menu = Menu::getAllActive(Menu::$typeActionMenuCustomURLForLoggedUsers);
+        foreach ($menu as $key => $value) {
+            $menuItems = MenuItem::getAllFromMenu($value['id'], true);
+            foreach ($menuItems as $key2 => $value2) {
+                ?>
+                <div class="panel panel-default">
+                    <div class="panel-heading">
+                        <h1>
+                            <?php
+                            if (!empty($value2['icon'])) {
+                                ?>
+                                <i class="<?php echo $value2['icon'] ?>"></i> 
+                                <?php
+                            }
+                            ?>
+                            <?php echo __($value2['title']); ?>
+                            (<?php echo __('Logged Users Only'); ?>)
+                        </h1>
+                    </div>
+                    <div class="panel-body">
+                        <input type="url" class="form-control" placeholder="https://mysitetowhiutelist.com/" id="menuURL<?php echo $value2['id']; ?>" value="<?php echo TopMenu::getVideoMenuURL($videos_id, $value2['id']); ?>"/>
+                    </div>
+                    <div class="panel-footer">
+                        <button class="btn btn-block btn-success" onclick="saveMenuInfo<?php echo $value2['id']; ?>();"><i class="fas fa-solid"></i> <?php echo __('Save'); ?></button>
+                    </div>
+                </div>
+                <script>
+                    function saveMenuInfo<?php echo $value2['id']; ?>() {
+                        modal.showPleaseWait();
+
+                        var data = {
+                            url: $('#menuURL<?php echo $value2['id']; ?>').val(),
+                            menu_item_id: <?php echo $value2['id']; ?>,
+                            videos_id: <?php echo intval($videos_id); ?>
+                        }
+
+                        $.ajax({
+                            url: '<?php echo $global['webSiteRootURL']; ?>plugin/TopMenu/addVideoInfoSave.json.php',
+                            data: data,
+                            type: 'post',
+                            success: function (response) {
+                                modal.hidePleaseWait();
+                                if (!response.error) {
+                                    avideoAlert("<?php echo __("Congratulations!"); ?>", "", "success");
+                                } else {
+                                    avideoAlert("<?php echo __("Error"); ?>", response.msg, "error");
+                                }
+                            }
+                        });
+                        return false;
+                    }
+
+                </script>
+                <?php
+            }
+        }
+        ?>
+                
+                <?php
+        $menu = Menu::getAllActive(Menu::$typeActionMenuCustomURLForUsersThatCanWatchVideo);
+        foreach ($menu as $key => $value) {
+            $menuItems = MenuItem::getAllFromMenu($value['id'], true);
+            foreach ($menuItems as $key2 => $value2) {
+                ?>
+                <div class="panel panel-default">
+                    <div class="panel-heading">
+                        <h1>
+                            <?php
+                            if (!empty($value2['icon'])) {
+                                ?>
+                                <i class="<?php echo $value2['icon'] ?>"></i> 
+                                <?php
+                            }
+                            ?>
+                            <?php echo __($value2['title']); ?>
+                            (<?php echo __('Paid Users Only'); ?>)
+                        </h1>
+                    </div>
+                    <div class="panel-body">
+                        <input type="url" class="form-control" placeholder="https://mysitetowhiutelist.com/" id="menuURL<?php echo $value2['id']; ?>" value="<?php echo TopMenu::getVideoMenuURL($videos_id, $value2['id']); ?>"/>
+                    </div>
+                    <div class="panel-footer">
+                        <button class="btn btn-block btn-success" onclick="saveMenuInfo<?php echo $value2['id']; ?>();"><i class="fas fa-solid"></i> <?php echo __('Save'); ?></button>
+                    </div>
+                </div>
+                <script>
+                    function saveMenuInfo<?php echo $value2['id']; ?>() {
+                        modal.showPleaseWait();
+
+                        var data = {
+                            url: $('#menuURL<?php echo $value2['id']; ?>').val(),
+                            menu_item_id: <?php echo $value2['id']; ?>,
+                            videos_id: <?php echo intval($videos_id); ?>
+                        }
+
+                        $.ajax({
+                            url: '<?php echo $global['webSiteRootURL']; ?>plugin/TopMenu/addVideoInfoSave.json.php',
+                            data: data,
+                            type: 'post',
+                            success: function (response) {
+                                modal.hidePleaseWait();
+                                if (!response.error) {
+                                    avideoAlert("<?php echo __("Congratulations!"); ?>", "", "success");
+                                } else {
+                                    avideoAlert("<?php echo __("Error"); ?>", response.msg, "error");
+                                }
+                            }
+                        });
+                        return false;
+                    }
+
+                </script>
+                <?php
+            }
+        }
+        ?>
+                
         <?php
         include $global['systemRootPath'] . 'view/include/footer.php';
         ?>

view/css/custom/netflix.css

@@ -45,4 +45,7 @@ th:hover, .select2-dropdown{
 }
 .swal-icon--info:after, .swal-icon--info:before{
     background-color: #c9dae1;
+}
+.btn-default.no-outline:hover{
+    color: #AAA !important;
 }

view/modeYoutubeBottom.php

@@ -1,5 +1,5 @@
 <?php
-if(empty($global['systemRootPath'])){
+if (empty($global['systemRootPath'])) {
     require_once '../videos/configuration.php';
 }
 require_once $global['systemRootPath'] . 'objects/subscribe.php';
@@ -16,7 +16,7 @@ if (empty($video) && !empty($_GET['videos_id'])) {
         $imgw = $data[0];
         $imgh = $data[1];
     } else if ($video['type'] == "audio") {
-        $img = "".getCDN()."view/img/audio_wave.jpg";
+        $img = "" . getCDN() . "view/img/audio_wave.jpg";
     }
     $type = 'video';
     if ($video['type'] === 'pdf') {
@@ -116,7 +116,8 @@ if (User::hasBlockedUser($video['users_id'])) {
                 <?php if (empty($advancedCustom->disableShareAndPlaylist)) { ?>
                     <?php if (CustomizeUser::canShareVideosFromVideo($video['id'])) { ?>
                         <a href="#" class="btn btn-default no-outline" id="shareBtn">
-                            <span class="fa fa-share"></span> <?php echo __("Share"); ?>
+                            <span class="fa fa-share"></span> 
+                            <span class="hidden-sm hidden-xs"><?php echo __("Share"); ?></span>
                         </a>
                         <?php
                     }
@@ -145,7 +146,7 @@ if (User::hasBlockedUser($video['users_id'])) {
                             }
 
                             $theLink['url'] = addQueryStringParameter($theLink['url'], "download", 1);
-                            $theLink['url'] = addQueryStringParameter($theLink['url'], "title", $video['title'] . "_{$key}_.".($video['type']==='audio'?'mp3':'mp4'));
+                            $theLink['url'] = addQueryStringParameter($theLink['url'], "title", $video['title'] . "_{$key}_." . ($video['type'] === 'audio' ? 'mp3' : 'mp4'));
 
                             $parts = explode("_", $key);
                             $name = $key;
@@ -163,13 +164,14 @@ if (User::hasBlockedUser($video['users_id'])) {
                         if (!empty($filesToDownload)) {
                             ?>
                             <a href="#" class="btn btn-default no-outline" id="downloadBtn">
-                                <span class="fa fa-download"></span> <?php echo __("Download"); ?>
+                                <span class="fa fa-download"></span> 
+                                <span class="hidden-sm hidden-xs"><?php echo __("Download"); ?></span>
                             </a>
                             <?php
-                        }else{
+                        } else {
                             echo '<!-- files to download are empty -->';
                         }
-                    }else{
+                    } else {
                         echo '<!-- CustomizeUser::canDownloadVideosFromVideo said NO -->';
                     }
                     ?>
@@ -250,7 +252,7 @@ if (User::hasBlockedUser($video['users_id'])) {
             });
         });
     </script>
-<?php
+    <?php
 }
 
 if ($video['type'] !== 'notfound' && CustomizeUser::canShareVideosFromVideo($video['id'])) {
@@ -319,7 +321,7 @@ if (empty($advancedCustom->showShareMenuOpenByDefault)) {
 if (!empty($video['id']) && empty($advancedCustom->disableComments) && Video::showYoutubeModeOptions()) {
     ?>
     <div class="row bgWhite list-group-item">
-    <?php include $global['systemRootPath'] . 'view/videoComments.php'; ?>
+        <?php include $global['systemRootPath'] . 'view/videoComments.php'; ?>
     </div>
     <?php
 }

view/videosList.php

@@ -228,7 +228,7 @@ foreach ($videos as $key => $value) {
                 <div class="pull-left" style="display: inline-table;">
                     <a class="label label-default" href="<?php echo $global['webSiteRootURL']; ?>cat/<?php echo $value['clean_category']; ?>">
                         <span class="<?php echo $value['iconClass']; ?>"></span>
-                        <span class="hidden-sm"><?php echo $value['category']; ?></span>
+                        <span class="hidden-sm hidden-xs"><?php echo $value['category']; ?></span>
                     </a>
                     <?php
                     if (!empty($objGallery->showTags)) {