307 subscriptions

upload/.htaccess

@@ -38,10 +38,17 @@ RewriteEngine on
 RewriteRule ^videos/(.*)/(.*)/(.*)/(.*)/(.*)        videos.php?cat=$1&sort=$3&time=$4&page=$5&seo_cat_name=$2 [L]
 RewriteRule ^videos/([0-9]+)                        videos.php?page=$1 [L]
 RewriteRule ^videos/?$                              videos.php?%{QUERY_STRING} [L]
-RewriteRule ^video/(.*)/(.*)                        watch_video.php?v=$1&%{QUERY_STRING} [L]
+RewriteRule ^videos_public/(.*)/(.*)/(.*)/(.*)/(.*) videos_public.php?cat=$1&sort=$3&time=$4&page=$5&seo_cat_name=$2 [L]
+RewriteRule ^videos_public/([0-9]+)                 videos_public.php?page=$1 [L]
+RewriteRule ^videos_public/?$                       videos_public.php?%{QUERY_STRING} [L]
+
 #Alternate watch video links
 RewriteRule ^(.*)\_v([0-9]+)                        watch_video.php?v=$2&%{QUERY_STRING} [L]
 RewriteRule ^video/([0-9]+)_(.*)                    watch_video.php?v=$1&%{QUERY_STRING} [L]
+RewriteRule ^video/(.*)/(.*)                        watch_video.php?v=$1&%{QUERY_STRING} [L]
+RewriteRule ^video_public\-(.*)\_v([0-9]+)          watch_public_video.php?v=$2&%{QUERY_STRING} [L]
+RewriteRule ^video_public/([0-9]+)_(.*)             watch_public_video.php?v=$1&%{QUERY_STRING} [L]
+RewriteRule ^video_public/(.*)/(.*)                 watch_public_video.php?v=$1&%{QUERY_STRING} [L]
 
 #Users, Channel & Management
 RewriteRule ^channels/(.*)/(.*)/(.*)/(.*)/(.*)      channels.php?cat=$1&sort=$3&time=$4&page=$5&seo_cat_name=$2 [L]

upload/404.php

@@ -2,6 +2,21 @@
 define('THIS_PAGE', '404');
 require 'includes/config.inc.php';
 
