Updated charset html5

upload/search_result.php

@@ -78,10 +78,13 @@
 
 	if(mysql_clean(get('query'))) {
 		$squery = get('query');
+		$squery = strtolower($squery);
+		$squery = ucwords($squery);
+		assign('search_result', $squery);
 		if ($squery == 'clipbucket') {
 			subtitle("Awesomeness...!!");
 		} else {
-			subtitle($search->search_type[$type]['title'].' » '.mysql_clean(get('query')));
+			subtitle($search->search_type[$type]['title'].' » '.$squery);
 		}
 	}
 

upload/sitemap.php

@@ -13,49 +13,56 @@
 $videos = get_videos(array('limit'=>$limit,'active'=>'yes','order'=>'date_added DESC'));
 
 ?>
-<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:video="http://www.google.com/schemas/sitemap-video/1.1">
+<urlset 
+	xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" 
+	xmlns:video="http://www.google.com/schemas/sitemap-video/1.1" 
+	xmlns:image="https://www.google.com/schemas/sitemap-image/1.1">
+
+	<url>
+      		<loc><?=BASEURL ?></loc>
+	</url>
 <!-- by fjulio ( tangi @ clipbucket dev. ) -->
 <?php
     foreach($videos as $video)
 	{
 ?>
+
 <url>
 <loc><?=video_link($video)?></loc>
 <video:video>
-<video:content_loc><?=get_video_file($video)?></video:content_loc>
-<video:player_loc allow_embed="yes"><?=BASEURL ?>/player/old_players/embed_player.swf?file=<?=get_video_file($video)?></video:player_loc>
 <video:thumbnail_loc><?=get_thumb($video)?></video:thumbnail_loc>
 <video:title><![CDATA[<?=substr($video['title'],0,500)?>]]></video:title>
 <video:description><![CDATA[<?=substr($video['description'],0,300)?>]]></video:description>
+<video:player_loc allow_embed="yes"><?=get_video_file($video)?></video:player_loc>
+<video:duration>
+<?php echo round($video['duration']);
+?></video:duration>
 <video:rating><?php 
 $vrating = $video['rating'] / 2;
 $findcond = strpos($vrating,'.');
 if ($findcond == "1"){
     $firstrating = str_replace(',','.',$vrating);
     echo $firstrating;
 }
-else { echo $vrating.'.0'; }
-?></video:rating>
-<video:view_count><?=$video['views']?></video:view_count>
+else { echo $vrating.'.0'; }?>
+</video:rating>
+<video:view_count>
+<?=$video['views']?></video:view_count>
 <video:publication_date><?php
 echo cbdate("Y-m-d\TH:i:s",strtotime($video['date_added'])).'+00:00';
 ?></video:publication_date>
 <?php
 $vtags = strip_tags(tags($video['tags'],'video'));
 $vtableau = explode (",",$vtags);
-for($i=0;$i<sizeof($vtableau);$i++)
+for($i=0;$i<sizeof($vtableau) && $i<32;$i++)
     {
     echo '<video:tag><![CDATA['.trim($vtableau[$i]).']]></video:tag>';
     }
 ?>
 <video:category><?=strip_tags(categories($video['category'],'video'))?></video:category>
-<video:family_friendly>yes</video:family_friendly>
-<video:duration><?php
-echo round($video['duration']);
-?></video:duration>
 </video:video>
 </url>
 <?php
 	}
 ?>
-</urlset>
+</urlset>

upload/styles/cb_28/layout/blocks/channels.html

@@ -54,7 +54,7 @@ <h2>{$featured.username}</h2>
 {assign var='user_cover_tune' value=$userquery->getCover($user.userid)}
 
 <div class="channel-holder">
-	<a href="{$userquery->profile_link($user)}" id="user-{$user.userid}" class="user-block">
+	<a href="{$userquery->profile_link($user)}" id="user-{$user.userid}" class="user-block" title="{$user.username}">
 		<img class="avatar" src="{avatar details=$user size='m'}">
 		<h2>{$user.username}</h2>
 	</a>
