diff --git a/.htaccess b/.htaccess index afb9de4252a1..3494f9837e2d 100644 --- a/.htaccess +++ b/.htaccess @@ -137,8 +137,8 @@ Deny from all RewriteRule ^removePlaylist/?$ objects/playlistRemove.php [NC,L] RewriteRule ^renamePlaylist/?$ objects/playlistRename.php [NC,L] RewriteRule ^sortPlaylist/?$ objects/playlistSort.php [NC,L] - RewriteRule ^channel/([^/]+)/?$ view/channel.php?channelName=$1 [NC,L] - RewriteRule ^channel/?$ view/channel.php [NC,L] + RewriteRule ^channel/([^/]+)/?$ view/channel.php?channelName=$1 [QSA] + RewriteRule ^channel/?$ view/channel.php [QSA] RewriteRule ^channels/?$ view/channels.php [NC,L] #manager videos diff --git a/view/channel.php b/view/channel.php index 6eb603598fa6..c0f7153f48b1 100644 --- a/view/channel.php +++ b/view/channel.php @@ -1,7 +1,7 @@ getChannelName(); + $_POST['sort']['created'] = "DESC"; + +if(empty($_GET['current'])){ + $_POST['current'] = 1; +}else{ + $_POST['current'] = $_GET['current']; +} +$current = $_POST['current']; +$rowCount = 25; +$_POST['rowCount'] = $rowCount; $uploadedVideos = Video::getAllVideos("a", $user_id); +$uploadedTotalVideos = Video::getTotalVideos("a", $user_id); + +$totalPages = ceil($uploadedTotalVideos/$rowCount); + unset($_POST['sort']); +unset($_POST['rowCount']); +unset($_POST['current']); $publicOnly = true; if (User::isLogged() && $user_id == User::getId()) { $publicOnly = false; @@ -76,16 +92,16 @@ <?php echo $user->_getName(); ?>
-

- + getNameIdentificationBd(); - ?>

- - - -
+ ?> + + + +
getAbout())); ?>
@@ -108,109 +124,129 @@ ?>
- BigVideo = true; - $obj->Description = false; - include $global['systemRootPath'] . 'plugin/Gallery/view/BigVideo.php'; - unset($uploadedVideos[0]); - } - ?> + BigVideo = true; + $obj->Description = false; + include $global['systemRootPath'] . 'plugin/Gallery/view/BigVideo.php'; + unset($uploadedVideos[0]); + } + ?>
+
- -
+ +
-
+
@@ -221,103 +257,104 @@ function refreshPlayLists(container){