+if( !empty($_SERVER['REQUEST_URI']) ){
+    $url_new = ['video_public', 'videos_public'];
+    foreach($url_new as $url){
+        if (strpos($_SERVER['REQUEST_URI'], $url) !== false) {
+            $msg = 'Vhosts are outdated, URL not recognized : ' . $_SERVER['REQUEST_URI'];
+            error_log($msg);
+            DiscordLog::sendDump($msg);
+
+            if( User::getInstance()->hasAdminAccess() && in_dev() ) {
+                e($msg);
+            }
+        }
+    }
+}
+
 if (file_exists(LAYOUT . '/404.html')) {
     template_files('404.html');
 } else {

upload/actions/admin_activate_membership.php

@@ -0,0 +1,15 @@
+<?php
+define('THIS_PAGE', 'update_phrase');
+require_once dirname(__FILE__, 2) . '/includes/admin_config.php';
+
+User::getInstance()->hasPermissionAjax('admin_access');
+
+$id_membership = $_POST['id_membership'];
+$membership = Membership::getInstance()->getOne(['id_membership'=>$id_membership]);
+if (empty($membership)) {
+    e(lang('cant_delete_membership_at_least_one_user'));
+    $success = false;
+} else {
+    $success =  Membership::getInstance()->update(['id_membership'=>$id_membership, 'disabled'=>$_POST['disabled']]);
+}
+echo json_encode(['msg'=>getTemplateMsg(), 'success'=>$success]);

upload/actions/admin_activate_user_level.php

@@ -0,0 +1,15 @@
+<?php
+define('THIS_PAGE', 'activate_user_level');
+require_once dirname(__FILE__, 2) . '/includes/admin_config.php';
+
+User::getInstance()->hasPermissionAjax('admin_access');
+
+$user_level_id = $_POST['user_level_id'];
+$user_level = userquery::getInstance()->get_level_details($user_level_id);
+if (empty($user_level)) {
+    e(lang('user_level_not_found'));
+    $success = false;
+} else {
+    $success =  User::getInstance()->toggleUserLevelActivation($user_level_id, $_POST['active'] == 'true');
+}
+echo json_encode(['msg'=>getTemplateMsg(), 'success'=>$success]);

upload/actions/admin_delete_membership.php

@@ -0,0 +1,23 @@
+<?php
+define('THIS_PAGE', 'update_phrase');
+require_once dirname(__FILE__, 2) . '/includes/admin_config.php';
+
+User::getInstance()->hasPermissionAjax('admin_access');
+
+$id_membership = $_POST['id_membership'];
+$membership = Membership::getInstance()->getOne(['id_membership'=>$id_membership, 'get_user_membership'=>true]);
+if (!empty($membership['id_user_membership'])) {
+    e(lang('cant_delete_membership_at_least_one_user'));
+    $success = false;
+} else {
+    $success =  Membership::getInstance()->delete($id_membership);
+}
+if ($success) {
+    e(lang('membership_deleted'), 'm');
+}
+$url='';
+if (!empty($_POST['redirect'])) {
+    SessionMessageHandler::add_message(lang('membership_deleted'));
+    $url = DirPath::getUrl('admin_area') .'memberships.php';
+}
+echo json_encode(['msg'=>getTemplateMsg(), 'success'=>$success, 'url'=>$url]);

upload/actions/admin_get_membership_history.php

@@ -0,0 +1,24 @@
+<?php
+define('THIS_PAGE', 'get_membership_history');
+require_once dirname(__FILE__, 2) . '/includes/admin_config.php';
+
+User::getInstance()->hasPermissionAjax('admin_access');
+
+if (!empty($_POST['page'])) {
+    $sql_limit = create_query_limit($_POST['page'], config('video_list_view_video_history'));
+}
+$params = [
+    'userid' => $_POST['userid'],
+    'limit'   => $sql_limit ?? '',
+    'order'  => ' date_start DESC '
+];
+$results = Membership::getInstance()->getAllHistoMembershipForUser($params);
+$params['count'] = true;
+unset($params['limit']);
+$totals_pages = count_pages(Membership::getInstance()->getAllHistoMembershipForUser($params), config('video_list_view_video_history')) ;
+pages::getInstance()->paginate($totals_pages, $_POST['page'], 'javascript:pageViewHistory(#page#, ' . $_POST['userid'] . ');');
+
+display_user_membership_history([
+    'results' => $results,
+    'modal'   => ($_POST['modal'] ?? true)
+], $_POST['userid']);

upload/actions/file_uploader.php

@@ -124,6 +124,9 @@
             , 'allow_embedding' => 'yes'
             , 'broadcast'       => 'public'
         ];
+        if (config('enable_public_video_page') == 'yes') {
+            $vidDetails['broadcast'] = 'logged';
+        }
 
         $vid = $Upload->submit_upload($vidDetails);
 

upload/actions/video_view_history.php

@@ -1,5 +1,5 @@
 <?php