@@ -160,4 +160,4 @@ <h2>{$user_data.username}</h2>
 			}
 		});
 	});
-</script>
+</script>

upload/styles/cb_28/layout/blocks/video.html

@@ -2,7 +2,7 @@
 <div class="item-video col-lg-3 col-md-3 col-sm-4 col-xs-6">
 	<div class="clearfix thumb-holder">
 		<a class="video-link" href="{videoLink($video)}" title="{$video.title|title}">
-			<img class="img-responsive" src="{getThumb vdetails=$video size=416x260 }">
+			<img class="img-responsive" src="{getThumb vdetails=$video size=416x260 }" alt="{$video.title|title}">
 		</a>
 		<img src="{$theme}/images/thumb-ratio.png" class="thumb-ratio" alt="">
 		<div class="item-footer">
@@ -14,8 +14,8 @@
 		</div>
 	</div>
 	<div class="clearfix video-info">
-		<h2 class="title"><a href="{videoLink($video)}">{$video.title|truncate:50}</a></h2>
-		<span class="author">by <a href="{$userquery->profile_link($video)}">{$video.username}</a></span>
+		<h2 class="title"><a href="{videoLink($video)}" title="{$video.title|title}">{$video.title|truncate:50}</a></h2>
+		<span class="author">by <a href="{$userquery->profile_link($video)}" title="{$video.username}">{$video.username}</a></span>
 		<div class="clearfix views-date">
 			<span>{$video.views}&nbsp;views</span>
 			<time class="date" datetime="2016-15-03">{$video.date_added|niceTime}</time>
@@ -27,7 +27,7 @@ <h2 class="title"><a href="{videoLink($video)}">{$video.title|truncate:50}</a></
 {if $display_type=='user_videos'}
 <div class="col-md-3  col-sm-4  col-xs-6">
     <a href="{videoLink($video)}" title="{$video.title|title}">
-        <img alt="{$video.title|title}" src="{getThumb vdetails=$video size='171x120'}" id="thumbs_{$video.videoid}"  title="{$video.title|title}"/>
+        <img src="{getThumb vdetails=$video size='171x120'}" id="thumbs_{$video.videoid}" alt="{$video.title|title}">
     </a>
     <p class="cbHomeVidDuration duration_view">
         {if $video.duration>1}

upload/styles/cb_28/layout/blocks/videos/video.html

@@ -9,7 +9,7 @@
 	</div> <!--VIDEO_THUMB END-->
 
 	<div class="details_block">
-		<strong class="title"><a href="{videoLink($pop_video)}">{$pop_video.title|truncate:50}</a></strong>
+		<strong class="title"><a href="{videoLink($pop_video)}" title="{$video.title|title}">{$pop_video.title|truncate:50}</a></strong>
 		<span class="author">{lang code="by"}&nbsp;<a href="{$userquery->profile_link($pop_video)}">{$pop_video.username}</a></span>
 		<div class="views-date">
 			<span>{$pop_video.views}&nbsp;{lang code="views"}</span>
@@ -21,7 +21,7 @@
 {if $display_type=='homeVideos'}
 	<div class="clearfix thumb-holder userAppending">
 		<a class="video-link" href="{videoLink($video)}" title="{$video.title|title}">
-			<img class="img-responsive" src="{getThumb vdetails=$video size=416x260 }">
+			<img class="img-responsive" src="{getThumb vdetails=$video size=416x260 }" alt="{$video.title|title}">
 		</a>
 		<img src="{$theme}/images/thumb-ratio.png" class="thumb-ratio" alt="{$video.broadcast}">
 
@@ -33,7 +33,7 @@
 
 	</div>
 	<div class="clearfix video-info">
-		<h2 class="title"><a href="{videoLink($video)}">{$video.title|truncate:50}</a></h2>
+		<h2 class="title"><a href="{videoLink($video)}" title="{$video.title|title}">{$video.title|truncate:50}</a></h2>
 		<span class="author">{lang code="by"}&nbsp;<a href="{$userquery->profile_link($video)}">{$video.username}</a></span>
 		<div class="clearfix views-date">
 			<span>{$video.views}&nbsp;{lang code="views"}</span>
@@ -81,8 +81,8 @@ <h2 class="title"><a href="{videoLink($video)}">{$video.title|truncate:50}</a></
 {if $display_type=='featuredVideos_sidebar'}
 	<div class="featured-video clearfix">
 		<div class="video_thumb">
-			<a href="{videoLink($video)}">
-				<img src="{getThumb vdetails=$video size=168x105}" {ANCHOR place="video_thumb" data=$video} class="img-responsive">
+			<a href="{videoLink($video)}" title="{$video.title|title}">
+				<img src="{getThumb vdetails=$video size=168x105}" alt="{$video.title|title}" {ANCHOR place="video_thumb" data=$video} class="img-responsive">
 				<time datetime="2016-15-03" class="duration">{if $video.duration>1}{$video.duration|SetTime}{else}00:00{/if}</time>
 			</a>
 			<img src="{$theme}/images/thumb-ratio.png" class="thumb-ratio" alt="">

upload/styles/cb_28/layout/blocks/view_channel/channel_header.html

@@ -63,7 +63,7 @@
 	</div>
 
 	<div class="profile-buttons clearfix">
-		<h2>{$user.username}</h2>
+		<h1>{$user.username}</h1>
 		<div class="btn-holder">
 			{if $user.userid != userid()}
 				<button id="report-user" class="btn btn-default">{lang code="report_usr"}</button>
@@ -82,4 +82,4 @@ <h2>{$user.username}</h2>
 			{/if}
 		</div>
 	</div>
-</div>
+</div>

upload/styles/cb_28/layout/global_header.html

@@ -1,13 +1,13 @@
-<!DOCTYPE HTML>
+<!DOCTYPE html>
 
-<html>
+<html lang="{$lang_obj->lang}">
 	<head>
 		{if in_dev()}
 			{$cache_buster=microtime(true)}
 		{else}
 			{$cache_buster=$Cbucket->version}
 		{/if}
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+		<meta charset="UTF-8">
 		<meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1, user-scalable=no">
 		<!-- ClipBucket v{$Cbucket->version} -->
 		<meta name="copyright" content="ClipBucket - Integrated Units 2007 - {$smarty.now|date_format:"%Y"}">
@@ -18,12 +18,18 @@
 		{if isset($ninja_fighting)}
             {ANCHOR place='seo_ninja'}
         {else}
-        	<meta name="keywords" content="{$Cbucket->configs.keywords}">
-			<meta name="description" content="{$Cbucket->configs.description}">
-			<meta name="distribution" content="global">
-
-
-			<title>{cbtitle}</title>
+
+		<link rel="canonical" href="{$baseurl}{$smarty.server.REQUEST_URI}">
+		{if $this_page == 'index'}<meta name="description" content="{$Cbucket->configs.description}">{/if}
+		{if $this_page == 'videos'}<meta name="description" content="Description for videos page.">{/if}
+		{if $this_page == 'watch_video'}<meta name="description" content="{$vdo.description}">{/if}
+		{if $this_page == 'channels'}<meta name="description" content="Description for channels page.">{/if}
+		{if $this_page == 'view_channel'}<meta name="description" content="{$p.profile_desc}">{/if}
+		{if $this_page == 'search_result'}<meta name="description" content="Watch {$search_result} videos.">{/if}
+
+		<meta name="distribution" content="global">
+
+		<title>{cbtitle}</title>
         {/if}
 
 		<link rel="stylesheet" href="{$theme}/css/bootstrap.min.css?cache={$cache_buster}">
@@ -114,4 +120,4 @@
 		{/if}
 	</head>
 
-
+	

upload/styles/cb_28/layout/header.html

@@ -32,12 +32,12 @@
 			<div class="header-holder">
 				<div class="navbar-header clearfix">
 
-					<h1 class="logo">
+					<div class="logo">
 						<a href="{$baseurl}">
 							<img src="{$theme}/images/logo.png" alt="cbtune" class="img-responsive">
 							<span>clipbucket</span>
 						</a>