-define('THIS_PAGE', 'info_tmdb');
+define('THIS_PAGE', 'video_view_history');
 require_once dirname(__FILE__, 2) . '/includes/admin_config.php';
 
 if (config('enable_access_view_video_history') != 'yes' && config('enable_video_view_history') != 'yes') {

upload/admin_area/edit_membership.php

@@ -0,0 +1,56 @@
+<?php
+define('THIS_PAGE', 'membership_user_levels');
+global $pages, $Upload, $eh, $myquery, $cbvid, $breadcrumb;
+require_once dirname(__FILE__, 2) . '/includes/admin_config.php';
+
+User::getInstance()->hasPermissionOrRedirect('admin_access');
+$pages->page_redir();
+
+/* Generating breadcrumb */
+
+$membership=[];
+//TODO check inputs required etc.
+if (!empty($_POST['id_membership'])) {
+    if (Membership::getInstance()->update($_POST)) {
+        e(lang('user_level_successfully_saved'),'m');
+    } else {
+        $membership = $_POST;
+    }
+} elseif (!empty($_POST)) {
+    if (Membership::getInstance()->insert($_POST)) {
+        SessionMessageHandler::add_message(lang('user_level_successfully_saved'), 'm', get_server_url() . DirPath::getUrl('admin_area') . 'memberships.php');
+    } else {
+        $membership = $_POST;
+    }
+}
+
+if (empty($membership)) {
+    $membership = Membership::getInstance()->getOne(['id_membership' => $_REQUEST['id_membership'] ?: 0]);
+}
+assign('membership', $membership);
+assign('frequencies', Membership::getInstance()->getFrequencies());
+assign('currencies', Membership::getInstance()->getAllCurrency());
+assign('user_levels', userquery::getInstance()->get_levels() ?: []);
+
+global $breadcrumb;
+$breadcrumb[0] = [
+    'title' => lang('memberships'),
+    'url'   => ''
+];
+$breadcrumb[1] = [
+    'title' => lang('user_levels'),
+    'url'   => DirPath::getUrl('admin_area') . 'memberships.php'
+];
+$titre = lang((!empty($membership) ? 'edit_' : 'add_') . 'membership');
+$breadcrumb[2] = [
+    'title' => $titre,
+    'url'   => DirPath::getUrl('admin_area') . 'edit_membership.php' . (!empty($membership) ? '?id_membership=' . $membership['id_membership'] : '')
+];
+
+$min_suffixe = in_dev() ? '' : '.min';
+ClipBucket::getInstance()->addAdminJS([
+    'pages/membership/edit_membership' . $min_suffixe . '.js' => 'admin',
+]);
+subtitle($titre);
+template_files('edit_membership.html');
+display_it();

upload/admin_area/edit_video.php

@@ -77,9 +77,9 @@
 } else {
     //add parameter to display message after redirect
     if ($_GET['mode'] == 'delete') {
-        sessionMessageHandler::add_message(lang('video_deleted'), 'm',  get_server_url() . DirPath::getUrl('admin_area') . 'video_manager.php');
+        SessionMessageHandler::add_message(lang('video_deleted'), 'm',  get_server_url() . DirPath::getUrl('admin_area') . 'video_manager.php');
     }
-    sessionMessageHandler::add_message(lang('class_vdo_del_err'), 'e',  get_server_url() . DirPath::getUrl('admin_area') . 'video_manager.php');
+    SessionMessageHandler::add_message(lang('class_vdo_del_err'), 'e',  get_server_url() . DirPath::getUrl('admin_area') . 'video_manager.php');
 }
 
 $resolution_list = getResolution_list($data);

upload/admin_area/login_as_user.php

@@ -10,10 +10,6 @@
 }
 $pages->page_redir();
 
-if ($_GET['revert']) {
-    userquery::getInstance()->revert_from_user();
-    redirect_to('/admin_area');
-}
 $uid = $_GET['uid'];
 
 $udetails = userquery::getInstance()->get_user_details(user_id());
@@ -27,6 +23,6 @@
 }
 
 if (userquery::getInstance()->login_as_user($uid)) {
-    redirect_to(get_server_url());
+    User::redirectAfterLogin();
 }
 display_it();

upload/admin_area/main.php

@@ -139,6 +139,8 @@
         , 'video_enable_nsfw_check'
         , 'photo_nsfw_check_model'
         , 'video_nsfw_check_model'
+        , 'enable_membership'
+        , 'enable_public_video_page'
     ];
 
     $config_booleans_to_refactor = [
@@ -474,7 +476,11 @@
         'photo_enable_nsfw_check',
         'video_enable_nsfw_check',
         'photo_nsfw_check_model',
-        'video_nsfw_check_model'
+        'video_nsfw_check_model',
+        'number_featured_video',
+        'video_list_view_video_history',
+        'enable_membership',
+        'enable_public_video_page'
     ];
 
     foreach ($opt_list as $optl) {

upload/admin_area/manage_playlist.php

@@ -152,7 +152,7 @@
                 'url'   => DirPath::getUrl('admin_area') . 'manage_playlist.php?mode=edit_playlist&pid=' . display_clean($pid)
             ];
         } else {
-            sessionMessageHandler::add_message(lang('playlist_not_exist'), 'e',  get_server_url() . DirPath::getUrl('admin_area') . 'manage_playlist.php');
+            SessionMessageHandler::add_message(lang('playlist_not_exist'), 'e',  get_server_url() . DirPath::getUrl('admin_area') . 'manage_playlist.php');
         }
         break;
 }

upload/admin_area/memberships.php