-					</h1>
+					</div>
 
 					<button class="navbar-toggle" data-toggle="collapse" data-target="#bs-collapse">Menu<span class="icon-down-arrow"></span></button>
 

upload/styles/cb_28/layout/index.html

@@ -49,7 +49,7 @@
 			<!-- ************ EDITORS BLOCK END ************ -->
 			<!-- ******************************************* -->
 			<section class="clearfix featured-videos">
-				<h1>{lang code="featured_videos"}</h1>
+				<h2>{lang code="featured_videos"}</h2>
 				<div id="featured_vid_sec" class="clearfix row">
 
 				</div>
@@ -60,7 +60,7 @@ <h1>{lang code="featured_videos"}</h1>
 			</section>
 
 			<section class="clearfix videos">
-				<h1>{lang code="recent_videos"}</h1>
+				<h2>{lang code="recent_videos"}</h2>
 				<div id="recent_vids_sec" class="clearfix row">
 				</div>
 				<div id="recent_pre" class="clearfix"></div>
@@ -202,4 +202,4 @@ <h2 title="Playlists with most videos">{lang code="top_playlists"}</h2>
 	$(window).resize(function() {
 		editpickVideos();
 	});
-</script>
+</script>

upload/styles/cb_28/layout/signup.html

@@ -17,7 +17,7 @@
 			<div class="clearfix signin-block">
 				<div class="account-holder">
 					<form name="login_form" method="post" action="" id="login_form" class="user-form">
-						<h2>{lang code="login"}</h2>
+						<h1>{lang code="login"}</h1>
 						<div class="form-group">
 							{*<label for="login_username_sp">{lang code="Username"}</label>*}
 							<input type="text" id="login_username_sp" placeholder="{lang code='type_username_here'}"
@@ -66,7 +66,7 @@ <h2>{lang code='get_your_account'}</h2>
 						{$allow_registeration}
 					{else}
 					<form name="signup_form" id="signup_form" method="post" action="{$baseurl}/signup.php"  class="user-form custom-elements">
-						<h2>Signup!</h2>
+						<h1>Signup!</h1>
 						{foreach from=$required_fields item=field}
 							{if $field.type!='checkbox' && $field.type!='radiobutton'}
 								{$field.class='form-control'}
@@ -418,4 +418,4 @@ <h2>Signup!</h2>
 			width: 140px;
 			vertical-align: center;
 		}
-	</style>
+	</style>

upload/styles/cb_28/layout/videos.html

@@ -6,6 +6,9 @@
 			<div class="clearfix leaderboard-ad ad">
 				{AD place='ad_728x90'}
 			</div>
+
+			<h1>Videos List</h1>
+
 			{$categories = pullCategories()}
 
 			{assign var=sorting_links value=sorting_links()}
@@ -141,4 +144,4 @@ <h2>{lang code="featured_videos"}</h2>
 			root.find('.sub-menu:visible').hide();
 		});
 	});
-</script>
+</script>

upload/videos.php

@@ -59,11 +59,26 @@
 	$extra_params=NULL;
 	$tag='<li><a #params#>#page#</a><li>';
 	$pages->paginate($total_pages,$page,$link,$extra_params,$tag);
-	if (!$subtitle) {
-		$subtitle = 'Videos';
+
+	$sorting_links=sorting_links();
+	$time_links=time_links();
+
+	foreach($sorting_links as $na_me => $name){
+		if ($na_me == $_GET['sort']) 
+			$sort_name = $sorting_links[$na_me];
+	}
+
+	foreach($time_links as $na_me => $name){
+		if ($na_me == $_GET['time']) 
+			$sort_time = $time_links[$na_me];
 	}
+
+	if (!$_GET['seo_cat_name']) $_GET['seo_cat_name']='All Category';
+
+	$subtitle = $_GET['seo_cat_name'] .' &raquo; '. $sort_name .' &raquo; '. $sort_time;
+
 	subtitle(lang($subtitle));
 	array_val_assign($assign_arry);
 	template_files('videos.html');
 	display_it();
-?>
+?>