@@ -0,0 +1,48 @@
+<?php
+define('THIS_PAGE', 'membership_user_levels');
+global $pages, $Upload, $eh, $myquery, $cbvid, $breadcrumb;
+require_once dirname(__FILE__, 2) . '/includes/admin_config.php';
+
+User::getInstance()->hasPermissionOrRedirect('admin_access');
+/* Generating breadcrumb */
+global $breadcrumb;
+$breadcrumb[0] = [
+    'title' => lang('memberships'),
+    'url'   => ''
+];
+$breadcrumb[1] = [
+    'title' => lang('user_levels'),
+    'url'   => DirPath::getUrl('admin_area') . 'memberships.php'
+];
+
+
+$page = mysql_clean($_GET['page']);
+$params['limit'] = create_query_limit($page, config('admin_pages'));
+$params['group'] = Membership::getInstance()->getTablename() .'.id_membership';
+$params['get_nb_users'] = true;
+$memberships = Membership::getInstance()->getAll($params);
+assign('memberships', $memberships);
+if (empty($memberships)) {
+    $total_rows = 0;
+} else {
+    if (count($memberships) < config('admin_pages') && ($page == 1 || empty($page))) {
+        $total_rows = count($memberships);
+    } else {
+        $params['count'] = true;
+        unset($params['limit']);
+        unset($params['order']);
+        unset($params['get_nb_users']);
+        $total_rows = Membership::getInstance()->getAll($params);
+    }
+}
+$total_pages = count_pages($total_rows, config('admin_pages'));
+$pages->paginate($total_pages, $page);
+
+$min_suffixe = in_dev() ? '' : '.min';
+ClipBucket::getInstance()->addAdminJS([
+    'pages/membership/memberships' . $min_suffixe . '.js' => 'admin',
+]);
+
+subtitle(lang('user_levels'));
+template_files('memberships.html');
+display_it();

upload/admin_area/styles/cb_2014/layout/add_members.html

@@ -114,7 +114,7 @@ <h2>Add New User</h2>
             <select class="form-control" name="level" id="level">
                 {assign var=levels value=$userquery->get_levels()}
                 {foreach from=$levels item=level}
-                <option value="{$level.user_level_id}" {if isset($smarty.post.level) && $smarty.post.level==$level.user_level_id} selected{elseif $level.user_level_id==2}selected{/if}>{$level.user_level_name}</option>
+                <option value="{$level.user_level_id}" {if isset($smarty.post.level) && $smarty.post.level==$level.user_level_id} selected{elseif $level.user_level_id== UserLevel::getDefaultId()}selected{/if}>{$level.user_level_name}</option>
                 {/foreach}
             </select>
         </div>

upload/admin_area/styles/cb_2014/layout/blocks/membership_search.html

@@ -0,0 +1,38 @@
+<div class="advanceSearchButton clearfix">
+    <a href="#" class="btn btn-primary btn-sm pull-right current after" onclick="$('#searchdiv').toggle();return false;" style="top: 15px;">
+        {lang code="com_advance_results"}
+        <i class="glyphicon glyphicon-chevron-down down"></i>
+        <i class="glyphicon glyphicon-chevron-up up" style="display:none;"></i>
+    </a>
+</div>
+
+<div class="search_box well" id="searchdiv" {if !$username && !$user_level_id} style="display:none;"{/if}>
+    <form id="users_memberships_search" name="users_memberships_search" method="post" action="users_memberships.php" >
+        <input type="hidden" name="sort" id="sort" value="{$sort}">
+        <input type="hidden" name="sort_order" id="sort_order" value="{$sort_order}">
+        <div class="row">
+            <div class="col-md-4">
+                <div class="form-group">
+                    <label for="username">{lang('username')}</label>
+                    <input class="form-control" name="username" type="text" id="username" value="{$username}" />
+                </div>
+            </div>
+            <div class="col-md-4">
+              <div class="form-group">
+                    <label for="user_level_id">{lang('user_levels')}</label>
+                  <select class="form-control" name="user_level_id" id="user_level_id">
+                      <option value=""></option>
+                      {foreach from=$user_levels item=user_level}
+                          <option value="{$user_level.id_membership}" {if $user_level_id == $user_level.id_membership}selected{/if} >
+                              {lang($user_level.user_level_name|strtolower|replace:' ':'_')} - {lang('frequency_'|cat:$user_level.frequency)}
+                          </option>
+                      {/foreach}
+                  </select>
+                </div>  
+            </div>
+        </div>
+        <div class="form-group">
+            <input type="submit" name="search" id="search" value='{lang code="search"}' class="btn btn-success btn-sm"/>
+        </div>
+    </form>
+</div>