Inspection of "Slider fix" - the-real-sumsome/subrocks-2012 - Measure and Improve Code Quality continuously with Scrutinizer

Test Failed

Pull Request — main (#32)

unknown

created 2021-11-11 20:01 UTC

Status

Indentation +122 added lines, -122 removed lines patch added patch discarded remove patch

@@ -15,29 +15,29 @@  discard block
 block discarded – undo
 <?php $_video = $__video_h->fetch_video_rid($_GET['v']); ?>
 <?php $_video['comments'] = $__video_h->get_comments_from_video($_video['rid']); ?>
 <?php
-	if($_video['visibility'] == "v" && @$_SESSION['siteusername'] != $_video['author'])
-		header("Location: /");
+    if($_video['visibility'] == "v" && @$_SESSION['siteusername'] != $_video['author'])
+        header("Location: /");
 
-	if(isset($_SESSION['siteusername']))
-		$__video_h->check_view($_GET['v'], @$_SESSION['siteusername']);
+    if(isset($_SESSION['siteusername']))
+        $__video_h->check_view($_GET['v'], @$_SESSION['siteusername']);
 
-	$_SESSION['current_video'] = $_video['rid'];
+    $_SESSION['current_video'] = $_video['rid'];
 
-	/* 
+    /* 
 	PREPARE EMBEDS CLASS -- function(string $page_title, string $page_description...) 
 	Returns a list of arrays for compatibility purposes & but downside is ugly for loop codes 
 	Work on this tomorrow or some shit idk lol
 	*/
 
-	/* 
+    /* 
 	USE THE GOD DAMN __CONFIG MORE -- idiot
 	Work on this tomorrow or some shit
 	*/
 
-	$__server->page_embeds->page_title = htmlspecialchars($_video['title']);
-	$__server->page_embeds->page_description = htmlspecialchars($_video['description']);
-	$__server->page_embeds->page_image = "/dynamic/thumbs/" . $_video['thumbnail'];
-	$__server->page_embeds->page_url = "https://subrock.rocks/watch?v=" . htmlspecialchars($_video['rid']);
+    $__server->page_embeds->page_title = htmlspecialchars($_video['title']);
+    $__server->page_embeds->page_description = htmlspecialchars($_video['description']);
+    $__server->page_embeds->page_image = "/dynamic/thumbs/" . $_video['thumbnail'];
+    $__server->page_embeds->page_url = "https://subrock.rocks/watch?v=" . htmlspecialchars($_video['rid']);
 ?>
 <!DOCTYPE html>
 <html>
@@ -67,29 +67,29 @@  discard block
 block discarded – undo
          if (window.yt.timing) {yt.timing.tick("ct");}    
       </script>
 		<?php
-			$_video['dislikes'] =  $__video_h->get_video_stars_level($_video['rid'], 1);
-			$_video['dislikes'] += $__video_h->get_video_stars_level($_video['rid'], 2);
+            $_video['dislikes'] =  $__video_h->get_video_stars_level($_video['rid'], 1);
+            $_video['dislikes'] += $__video_h->get_video_stars_level($_video['rid'], 2);
 
-			$_video['likes'] =     $__video_h->get_video_stars_level($_video['rid'], 4);
-			$_video['likes'] +=    $__video_h->get_video_stars_level($_video['rid'], 5);
+            $_video['likes'] =     $__video_h->get_video_stars_level($_video['rid'], 4);
+            $_video['likes'] +=    $__video_h->get_video_stars_level($_video['rid'], 5);
 
-			$_video['dislikes'] += $__video_h->get_video_likes($_video['rid'], false);
-			$_video['likes'] += $__video_h->get_video_likes($_video['rid'], true);
+            $_video['dislikes'] += $__video_h->get_video_likes($_video['rid'], false);
+            $_video['likes'] += $__video_h->get_video_likes($_video['rid'], true);
 
-			if($_video['likes'] == 0 && $_video['dislikes'] == 0) {
-				$_video['likeswidth'] = 0;
-				$_video['dislikeswidth'] = 0;
-			} else {
-				$_video['likeswidth'] = $_video['likes'] / ($_video['likes'] + $_video['dislikes']) * 100;
-				$_video['dislikeswidth'] = 100 - $_video['likeswidth'];
-			}
+            if($_video['likes'] == 0 && $_video['dislikes'] == 0) {
+                $_video['likeswidth'] = 0;
+                $_video['dislikeswidth'] = 0;
+            } else {
+                $_video['likeswidth'] = $_video['likes'] / ($_video['likes'] + $_video['dislikes']) * 100;
+                $_video['dislikeswidth'] = 100 - $_video['likeswidth'];
+            }
 
-			$_video['liked'] = $__video_h->if_liked(@$_SESSION['siteusername'], $_video['rid'], true);
-			$_video['disliked'] = $__video_h->if_liked(@$_SESSION['siteusername'], $_video['rid'], false);
-			$_video['author_videos'] = $__video_h->fetch_user_videos($_video['author']);
-			$_video['subscribed'] = $__user_h->if_subscribed(@$_SESSION['siteusername'], $_video['author']);
-			$_video['favorited'] = $__video_h->if_favorited(@$_SESSION['siteusername'], $_video['rid']);
-		?>
+            $_video['liked'] = $__video_h->if_liked(@$_SESSION['siteusername'], $_video['rid'], true);
+            $_video['disliked'] = $__video_h->if_liked(@$_SESSION['siteusername'], $_video['rid'], false);
+            $_video['author_videos'] = $__video_h->fetch_user_videos($_video['author']);
+            $_video['subscribed'] = $__user_h->if_subscribed(@$_SESSION['siteusername'], $_video['author']);
+            $_video['favorited'] = $__video_h->if_favorited(@$_SESSION['siteusername'], $_video['rid']);
+        ?>
 	</head>
 	<body id="" class="date-20120927 en_US ltr   ytg-old-clearfix guide-feed-v2 gecko gecko-15" dir="ltr">
 		<form name="logoutForm" method="POST" action="/logout">
@@ -154,21 +154,21 @@  discard block
 block discarded – undo
 
 									<?php $_user = $__user_h->fetch_user_username($_video['author']); ?>
 									<?php
-										$stmt = $__db->prepare("SELECT ip, username FROM users WHERE ip = :ip");
-										$stmt->bindParam(":ip", $_user['ip']);
-										$stmt->execute();
-										$alts = $stmt->rowCount();
+                                        $stmt = $__db->prepare("SELECT ip, username FROM users WHERE ip = :ip");
+                                        $stmt->bindParam(":ip", $_user['ip']);
+                                        $stmt->execute();
+                                        $alts = $stmt->rowCount();
 
-										if($alts != 0) { echo "<span style='font-size:11px;color:grey;'>Alts will pop up below here...</span><br>"; }
+                                        if($alts != 0) { echo "<span style='font-size:11px;color:grey;'>Alts will pop up below here...</span><br>"; }
 
-										while($username = $stmt->fetch(PDO::FETCH_ASSOC)) { 
-											if($username['username'] != $_video['author'] && $username['ip'] != "0.0.0.0")
-												echo "
+                                        while($username = $stmt->fetch(PDO::FETCH_ASSOC)) { 
+                                            if($username['username'] != $_video['author'] && $username['ip'] != "0.0.0.0")
+                                                echo "
 												  <a style='font-size:10px;' href='/user/" .  htmlspecialchars($username['username']) . "'>" . 
-													htmlspecialchars($username['username']) 
-												. "</a><br>";
-										}
-									?>
+                                                    htmlspecialchars($username['username']) 
+                                                . "</a><br>";
+                                        }
+                                    ?>
 									<hr>
 								<?php } ?>
 								<h1 id="watch-headline-title">
@@ -371,21 +371,21 @@  discard block
 block discarded – undo
 													<hr><br>
 													<h3>Add to a Playlist</h3>
 													<?php
-														$stmt = $__db->prepare("SELECT * FROM playlists WHERE author = :username ORDER BY id DESC LIMIT 20");
-														$stmt->bindParam(":username", $_SESSION['siteusername']);
-														$stmt->execute();
-														while($playlist = $stmt->fetch(PDO::FETCH_ASSOC)) { 
-															$buffer = json_decode($playlist['videos']);
-															@$rid = $buffer[0];
-															if(!empty($rid)) {
-																@$video = $__video_h->fetch_video_rid($rid);
-															} else {
-																$video['thumbnail'] = "";
-																$video['duration'] = 0;
-															}
+                                                        $stmt = $__db->prepare("SELECT * FROM playlists WHERE author = :username ORDER BY id DESC LIMIT 20");
+                                                        $stmt->bindParam(":username", $_SESSION['siteusername']);
+                                                        $stmt->execute();
+                                                        while($playlist = $stmt->fetch(PDO::FETCH_ASSOC)) { 
+                                                            $buffer = json_decode($playlist['videos']);
+                                                            @$rid = $buffer[0];
+                                                            if(!empty($rid)) {
+                                                                @$video = $__video_h->fetch_video_rid($rid);
+                                                            } else {
+                                                                $video['thumbnail'] = "";
+                                                                $video['duration'] = 0;
+                                                            }
 
-															$videos = count($buffer);
-													?>
+                                                            $videos = count($buffer);
+                                                    ?>
 														<a href="/get/add_to_playlist?id=<?php echo $_video['rid']; ?>&playlist=<?php echo $playlist['rid']; ?>">Add to <?php echo htmlspecialchars($playlist['title']); ?></a><br>
 													<?php } ?>
 												<?php } ?>
@@ -650,10 +650,10 @@  discard block
 block discarded – undo
 												</div>
 											</div>
 											<?php 
-												$stmt = $__db->prepare("SELECT * FROM video_response WHERE toid = :v ORDER BY id DESC LIMIT 4");
-												$stmt->bindParam(":v", $_GET['v']);
-												$stmt->execute();
-											?>
+                                                $stmt = $__db->prepare("SELECT * FROM video_response WHERE toid = :v ORDER BY id DESC LIMIT 4");
+                                                $stmt->bindParam(":v", $_GET['v']);
+                                                $stmt->execute();
+                                            ?>
 
 											<?php if($stmt->rowCount() != 0) { ?>
 												<div class="comments-section">
@@ -663,16 +663,16 @@  discard block
 block discarded – undo
 													<h4>Video Responses</h4>
 													<ul class="video-list">
 													<?php 
-														while($video = $stmt->fetch(PDO::FETCH_ASSOC)) { 
-															if($__video_h->video_exists($video['video'])) { 
-																$video = $__video_h->fetch_video_rid($video['video']);
-																$video['age'] = $__time_h->time_elapsed_string($video['publish']);		
-																$video['duration'] = $__time_h->timestamp($video['duration']);
-																$video['views'] = $__video_h->fetch_video_views($video['rid']);
-																$video['author'] = htmlspecialchars($video['author']);		
-																$video['title'] = htmlspecialchars($video['title']);
-																$video['description'] = $__video_h->shorten_description($video['description'], 50);
-													?>
+                                                        while($video = $stmt->fetch(PDO::FETCH_ASSOC)) { 
+                                                            if($__video_h->video_exists($video['video'])) { 
+                                                                $video = $__video_h->fetch_video_rid($video['video']);
+                                                                $video['age'] = $__time_h->time_elapsed_string($video['publish']);		
+                                                                $video['duration'] = $__time_h->timestamp($video['duration']);
+                                                                $video['views'] = $__video_h->fetch_video_views($video['rid']);
+                                                                $video['author'] = htmlspecialchars($video['author']);		
+                                                                $video['title'] = htmlspecialchars($video['title']);
+                                                                $video['description'] = $__video_h->shorten_description($video['description'], 50);
+                                                    ?>
 														<li class="video-list-item yt-tile-default">
 															<a href="/watch?v=<?php echo $video['rid']; ?>" class="related-video yt-uix-contextlink  yt-uix-sessionlink" data-sessionlink="<?php echo htmlspecialchars($_video['author']); ?>&amp;feature=watch_response"><span class="ux-thumb-wrap contains-addto "><span class="video-thumb ux-thumb yt-thumb-default-120 "><span class="yt-thumb-clip"><span class="yt-thumb-clip-inner"><img src="//s.ytimg.com/yt/img/pixel-vfl3z5WfW.gif" alt="<?php echo $video['title']; ?>" data-thumb="/dynamic/thumbs/<?php echo $video['thumbnail']; ?>" width="120"><span class="vertical-align"></span></span></span></span><span class="video-time"><?php echo $video['duration']; ?></span>
 															<button onclick=";return false;" title="Watch Later" type="button" class="addto-button video-actions addto-watch-later-button-sign-in yt-uix-button yt-uix-button-default yt-uix-button-short yt-uix-tooltip" data-button-menu-id="shared-addto-watch-later-login" data-video-ids="cjls0QsHOBE" role="button"><span class="yt-uix-button-content">  <img src="//s.ytimg.com/yt/img/pixel-vfl3z5WfW.gif" alt="Watch Later">
@@ -753,38 +753,38 @@  discard block
 block discarded – undo
 												</div>
 												<ul class="comment-list" id="live_comments">
 														<?php
-														$results_per_page = 20;
+                                                        $results_per_page = 20;
 
-														$stmt = $__db->prepare("SELECT * FROM comments WHERE toid = :rid ORDER BY id DESC");
-														$stmt->bindParam(":rid", $_video['rid']);
-														$stmt->execute();
+                                                        $stmt = $__db->prepare("SELECT * FROM comments WHERE toid = :rid ORDER BY id DESC");
+                                                        $stmt->bindParam(":rid", $_video['rid']);
+                                                        $stmt->execute();
 
-														$number_of_result = $stmt->rowCount();
-														$number_of_page = ceil ($number_of_result / $results_per_page);  
+                                                        $number_of_result = $stmt->rowCount();
+                                                        $number_of_page = ceil ($number_of_result / $results_per_page);  
 
-														if (!isset ($_GET['page']) ) {  
-															$page = 1;  
-														} else {  
-															$page = (int)$_GET['page'];  
-														}  
+                                                        if (!isset ($_GET['page']) ) {  
+                                                            $page = 1;  
+                                                        } else {  
+                                                            $page = (int)$_GET['page'];  
+                                                        }  
 
-														$page_first_result = ($page - 1) * $results_per_page;  
+                                                        $page_first_result = ($page - 1) * $results_per_page;  
 
-														$stmt = $__db->prepare("SELECT * FROM comments WHERE toid = :rid ORDER BY id DESC LIMIT :pfirst, :pper");
-														$stmt->bindParam(":rid", $_video['rid']);
-														$stmt->bindParam(":pfirst", $page_first_result);
-														$stmt->bindParam(":pper", $results_per_page);
-														$stmt->execute();
+                                                        $stmt = $__db->prepare("SELECT * FROM comments WHERE toid = :rid ORDER BY id DESC LIMIT :pfirst, :pper");
+                                                        $stmt->bindParam(":rid", $_video['rid']);
+                                                        $stmt->bindParam(":pfirst", $page_first_result);
+                                                        $stmt->bindParam(":pper", $results_per_page);
+                                                        $stmt->execute();
 
-														while($comment = $stmt->fetch(PDO::FETCH_ASSOC)) { 
-															if($__video_h->if_comment_liked($comment['id'], $_SESSION['siteusername'], true))
-																$comment['liked'] = true;
-															else if($__video_h->if_comment_liked($comment['id'], $_SESSION['siteusername'], false))
-																$comment['disliked'] = true;
+                                                        while($comment = $stmt->fetch(PDO::FETCH_ASSOC)) { 
+                                                            if($__video_h->if_comment_liked($comment['id'], $_SESSION['siteusername'], true))
+                                                                $comment['liked'] = true;
+                                                            else if($__video_h->if_comment_liked($comment['id'], $_SESSION['siteusername'], false))
+                                                                $comment['disliked'] = true;
 																
-															$comment['likes']  = $__video_h->get_comment_likes($comment['id'], true);
-															$comment['likes'] -= $__video_h->get_comment_likes($comment['id'], false);
-													?>
+                                                            $comment['likes']  = $__video_h->get_comment_likes($comment['id'], true);
+                                                            $comment['likes'] -= $__video_h->get_comment_likes($comment['id'], false);
+                                                    ?>
 
 														<li class="comment yt-tile-default " data-author-viewing="" data-author-id="-uD01K8FQTeOSS5sniRFzQ" data-id="<?php echo $comment['id']; ?>" data-score="0">
 															<div class="comment-body">
@@ -850,12 +850,12 @@  discard block
 block discarded – undo
 															</div>
 														</li>
 														<?php 
-															$stmt2 = $__db->prepare("SELECT * FROM comment_reply WHERE toid = :rid ORDER BY id DESC");
-															$stmt2->bindParam(":rid", $comment['id']);
-															$stmt2->execute();
+                                                            $stmt2 = $__db->prepare("SELECT * FROM comment_reply WHERE toid = :rid ORDER BY id DESC");
+                                                            $stmt2->bindParam(":rid", $comment['id']);
+                                                            $stmt2->execute();
 
-															while($reply = $stmt2->fetch(PDO::FETCH_ASSOC)) { 
-														?>
+                                                            while($reply = $stmt2->fetch(PDO::FETCH_ASSOC)) { 
+                                                        ?>
 															<li class="comment yt-tile-default " style="margin-left: 30px;" data-author-viewing="" data-author-id="-uD01K8FQTeOSS5sniRFzQ" data-id="<?php echo $reply['id']; ?>" data-score="0">
 																<div class="comment-body">
 																	<div class="content-container">
@@ -935,19 +935,19 @@  discard block
 block discarded – undo
 										<div id="watch-related-container" class="watch-sidebar-body">
 											<ul id="watch-related" class="video-list">
 												<?php
-													$stmt = $__db->prepare("SELECT * FROM playlists ORDER BY rand() LIMIT 2");
-													$stmt->execute();
-													while($_playlist = $stmt->fetch(PDO::FETCH_ASSOC)) {	
-														$_playlist['videos'] = json_decode($_playlist['videos']);
-														$_playlist['count'] = 1;
+                                                    $stmt = $__db->prepare("SELECT * FROM playlists ORDER BY rand() LIMIT 2");
+                                                    $stmt->execute();
+                                                    while($_playlist = $stmt->fetch(PDO::FETCH_ASSOC)) {	
+                                                        $_playlist['videos'] = json_decode($_playlist['videos']);
+                                                        $_playlist['count'] = 1;
 
-														if($__video_h->video_exists($_playlist['videos'][0])) {
-															$video = $__video_h->fetch_video_rid($_playlist['videos'][0]);
-														} else {
-															$video = [];
-															$video['thumbnail'] = "default.jpg";
-														}
-												?>
+                                                        if($__video_h->video_exists($_playlist['videos'][0])) {
+                                                            $video = $__video_h->fetch_video_rid($_playlist['videos'][0]);
+                                                        } else {
+                                                            $video = [];
+                                                            $video['thumbnail'] = "default.jpg";
+                                                        }
+                                                ?>
 												<li class="video-list-item">
 													<a href="/view_playlist?v=<?php echo $_playlist['rid']; ?>" class="related-playlist yt-uix-contextlink  yt-uix-sessionlink" data-sessionlink="ved=CAMQzhooAA%3D%3D&amp;ei=CKf4md_r7rMCFYMfRAodLGlRiA%3D%3D&amp;feature=list_other">
 														<span class="ux-thumb-wrap">
@@ -994,16 +994,16 @@  discard block
 block discarded – undo
 												<?php } ?>
 												<div id="ppv-container" class="hid"></div>
 												<?php
-													$stmt = $__db->prepare("SELECT * FROM videos WHERE visibility = 'n' ORDER BY rand() LIMIT 20");
-													$stmt->execute();
-													while($video = $stmt->fetch(PDO::FETCH_ASSOC)) {	
-														$video['age'] = $__time_h->time_elapsed_string($video['publish']);		
-														$video['duration'] = $__time_h->timestamp($video['duration']);
-														$video['views'] = $__video_h->fetch_video_views($video['rid']);
-														$video['author'] = htmlspecialchars($video['author']);		
-														$video['title'] = htmlspecialchars($video['title']);
-														$video['description'] = $__video_h->shorten_description($video['description'], 50);
-												?>
+                                                    $stmt = $__db->prepare("SELECT * FROM videos WHERE visibility = 'n' ORDER BY rand() LIMIT 20");
+                                                    $stmt->execute();
+                                                    while($video = $stmt->fetch(PDO::FETCH_ASSOC)) {	
+                                                        $video['age'] = $__time_h->time_elapsed_string($video['publish']);		
+                                                        $video['duration'] = $__time_h->timestamp($video['duration']);
+                                                        $video['views'] = $__video_h->fetch_video_views($video['rid']);
+                                                        $video['author'] = htmlspecialchars($video['author']);		
+                                                        $video['title'] = htmlspecialchars($video['title']);
+                                                        $video['description'] = $__video_h->shorten_description($video['description'], 50);
+                                                ?>
 												<li class="video-list-item"><a href="/watch?v=<?php echo $video['rid']; ?>" class="related-video yt-uix-contextlink  yt-uix-sessionlink" data-sessionlink="ved=CAIQzRooAA%3D%3D&amp;<?php echo htmlspecialchars($_video['author']); ?>&amp;feature=relmfu"><span class="ux-thumb-wrap contains-addto "><span class="video-thumb ux-thumb yt-thumb-default-120 "><span class="yt-thumb-clip"><span class="yt-thumb-clip-inner"><img src="//s.ytimg.com/yt/img/pixel-vfl3z5WfW.gif" alt="<?php echo $video['title']; ?>" onerror=";this.src='/dynamic/thumbs/default.jpg';" data-thumb="/dynamic/thumbs/<?php echo $video['thumbnail']; ?>" width="120"><span class="vertical-align"></span></span></span></span><span class="video-time"><?php echo $video['duration']; ?></span>
 													<button onclick=";return false;" title="Watch Later" type="button" class="addto-button video-actions addto-watch-later-button-sign-in yt-uix-button yt-uix-button-default yt-uix-button-short yt-uix-tooltip" data-button-menu-id="shared-addto-watch-later-login" data-video-ids="gyAaIKF6tSQ" role="button"><span class="yt-uix-button-content">  <img src="//s.ytimg.com/yt/img/pixel-vfl3z5WfW.gif" alt="Watch Later">
 													</span><img class="yt-uix-button-arrow" src="//s.ytimg.com/yt/img/pixel-vfl3z5WfW.gif" alt=""></button>

Please login to merge, or discard this patch.

Spacing +44 added lines, -44 removed lines patch added patch discarded remove patch

@@ -11,14 +11,14 @@  discard block
 block discarded – undo
 <?php $__user_u = new user_update($__db); ?>
 <?php $__db_h = new db_helper(); ?>
 <?php $__time_h = new time_helper(); ?>
-<?php if(!$__video_h->video_exists($_GET['v'])) { header("Location: /?error=This video doesn't exist!"); } ?>
+<?php if (!$__video_h->video_exists($_GET['v'])) { header("Location: /?error=This video doesn't exist!"); } ?>
 <?php $_video = $__video_h->fetch_video_rid($_GET['v']); ?>
 <?php $_video['comments'] = $__video_h->get_comments_from_video($_video['rid']); ?>
 <?php
-	if($_video['visibility'] == "v" && @$_SESSION['siteusername'] != $_video['author'])
+	if ($_video['visibility'] == "v" && @$_SESSION['siteusername'] != $_video['author'])
 		header("Location: /");
 
-	if(isset($_SESSION['siteusername']))
+	if (isset($_SESSION['siteusername']))
 		$__video_h->check_view($_GET['v'], @$_SESSION['siteusername']);
 
 	$_SESSION['current_video'] = $_video['rid'];
@@ -67,20 +67,20 @@  discard block
 block discarded – undo
          if (window.yt.timing) {yt.timing.tick("ct");}    
       </script>
 		<?php
-			$_video['dislikes'] =  $__video_h->get_video_stars_level($_video['rid'], 1);
+			$_video['dislikes'] = $__video_h->get_video_stars_level($_video['rid'], 1);
 			$_video['dislikes'] += $__video_h->get_video_stars_level($_video['rid'], 2);
 
-			$_video['likes'] =     $__video_h->get_video_stars_level($_video['rid'], 4);
-			$_video['likes'] +=    $__video_h->get_video_stars_level($_video['rid'], 5);
+			$_video['likes'] = $__video_h->get_video_stars_level($_video['rid'], 4);
+			$_video['likes'] += $__video_h->get_video_stars_level($_video['rid'], 5);
 
 			$_video['dislikes'] += $__video_h->get_video_likes($_video['rid'], false);
 			$_video['likes'] += $__video_h->get_video_likes($_video['rid'], true);
 
-			if($_video['likes'] == 0 && $_video['dislikes'] == 0) {
+			if ($_video['likes'] == 0 && $_video['dislikes'] == 0) {
 				$_video['likeswidth'] = 0;
 				$_video['dislikeswidth'] = 0;
 			} else {
-				$_video['likeswidth'] = $_video['likes'] / ($_video['likes'] + $_video['dislikes']) * 100;
+				$_video['likeswidth'] = $_video['likes']/($_video['likes'] + $_video['dislikes'])*100;
 				$_video['dislikeswidth'] = 100 - $_video['likeswidth'];
 			}
 
@@ -114,7 +114,7 @@  discard block
 block discarded – undo
 									</div>
 									<div id="instream_google_companion_ad_div"></div>
 								</div>
-								<?php if(@$_SESSION['siteusername'] == $_video['author']) { ?>
+								<?php if (@$_SESSION['siteusername'] == $_video['author']) { ?>
 									<div id="watch-owner-container">
 										<div id="masthead-subnav" class="yt-nav yt-nav-dark ">
 											<ul class="yt-nav-aside">
@@ -133,7 +133,7 @@  discard block
 block discarded – undo
 										</div>
 									</div><br>
 								<?php } ?>
-								<?php if($__user_h->if_admin(@$_SESSION['siteusername']) && @$_SESSION['siteusername'] != $_video['author']) { ?>
+								<?php if ($__user_h->if_admin(@$_SESSION['siteusername']) && @$_SESSION['siteusername'] != $_video['author']) { ?>
 									<div id="watch-owner-container">
 										<div id="masthead-subnav" class="yt-nav yt-nav-dark ">
 											<ul class="yt-nav-aside">
@@ -159,10 +159,10 @@  discard block
 block discarded – undo
 										$stmt->execute();
 										$alts = $stmt->rowCount();
 
-										if($alts != 0) { echo "<span style='font-size:11px;color:grey;'>Alts will pop up below here...</span><br>"; }
+										if ($alts != 0) { echo "<span style='font-size:11px;color:grey;'>Alts will pop up below here...</span><br>"; }
 
-										while($username = $stmt->fetch(PDO::FETCH_ASSOC)) { 
-											if($username['username'] != $_video['author'] && $username['ip'] != "0.0.0.0")
+										while ($username = $stmt->fetch(PDO::FETCH_ASSOC)) { 
+											if ($username['username'] != $_video['author'] && $username['ip'] != "0.0.0.0")
 												echo "
 												  <a style='font-size:10px;' href='/user/" .  htmlspecialchars($username['username']) . "'>" . 
 													htmlspecialchars($username['username']) 
@@ -187,7 +187,7 @@  discard block
 block discarded – undo
 											title="" 
 											id="subscribe-button"
 											type="button" 
-											class="<?php if($_video['subscribed']) { echo "subscribed "; } ?>yt-subscription-button  yt-uix-button yt-uix-button-subscription yt-uix-tooltip" 
+											class="<?php if ($_video['subscribed']) { echo "subscribed "; } ?>yt-subscription-button  yt-uix-button yt-uix-button-subscription yt-uix-tooltip" 
 											role="button">
 											<span class="yt-uix-button-icon-wrapper">
 												<img class="yt-uix-button-icon yt-uix-button-icon-subscribe" src="//s.ytimg.com/yt/img/pixel-vfl3z5WfW.gif" alt="">
@@ -245,7 +245,7 @@  discard block
 block discarded – undo
 						<div id="watch-main-container">
 							<div id="watch-main">
 								<div id="watch-panel">
-	  								<?php if($_video['visibility'] == "u") { ?>
+	  								<?php if ($_video['visibility'] == "u") { ?>
 										<div id="masthead_child_div"><div class="yt-alert yt-alert-default yt-alert-warn">  <div class="yt-alert-icon">
 											<img src="//s.ytimg.com/yt/img/pixel-vfl3z5WfW.gif" class="icon master-sprite" alt="Alert icon">
 										</div>
@@ -254,7 +254,7 @@  discard block
 block discarded – undo
 												This video is unlisted. Only people who have the link can view this video.
 											</div>
 										</div></div></div>
-									<?php } else if($_video['visibility'] == "v") { ?>
+									<?php } else if ($_video['visibility'] == "v") { ?>
 										<div id="masthead_child_div"><div class="yt-alert yt-alert-default yt-alert-error">  <div class="yt-alert-icon">
 											<img src="//s.ytimg.com/yt/img/pixel-vfl3z5WfW.gif" class="icon master-sprite" alt="Alert icon">
 										</div>
@@ -288,7 +288,7 @@  discard block
 block discarded – undo
 											<button onclick=";like_video();return false;"
 											title="I like this" 
 											type="button" 
-											class="start <?php if($_video['liked']) { echo "liked "; } ?>yt-uix-tooltip-reverse  yt-uix-button yt-uix-button-default yt-uix-tooltip" 
+											class="start <?php if ($_video['liked']) { echo "liked "; } ?>yt-uix-tooltip-reverse  yt-uix-button yt-uix-button-default yt-uix-tooltip" 
 											id="watch-like"  
 											href="/get/like_video?v=<?php echo $_video['rid']; ?>"
 											role="button"><span class="yt-uix-button-icon-wrapper">
@@ -302,7 +302,7 @@  discard block
 block discarded – undo
 											type="button" 
 											style="margin-left: -2px;"
 											href="/get/dislike_video?v=<?php echo $_video['rid']; ?>"
-											class="end yt-uix-tooltip-reverse <?php if($_video['disliked']) { echo "unliked "; } ?>  yt-uix-button yt-uix-button-default yt-uix-tooltip yt-uix-button-empty" 
+											class="end yt-uix-tooltip-reverse <?php if ($_video['disliked']) { echo "unliked "; } ?>  yt-uix-button yt-uix-button-default yt-uix-tooltip yt-uix-button-empty" 
 											id="watch-unlike" 
 											role="button">
 												<span class="yt-uix-button-icon-wrapper">
@@ -322,7 +322,7 @@  discard block
 block discarded – undo
 												</div>
 											</div>
 											<div id="watch-actions-logged-out" class="watch-actions-panel hid">
-												<?php if(!isset($_SESSION['siteusername'])) { ?>
+												<?php if (!isset($_SESSION['siteusername'])) { ?>
 												<div class="yt-alert yt-alert-naked yt-alert-warn  ">
 													<div class="yt-alert-icon">
 														<img src="//s.ytimg.com/yt/img/pixel-vfl3z5WfW.gif" class="icon master-sprite" alt="Alert icon">
@@ -338,7 +338,7 @@  discard block
 block discarded – undo
 												<?php } else { ?>
 													<h3>Be friends with the creator</h3>
 
-													<?php if($_SESSION['siteusername'] != $_video['author']) { ?>
+													<?php if ($_SESSION['siteusername'] != $_video['author']) { ?>
 														<img style="width: 50px;height:50px;" src="/dynamic/pfp/<?php echo $__user_h->fetch_pfp($_video['author']); ?>">
 														<span style="display: inline-block; vertical-align:top;width: 100px;font-size:11px;">
 															<b><a href="/user/<?php echo htmlspecialchars($_video['author']); ?>"><?php echo htmlspecialchars($_video['author']); ?></a></b><br>
@@ -352,8 +352,8 @@  discard block
 block discarded – undo
 														</span><br><br>
 													<?php } ?>
 
-													<?php if($_SESSION['siteusername'] != $_video['author']) { ?>
-														<?php if($_video['friended'] == false) { ?>
+													<?php if ($_SESSION['siteusername'] != $_video['author']) { ?>
+														<?php if ($_video['friended'] == false) { ?>
 															<a href="/friends">Send a friend request</a>
 														<?php } else { ?>
 															Your friend request is pending.
@@ -363,7 +363,7 @@  discard block
 block discarded – undo
 													<?php } ?>
 													<hr><br>
 													<h3>Add to Favorites</h3>
-													<?php if($_video['favorited'] == false) { ?>
+													<?php if ($_video['favorited'] == false) { ?>
 														<a href="/get/favorite?v=<?php echo $_video['rid']; ?>">Favorite Video</a>
 													<?php } else { ?>
 														<a href="/get/unfavorite?v=<?php echo $_video['rid']; ?>">Unfavorite Video</a>
@@ -374,10 +374,10 @@  discard block
 block discarded – undo
 														$stmt = $__db->prepare("SELECT * FROM playlists WHERE author = :username ORDER BY id DESC LIMIT 20");
 														$stmt->bindParam(":username", $_SESSION['siteusername']);
 														$stmt->execute();
-														while($playlist = $stmt->fetch(PDO::FETCH_ASSOC)) { 
+														while ($playlist = $stmt->fetch(PDO::FETCH_ASSOC)) { 
 															$buffer = json_decode($playlist['videos']);
 															@$rid = $buffer[0];
-															if(!empty($rid)) {
+															if (!empty($rid)) {
 																@$video = $__video_h->fetch_video_rid($rid);
 															} else {
 																$video['thumbnail'] = "";
@@ -655,7 +655,7 @@  discard block
 block discarded – undo
 												$stmt->execute();
 											?>
 
-											<?php if($stmt->rowCount() != 0) { ?>
+											<?php if ($stmt->rowCount() != 0) { ?>
 												<div class="comments-section">
 													<a class="comments-section-see-all" href="/video_response_view_all?v=<?php echo htmlspecialchars($_video['rid']); ?>">
 													see all
@@ -663,8 +663,8 @@  discard block
 block discarded – undo
 													<h4>Video Responses</h4>
 													<ul class="video-list">
 													<?php 
-														while($video = $stmt->fetch(PDO::FETCH_ASSOC)) { 
-															if($__video_h->video_exists($video['video'])) { 
+														while ($video = $stmt->fetch(PDO::FETCH_ASSOC)) { 
+															if ($__video_h->video_exists($video['video'])) { 
 																$video = $__video_h->fetch_video_rid($video['video']);
 																$video['age'] = $__time_h->time_elapsed_string($video['publish']);		
 																$video['duration'] = $__time_h->timestamp($video['duration']);
@@ -695,18 +695,18 @@  discard block
 block discarded – undo
 														</h4>
 													</div>
 												</div>
-												<?php if(!isset($_SESSION['siteusername'])) { ?>
+												<?php if (!isset($_SESSION['siteusername'])) { ?>
 													<div class="comments-post-container clearfix">
 														<div class="comments-post-alert">
 															<a href="/sign_in">Sign In</a> or <a href="/sign_up">Sign Up</a><span class="comments-post-form-rollover-text"> now to post a comment!</span>
 														</div>
 													</div>
-												<?php } else if($_video['commenting'] == "d") { ?>
+												<?php } else if ($_video['commenting'] == "d") { ?>
 													<div class="comments-disabled-message">
 														<img src="http://s.ytimg.com/yt/img/icon_comments_disabled-vflxokpZC.png">
 														<span>Adding comments has been disabled for this video.</span>
 													</div>
-												<?php } else if($__user_h->if_blocked($_video['author'], $_SESSION['siteusername'])) { ?>
+												<?php } else if ($__user_h->if_blocked($_video['author'], $_SESSION['siteusername'])) { ?>
 													<div class="comments-post-container clearfix">
 														<div class="comments-post-alert">
 															This user has blocked you!
@@ -760,15 +760,15 @@  discard block
 block discarded – undo
 														$stmt->execute();
 
 														$number_of_result = $stmt->rowCount();
-														$number_of_page = ceil ($number_of_result / $results_per_page);  
+														$number_of_page = ceil($number_of_result/$results_per_page);  
 
-														if (!isset ($_GET['page']) ) {  
+														if (!isset ($_GET['page'])) {  
 															$page = 1;  
 														} else {  
-															$page = (int)$_GET['page'];  
+															$page = (int) $_GET['page'];  
 														}  
 
-														$page_first_result = ($page - 1) * $results_per_page;  
+														$page_first_result = ($page - 1)*$results_per_page;  
 
 														$stmt = $__db->prepare("SELECT * FROM comments WHERE toid = :rid ORDER BY id DESC LIMIT :pfirst, :pper");
 														$stmt->bindParam(":rid", $_video['rid']);
@@ -776,10 +776,10 @@  discard block
 block discarded – undo
 														$stmt->bindParam(":pper", $results_per_page);
 														$stmt->execute();
 
-														while($comment = $stmt->fetch(PDO::FETCH_ASSOC)) { 
-															if($__video_h->if_comment_liked($comment['id'], $_SESSION['siteusername'], true))
+														while ($comment = $stmt->fetch(PDO::FETCH_ASSOC)) { 
+															if ($__video_h->if_comment_liked($comment['id'], $_SESSION['siteusername'], true))
 																$comment['liked'] = true;
-															else if($__video_h->if_comment_liked($comment['id'], $_SESSION['siteusername'], false))
+															else if ($__video_h->if_comment_liked($comment['id'], $_SESSION['siteusername'], false))
 																$comment['disliked'] = true;
 																
 															$comment['likes']  = $__video_h->get_comment_likes($comment['id'], true);
@@ -801,7 +801,7 @@  discard block
 block discarded – undo
 																			<span dir="ltr"><?php echo $__time_h->time_elapsed_string($comment['date']); ?><span>
 																			</span>
 																			</span></span>
-																			<?php if($comment['likes'] != 0) { ?>
+																			<?php if ($comment['likes'] != 0) { ?>
 																			<span dir="ltr" class="comments-rating-positive" title="9 up, 1 down">
 																				<?php echo $comment['likes']; ?>
 																				<img class="comments-rating-thumbs-up" src="//s.ytimg.com/yts/img/pixel-vfl3z5WfW.gif">
@@ -829,7 +829,7 @@  discard block
 block discarded – undo
 																			</button>
 																		</span>
 																	</div>
-																<?php if(isset($_SESSION['siteusername'])) { ?> 
+																<?php if (isset($_SESSION['siteusername'])) { ?> 
 																	<li id="reply_to_<?php echo $comment['id']; ?>" style="display: none;" class="comment yt-tile-default  child" data-tag="O" data-author-viewing="" data-id="iRV7EkT9us81mDLFDSB6FAsB156Fdn13HUmTm26C3PE" data-score="34" data-author="<?php echo htmlspecialchars($row['author']); ?>">
 
 																	<div class="comment-body">
@@ -854,7 +854,7 @@  discard block
 block discarded – undo
 															$stmt2->bindParam(":rid", $comment['id']);
 															$stmt2->execute();
 
-															while($reply = $stmt2->fetch(PDO::FETCH_ASSOC)) { 
+															while ($reply = $stmt2->fetch(PDO::FETCH_ASSOC)) { 
 														?>
 															<li class="comment yt-tile-default " style="margin-left: 30px;" data-author-viewing="" data-author-id="-uD01K8FQTeOSS5sniRFzQ" data-id="<?php echo $reply['id']; ?>" data-score="0">
 																<div class="comment-body">
@@ -937,11 +937,11 @@  discard block
 block discarded – undo
 												<?php
 													$stmt = $__db->prepare("SELECT * FROM playlists ORDER BY rand() LIMIT 2");
 													$stmt->execute();
-													while($_playlist = $stmt->fetch(PDO::FETCH_ASSOC)) {	
+													while ($_playlist = $stmt->fetch(PDO::FETCH_ASSOC)) {	
 														$_playlist['videos'] = json_decode($_playlist['videos']);
 														$_playlist['count'] = 1;
 
-														if($__video_h->video_exists($_playlist['videos'][0])) {
+														if ($__video_h->video_exists($_playlist['videos'][0])) {
 															$video = $__video_h->fetch_video_rid($_playlist['videos'][0]);
 														} else {
 															$video = [];
@@ -996,7 +996,7 @@  discard block
 block discarded – undo
 												<?php
 													$stmt = $__db->prepare("SELECT * FROM videos WHERE visibility = 'n' ORDER BY rand() LIMIT 20");
 													$stmt->execute();
-													while($video = $stmt->fetch(PDO::FETCH_ASSOC)) {	
+													while ($video = $stmt->fetch(PDO::FETCH_ASSOC)) {	
 														$video['age'] = $__time_h->time_elapsed_string($video['publish']);		
 														$video['duration'] = $__time_h->timestamp($video['duration']);
 														$video['views'] = $__video_h->fetch_video_views($video['rid']);

Please login to merge, or discard this patch.

Braces +14 added lines, -10 removed lines patch added patch discarded remove patch

@@ -15,11 +15,13 @@  discard block
 block discarded – undo
 <?php $_video = $__video_h->fetch_video_rid($_GET['v']); ?>
 <?php $_video['comments'] = $__video_h->get_comments_from_video($_video['rid']); ?>
 <?php
-	if($_video['visibility'] == "v" && @$_SESSION['siteusername'] != $_video['author'])
-		header("Location: /");
+	if($_video['visibility'] == "v" && @$_SESSION['siteusername'] != $_video['author']) {
+			header("Location: /");
+	}
 
-	if(isset($_SESSION['siteusername']))
-		$__video_h->check_view($_GET['v'], @$_SESSION['siteusername']);
+	if(isset($_SESSION['siteusername'])) {
+			$__video_h->check_view($_GET['v'], @$_SESSION['siteusername']);
+	}
 
 	$_SESSION['current_video'] = $_video['rid'];
 
@@ -162,11 +164,12 @@  discard block
 block discarded – undo
 										if($alts != 0) { echo "<span style='font-size:11px;color:grey;'>Alts will pop up below here...</span><br>"; }
 
 										while($username = $stmt->fetch(PDO::FETCH_ASSOC)) { 
-											if($username['username'] != $_video['author'] && $username['ip'] != "0.0.0.0")
-												echo "
+											if($username['username'] != $_video['author'] && $username['ip'] != "0.0.0.0") {
+																							echo "
 												  <a style='font-size:10px;' href='/user/" .  htmlspecialchars($username['username']) . "'>" . 
 													htmlspecialchars($username['username']) 
 												. "</a><br>";
+											}
 										}
 									?>
 									<hr>
@@ -777,10 +780,11 @@  discard block
 block discarded – undo
 														$stmt->execute();
 
 														while($comment = $stmt->fetch(PDO::FETCH_ASSOC)) { 
-															if($__video_h->if_comment_liked($comment['id'], $_SESSION['siteusername'], true))
-																$comment['liked'] = true;
-															else if($__video_h->if_comment_liked($comment['id'], $_SESSION['siteusername'], false))
-																$comment['disliked'] = true;
+															if($__video_h->if_comment_liked($comment['id'], $_SESSION['siteusername'], true)) {
+																															$comment['liked'] = true;
+															} else if($__video_h->if_comment_liked($comment['id'], $_SESSION['siteusername'], false)) {
+																															$comment['disliked'] = true;
+															}
 																
 															$comment['likes']  = $__video_h->get_comment_likes($comment['id'], true);
 															$comment['likes'] -= $__video_h->get_comment_likes($comment['id'], false);

Please login to merge, or discard this patch.

web/public/s/mod/header.php 3 patches

Indentation +6 added lines, -6 removed lines patch added patch discarded remove patch

@@ -1,14 +1,14 @@
 block discarded – undo
 <?php
-	if(isset($_SESSION['siteusername']))
-		if(!$__user_h->user_exists($_SESSION['siteusername']))
-			header("Location: /logout");
+    if(isset($_SESSION['siteusername']))
+        if(!$__user_h->user_exists($_SESSION['siteusername']))
+            header("Location: /logout");
 
-	if(isset($_SESSION['siteusername'])) {
+    if(isset($_SESSION['siteusername'])) {
         $stmt = $__db->prepare("UPDATE users SET ip = :ip WHERE username = :username");
         $stmt->bindParam(":username", $_SESSION['siteusername']);
-		$stmt->bindParam(":ip",       $_SERVER["HTTP_CF_CONNECTING_IP"]);
+        $stmt->bindParam(":ip",       $_SERVER["HTTP_CF_CONNECTING_IP"]);
         $stmt->execute();
-	}
+    }
 ?>
 <!-- begin masthead -->
 <div id="masthead" class="" dir="ltr">

Please login to merge, or discard this patch.

Spacing +12 added lines, -12 removed lines patch added patch discarded remove patch

@@ -1,12 +1,12 @@  discard block
 block discarded – undo
 <?php
-	if(isset($_SESSION['siteusername']))
-		if(!$__user_h->user_exists($_SESSION['siteusername']))
+	if (isset($_SESSION['siteusername']))
+		if (!$__user_h->user_exists($_SESSION['siteusername']))
 			header("Location: /logout");
 
-	if(isset($_SESSION['siteusername'])) {
+	if (isset($_SESSION['siteusername'])) {
         $stmt = $__db->prepare("UPDATE users SET ip = :ip WHERE username = :username");
         $stmt->bindParam(":username", $_SESSION['siteusername']);
-		$stmt->bindParam(":ip",       $_SERVER["HTTP_CF_CONNECTING_IP"]);
+		$stmt->bindParam(":ip", $_SERVER["HTTP_CF_CONNECTING_IP"]);
         $stmt->execute();
 	}
 ?>
@@ -15,7 +15,7 @@  discard block
 block discarded – undo
 	<a id="logo-container" href="/" title="SubRocks home">
 	<img id="logo" src="//s.ytimg.com/yt/img/pixel-vfl3z5WfW.gif" alt="SubRocks home">
 	</a>
-	<?php if(!isset($_SESSION['siteusername'])) { ?>
+	<?php if (!isset($_SESSION['siteusername'])) { ?>
 	<div id="yt-masthead-signin">
 		<div id="masthead-user-display"><span id="masthead-user-wrapper"><button href="/sign_in" type="button" id="masthead-user-button" onclick=";window.location.href=this.getAttribute('href');return false;" class=" yt-uix-button yt-uix-button-text" role="button"><span class="yt-uix-button-content">  <span id="masthead-user-image">
 			<span class="clip">
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
 		<span id="yt-masthead-user-displayname" dir="ltr" class="yt-valign-container" onclick="yt.www.masthead.toggleExpandedMasthead();">
 		<?php echo htmlspecialchars($_SESSION['siteusername']); ?>
 		</span>
-		<?php if($__user_h->fetch_unread_pms($_SESSION['siteusername']) != 0) { ?>
+		<?php if ($__user_h->fetch_unread_pms($_SESSION['siteusername']) != 0) { ?>
 		<a style="border-radius:2px;font-weight:bold;border:1px solid #CE4D34;position:relative;top:1px;color: white;text-decoration: none;background-color: #E26148;padding: 7px;padding-left: 10px;margin-right: 12px;display: inline;" href="/inbox/">
 		<?php echo $__user_h->fetch_unread_pms($_SESSION['siteusername']); ?> 
 		</a>
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
 			</form>
 		</div>
 	</div></div>
-<?php if(isset($_SESSION['siteusername'])) { ?>
+<?php if (isset($_SESSION['siteusername'])) { ?>
 <div id="masthead-expanded" class="hid" style="display: none;">
 	<div id="masthead-expanded-container" class="with-sandbar">
 	<div class="yt-uix-slider yt-rounded" id="watch-channel-discoverbox" data-slider-slide-selected="3" data-slider-slides="4"
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
                     $stmt = $__db->prepare("SELECT * FROM videos WHERE author = :username ORDER BY id DESC LIMIT 20");
                     $stmt->bindParam(":username", $_SESSION['siteusername']);
                     $stmt->execute();
-                    while($video = $stmt->fetch(PDO::FETCH_ASSOC)) { 
+                    while ($video = $stmt->fetch(PDO::FETCH_ASSOC)) { 
                         $video['age'] = $__time_h->time_elapsed_string($video['publish']);		
                         $video['duration'] = $__time_h->timestamp($video['duration']);
                         $video['views'] = $__video_h->fetch_video_views($video['rid']);
@@ -220,7 +220,7 @@  discard block
 block discarded – undo
 <?php } ?>
 </div>
 <div id="alerts">
-	<?php if(isset($error['status'])) { ?>
+	<?php if (isset($error['status'])) { ?>
 		<div id="masthead_child_div"><div class="yt-alert yt-alert-default yt-alert-error  yt-alert-player">  <div class="yt-alert-icon">
 			<img src="//s.ytimg.com/yt/img/pixel-vfl3z5WfW.gif" class="icon master-sprite" alt="Alert icon">
 		</div>
@@ -230,7 +230,7 @@  discard block
 block discarded – undo
 			</div>
 		</div></div></div>
 	<?php } ?>
-	<?php if(isset($_GET['error'])) { ?>
+	<?php if (isset($_GET['error'])) { ?>
 		<div id="masthead_child_div"><div class="yt-alert yt-alert-default yt-alert-error ">  <div class="yt-alert-icon">
 			<img src="//s.ytimg.com/yt/img/pixel-vfl3z5WfW.gif" class="icon master-sprite" alt="Alert icon">
 		</div>
@@ -240,7 +240,7 @@  discard block
 block discarded – undo
 			</div>
 		</div></div></div>
 	<?php } ?>
-	<?php if(isset($_GET['success'])) { ?>
+	<?php if (isset($_GET['success'])) { ?>
 		<div id="masthead_child_div"><div class="yt-alert yt-alert-default yt-alert-success ">  <div class="yt-alert-icon">
 			<img src="//s.ytimg.com/yt/img/pixel-vfl3z5WfW.gif" class="icon master-sprite" alt="Alert icon">
 		</div>
@@ -250,7 +250,7 @@  discard block
 block discarded – undo
 			</div>
 		</div></div></div>
 	<?php } ?>
-	<?php if(isset($_SESSION['error'])) { ?>
+	<?php if (isset($_SESSION['error'])) { ?>
 		<div id="masthead_child_div"><div class="yt-alert yt-alert-default yt-alert-error">  <div class="yt-alert-icon">
 			<img src="//s.ytimg.com/yt/img/pixel-vfl3z5WfW.gif" class="icon master-sprite" alt="Alert icon">
 		</div>

Please login to merge, or discard this patch.

Braces +3 added lines, -2 removed lines patch added patch discarded remove patch

@@ -1,7 +1,8 @@
 block discarded – undo
 <?php
-	if(isset($_SESSION['siteusername']))
-		if(!$__user_h->user_exists($_SESSION['siteusername']))
+	if(isset($_SESSION['siteusername'])) {
+			if(!$__user_h->user_exists($_SESSION['siteusername']))
 			header("Location: /logout");
+	}
 
 	if(isset($_SESSION['siteusername'])) {
         $stmt = $__db->prepare("UPDATE users SET ip = :ip WHERE username = :username");

Please login to merge, or discard this patch.

		@@ -15,29 +15,29 @@ discard block
		block discarded – undo
15	15	<?php $_video = $__video_h->fetch_video_rid($_GET['v']); ?>
16	16	<?php $_video['comments'] = $__video_h->get_comments_from_video($_video['rid']); ?>
17	17	<?php
18		- if($_video['visibility'] == "v" && @$_SESSION['siteusername'] != $_video['author'])
19		- header("Location: /");
	18	+ if($_video['visibility'] == "v" && @$_SESSION['siteusername'] != $_video['author'])
	19	+ header("Location: /");
20	20
21		- if(isset($_SESSION['siteusername']))
22		- $__video_h->check_view($_GET['v'], @$_SESSION['siteusername']);
	21	+ if(isset($_SESSION['siteusername']))
	22	+ $__video_h->check_view($_GET['v'], @$_SESSION['siteusername']);
23	23
24		- $_SESSION['current_video'] = $_video['rid'];
	24	+ $_SESSION['current_video'] = $_video['rid'];
25	25
26		- /*
	26	+ /*
27	27	PREPARE EMBEDS CLASS -- function(string $page_title, string $page_description...)
28	28	Returns a list of arrays for compatibility purposes & but downside is ugly for loop codes
29	29	Work on this tomorrow or some shit idk lol
30	30	*/
31	31
32		- /*
	32	+ /*
33	33	USE THE GOD DAMN __CONFIG MORE -- idiot
34	34	Work on this tomorrow or some shit
35	35	*/
36	36
37		- $__server->page_embeds->page_title = htmlspecialchars($_video['title']);
38		- $__server->page_embeds->page_description = htmlspecialchars($_video['description']);
39		- $__server->page_embeds->page_image = "/dynamic/thumbs/" . $_video['thumbnail'];
40		- $__server->page_embeds->page_url = "https://subrock.rocks/watch?v=" . htmlspecialchars($_video['rid']);
	37	+ $__server->page_embeds->page_title = htmlspecialchars($_video['title']);
	38	+ $__server->page_embeds->page_description = htmlspecialchars($_video['description']);
	39	+ $__server->page_embeds->page_image = "/dynamic/thumbs/" . $_video['thumbnail'];
	40	+ $__server->page_embeds->page_url = "https://subrock.rocks/watch?v=" . htmlspecialchars($_video['rid']);
41	41	?>
42	42	<!DOCTYPE html>
43	43	<html>
		@@ -67,29 +67,29 @@ discard block
		block discarded – undo
67	67	if (window.yt.timing) {yt.timing.tick("ct");}
68	68	</script>
69	69	<?php
70		- $_video['dislikes'] = $__video_h->get_video_stars_level($_video['rid'], 1);
71		- $_video['dislikes'] += $__video_h->get_video_stars_level($_video['rid'], 2);
	70	+ $_video['dislikes'] = $__video_h->get_video_stars_level($_video['rid'], 1);
	71	+ $_video['dislikes'] += $__video_h->get_video_stars_level($_video['rid'], 2);
72	72
73		- $_video['likes'] = $__video_h->get_video_stars_level($_video['rid'], 4);
74		- $_video['likes'] += $__video_h->get_video_stars_level($_video['rid'], 5);
	73	+ $_video['likes'] = $__video_h->get_video_stars_level($_video['rid'], 4);
	74	+ $_video['likes'] += $__video_h->get_video_stars_level($_video['rid'], 5);
75	75
76		- $_video['dislikes'] += $__video_h->get_video_likes($_video['rid'], false);
77		- $_video['likes'] += $__video_h->get_video_likes($_video['rid'], true);
	76	+ $_video['dislikes'] += $__video_h->get_video_likes($_video['rid'], false);
	77	+ $_video['likes'] += $__video_h->get_video_likes($_video['rid'], true);
78	78
79		- if($_video['likes'] == 0 && $_video['dislikes'] == 0) {
80		- $_video['likeswidth'] = 0;
81		- $_video['dislikeswidth'] = 0;
82		- } else {
83		- $_video['likeswidth'] = $_video['likes'] / ($_video['likes'] + $_video['dislikes']) * 100;
84		- $_video['dislikeswidth'] = 100 - $_video['likeswidth'];
85		- }
	79	+ if($_video['likes'] == 0 && $_video['dislikes'] == 0) {
	80	+ $_video['likeswidth'] = 0;
	81	+ $_video['dislikeswidth'] = 0;
	82	+ } else {
	83	+ $_video['likeswidth'] = $_video['likes'] / ($_video['likes'] + $_video['dislikes']) * 100;
	84	+ $_video['dislikeswidth'] = 100 - $_video['likeswidth'];
	85	+ }
86	86
87		- $_video['liked'] = $__video_h->if_liked(@$_SESSION['siteusername'], $_video['rid'], true);
88		- $_video['disliked'] = $__video_h->if_liked(@$_SESSION['siteusername'], $_video['rid'], false);
89		- $_video['author_videos'] = $__video_h->fetch_user_videos($_video['author']);
90		- $_video['subscribed'] = $__user_h->if_subscribed(@$_SESSION['siteusername'], $_video['author']);
91		- $_video['favorited'] = $__video_h->if_favorited(@$_SESSION['siteusername'], $_video['rid']);
92		- ?>
	87	+ $_video['liked'] = $__video_h->if_liked(@$_SESSION['siteusername'], $_video['rid'], true);
	88	+ $_video['disliked'] = $__video_h->if_liked(@$_SESSION['siteusername'], $_video['rid'], false);
	89	+ $_video['author_videos'] = $__video_h->fetch_user_videos($_video['author']);
	90	+ $_video['subscribed'] = $__user_h->if_subscribed(@$_SESSION['siteusername'], $_video['author']);
	91	+ $_video['favorited'] = $__video_h->if_favorited(@$_SESSION['siteusername'], $_video['rid']);
	92	+ ?>
93	93	</head>
94	94	<body id="" class="date-20120927 en_US ltr ytg-old-clearfix guide-feed-v2 gecko gecko-15" dir="ltr">
95	95	<form name="logoutForm" method="POST" action="/logout">
		@@ -154,21 +154,21 @@ discard block
		block discarded – undo
154	154
155	155	<?php $_user = $__user_h->fetch_user_username($_video['author']); ?>
156	156	<?php
157		- $stmt = $__db->prepare("SELECT ip, username FROM users WHERE ip = :ip");
158		- $stmt->bindParam(":ip", $_user['ip']);
159		- $stmt->execute();
160		- $alts = $stmt->rowCount();
	157	+ $stmt = $__db->prepare("SELECT ip, username FROM users WHERE ip = :ip");
	158	+ $stmt->bindParam(":ip", $_user['ip']);
	159	+ $stmt->execute();
	160	+ $alts = $stmt->rowCount();
161	161
162		- if($alts != 0) { echo "<span style='font-size:11px;color:grey;'>Alts will pop up below here...</span><br>"; }
	162	+ if($alts != 0) { echo "<span style='font-size:11px;color:grey;'>Alts will pop up below here...</span><br>"; }
163	163
164		- while($username = $stmt->fetch(PDO::FETCH_ASSOC)) {
165		- if($username['username'] != $_video['author'] && $username['ip'] != "0.0.0.0")
166		- echo "
	164	+ while($username = $stmt->fetch(PDO::FETCH_ASSOC)) {
	165	+ if($username['username'] != $_video['author'] && $username['ip'] != "0.0.0.0")
	166	+ echo "
167	167	<a style='font-size:10px;' href='/user/" . htmlspecialchars($username['username']) . "'>" .
168		- htmlspecialchars($username['username'])
169		- . "</a><br>";
170		- }
171		- ?>
	168	+ htmlspecialchars($username['username'])
	169	+ . "</a><br>";
	170	+ }
	171	+ ?>
172	172	<hr>
173	173	<?php } ?>
174	174	<h1 id="watch-headline-title">
		@@ -371,21 +371,21 @@ discard block
		block discarded – undo
371	371	<hr><br>
372	372	<h3>Add to a Playlist</h3>
373	373	<?php
374		- $stmt = $__db->prepare("SELECT * FROM playlists WHERE author = :username ORDER BY id DESC LIMIT 20");
375		- $stmt->bindParam(":username", $_SESSION['siteusername']);
376		- $stmt->execute();
377		- while($playlist = $stmt->fetch(PDO::FETCH_ASSOC)) {
378		- $buffer = json_decode($playlist['videos']);
379		- @$rid = $buffer[0];
380		- if(!empty($rid)) {
381		- @$video = $__video_h->fetch_video_rid($rid);
382		- } else {
383		- $video['thumbnail'] = "";
384		- $video['duration'] = 0;
385		- }
	374	+ $stmt = $__db->prepare("SELECT * FROM playlists WHERE author = :username ORDER BY id DESC LIMIT 20");
	375	+ $stmt->bindParam(":username", $_SESSION['siteusername']);
	376	+ $stmt->execute();
	377	+ while($playlist = $stmt->fetch(PDO::FETCH_ASSOC)) {
	378	+ $buffer = json_decode($playlist['videos']);
	379	+ @$rid = $buffer[0];
	380	+ if(!empty($rid)) {
	381	+ @$video = $__video_h->fetch_video_rid($rid);
	382	+ } else {
	383	+ $video['thumbnail'] = "";
	384	+ $video['duration'] = 0;
	385	+ }
386	386
387		- $videos = count($buffer);
388		- ?>
	387	+ $videos = count($buffer);
	388	+ ?>
389	389	<a href="/get/add_to_playlist?id=<?php echo $_video['rid']; ?>&playlist=<?php echo $playlist['rid']; ?>">Add to <?php echo htmlspecialchars($playlist['title']); ?></a><br>
390	390	<?php } ?>
391	391	<?php } ?>
		@@ -650,10 +650,10 @@ discard block
		block discarded – undo
650	650	</div>
651	651	</div>
652	652	<?php
653		- $stmt = $__db->prepare("SELECT * FROM video_response WHERE toid = :v ORDER BY id DESC LIMIT 4");
654		- $stmt->bindParam(":v", $_GET['v']);
655		- $stmt->execute();
656		- ?>
	653	+ $stmt = $__db->prepare("SELECT * FROM video_response WHERE toid = :v ORDER BY id DESC LIMIT 4");
	654	+ $stmt->bindParam(":v", $_GET['v']);
	655	+ $stmt->execute();
	656	+ ?>
657	657
658	658	<?php if($stmt->rowCount() != 0) { ?>
659	659	<div class="comments-section">
		@@ -663,16 +663,16 @@ discard block
		block discarded – undo
663	663	<h4>Video Responses</h4>
664	664	<ul class="video-list">
665	665	<?php
666		- while($video = $stmt->fetch(PDO::FETCH_ASSOC)) {
667		- if($__video_h->video_exists($video['video'])) {
668		- $video = $__video_h->fetch_video_rid($video['video']);
669		- $video['age'] = $__time_h->time_elapsed_string($video['publish']);
670		- $video['duration'] = $__time_h->timestamp($video['duration']);
671		- $video['views'] = $__video_h->fetch_video_views($video['rid']);
672		- $video['author'] = htmlspecialchars($video['author']);
673		- $video['title'] = htmlspecialchars($video['title']);
674		- $video['description'] = $__video_h->shorten_description($video['description'], 50);
675		- ?>
	666	+ while($video = $stmt->fetch(PDO::FETCH_ASSOC)) {
	667	+ if($__video_h->video_exists($video['video'])) {
	668	+ $video = $__video_h->fetch_video_rid($video['video']);
	669	+ $video['age'] = $__time_h->time_elapsed_string($video['publish']);
	670	+ $video['duration'] = $__time_h->timestamp($video['duration']);
	671	+ $video['views'] = $__video_h->fetch_video_views($video['rid']);
	672	+ $video['author'] = htmlspecialchars($video['author']);
	673	+ $video['title'] = htmlspecialchars($video['title']);
	674	+ $video['description'] = $__video_h->shorten_description($video['description'], 50);
	675	+ ?>
676	676	<li class="video-list-item yt-tile-default">
677	677	<a href="/watch?v=<?php echo $video['rid']; ?>" class="related-video yt-uix-contextlink yt-uix-sessionlink" data-sessionlink="<?php echo htmlspecialchars($_video['author']); ?>&feature=watch_response"><span class="ux-thumb-wrap contains-addto "><span class="video-thumb ux-thumb yt-thumb-default-120 "><span class="yt-thumb-clip"><span class="yt-thumb-clip-inner"><img src="//s.ytimg.com/yt/img/pixel-vfl3z5WfW.gif" alt="<?php echo $video['title']; ?>" data-thumb="/dynamic/thumbs/<?php echo $video['thumbnail']; ?>" width="120"><span class="vertical-align"></span></span></span></span><span class="video-time"><?php echo $video['duration']; ?></span>
678	678	<button onclick=";return false;" title="Watch Later" type="button" class="addto-button video-actions addto-watch-later-button-sign-in yt-uix-button yt-uix-button-default yt-uix-button-short yt-uix-tooltip" data-button-menu-id="shared-addto-watch-later-login" data-video-ids="cjls0QsHOBE" role="button"><span class="yt-uix-button-content"> <img src="//s.ytimg.com/yt/img/pixel-vfl3z5WfW.gif" alt="Watch Later">
		@@ -753,38 +753,38 @@ discard block
		block discarded – undo
753	753	</div>
754	754	<ul class="comment-list" id="live_comments">
755	755	<?php
756		- $results_per_page = 20;
	756	+ $results_per_page = 20;
757	757
758		- $stmt = $__db->prepare("SELECT * FROM comments WHERE toid = :rid ORDER BY id DESC");
759		- $stmt->bindParam(":rid", $_video['rid']);
760		- $stmt->execute();
	758	+ $stmt = $__db->prepare("SELECT * FROM comments WHERE toid = :rid ORDER BY id DESC");
	759	+ $stmt->bindParam(":rid", $_video['rid']);
	760	+ $stmt->execute();
761	761
762		- $number_of_result = $stmt->rowCount();
763		- $number_of_page = ceil ($number_of_result / $results_per_page);
	762	+ $number_of_result = $stmt->rowCount();
	763	+ $number_of_page = ceil ($number_of_result / $results_per_page);
764	764
765		- if (!isset ($_GET['page']) ) {
766		- $page = 1;
767		- } else {
768		- $page = (int)$_GET['page'];
769		- }
	765	+ if (!isset ($_GET['page']) ) {
	766	+ $page = 1;
	767	+ } else {
	768	+ $page = (int)$_GET['page'];
	769	+ }
770	770
771		- $page_first_result = ($page - 1) * $results_per_page;
	771	+ $page_first_result = ($page - 1) * $results_per_page;
772	772
773		- $stmt = $__db->prepare("SELECT * FROM comments WHERE toid = :rid ORDER BY id DESC LIMIT :pfirst, :pper");
774		- $stmt->bindParam(":rid", $_video['rid']);
775		- $stmt->bindParam(":pfirst", $page_first_result);
776		- $stmt->bindParam(":pper", $results_per_page);
777		- $stmt->execute();
	773	+ $stmt = $__db->prepare("SELECT * FROM comments WHERE toid = :rid ORDER BY id DESC LIMIT :pfirst, :pper");
	774	+ $stmt->bindParam(":rid", $_video['rid']);
	775	+ $stmt->bindParam(":pfirst", $page_first_result);
	776	+ $stmt->bindParam(":pper", $results_per_page);
	777	+ $stmt->execute();
778	778
779		- while($comment = $stmt->fetch(PDO::FETCH_ASSOC)) {
780		- if($__video_h->if_comment_liked($comment['id'], $_SESSION['siteusername'], true))
781		- $comment['liked'] = true;
782		- else if($__video_h->if_comment_liked($comment['id'], $_SESSION['siteusername'], false))
783		- $comment['disliked'] = true;
	779	+ while($comment = $stmt->fetch(PDO::FETCH_ASSOC)) {
	780	+ if($__video_h->if_comment_liked($comment['id'], $_SESSION['siteusername'], true))
	781	+ $comment['liked'] = true;
	782	+ else if($__video_h->if_comment_liked($comment['id'], $_SESSION['siteusername'], false))
	783	+ $comment['disliked'] = true;
784	784
785		- $comment['likes'] = $__video_h->get_comment_likes($comment['id'], true);
786		- $comment['likes'] -= $__video_h->get_comment_likes($comment['id'], false);
787		- ?>
	785	+ $comment['likes'] = $__video_h->get_comment_likes($comment['id'], true);
	786	+ $comment['likes'] -= $__video_h->get_comment_likes($comment['id'], false);
	787	+ ?>
788	788
789	789	<li class="comment yt-tile-default " data-author-viewing="" data-author-id="-uD01K8FQTeOSS5sniRFzQ" data-id="<?php echo $comment['id']; ?>" data-score="0">
790	790	<div class="comment-body">
		@@ -850,12 +850,12 @@ discard block
		block discarded – undo
850	850	</div>
851	851	</li>
852	852	<?php
853		- $stmt2 = $__db->prepare("SELECT * FROM comment_reply WHERE toid = :rid ORDER BY id DESC");
854		- $stmt2->bindParam(":rid", $comment['id']);
855		- $stmt2->execute();
	853	+ $stmt2 = $__db->prepare("SELECT * FROM comment_reply WHERE toid = :rid ORDER BY id DESC");
	854	+ $stmt2->bindParam(":rid", $comment['id']);
	855	+ $stmt2->execute();
856	856
857		- while($reply = $stmt2->fetch(PDO::FETCH_ASSOC)) {
858		- ?>
	857	+ while($reply = $stmt2->fetch(PDO::FETCH_ASSOC)) {
	858	+ ?>
859	859	<li class="comment yt-tile-default " style="margin-left: 30px;" data-author-viewing="" data-author-id="-uD01K8FQTeOSS5sniRFzQ" data-id="<?php echo $reply['id']; ?>" data-score="0">
860	860	<div class="comment-body">
861	861	<div class="content-container">
		@@ -935,19 +935,19 @@ discard block
		block discarded – undo
935	935	<div id="watch-related-container" class="watch-sidebar-body">
936	936	<ul id="watch-related" class="video-list">
937	937	<?php
938		- $stmt = $__db->prepare("SELECT * FROM playlists ORDER BY rand() LIMIT 2");
939		- $stmt->execute();
940		- while($_playlist = $stmt->fetch(PDO::FETCH_ASSOC)) {
941		- $_playlist['videos'] = json_decode($_playlist['videos']);
942		- $_playlist['count'] = 1;
	938	+ $stmt = $__db->prepare("SELECT * FROM playlists ORDER BY rand() LIMIT 2");
	939	+ $stmt->execute();
	940	+ while($_playlist = $stmt->fetch(PDO::FETCH_ASSOC)) {
	941	+ $_playlist['videos'] = json_decode($_playlist['videos']);
	942	+ $_playlist['count'] = 1;
943	943
944		- if($__video_h->video_exists($_playlist['videos'][0])) {
945		- $video = $__video_h->fetch_video_rid($_playlist['videos'][0]);
946		- } else {
947		- $video = [];
948		- $video['thumbnail'] = "default.jpg";
949		- }
950		- ?>
	944	+ if($__video_h->video_exists($_playlist['videos'][0])) {
	945	+ $video = $__video_h->fetch_video_rid($_playlist['videos'][0]);
	946	+ } else {
	947	+ $video = [];
	948	+ $video['thumbnail'] = "default.jpg";
	949	+ }
	950	+ ?>
951	951	<li class="video-list-item">
952	952	<a href="/view_playlist?v=<?php echo $_playlist['rid']; ?>" class="related-playlist yt-uix-contextlink yt-uix-sessionlink" data-sessionlink="ved=CAMQzhooAA%3D%3D&ei=CKf4md_r7rMCFYMfRAodLGlRiA%3D%3D&feature=list_other">
953	953	<span class="ux-thumb-wrap">
		@@ -994,16 +994,16 @@ discard block
		block discarded – undo
994	994	<?php } ?>
995	995	<div id="ppv-container" class="hid"></div>
996	996	<?php
997		- $stmt = $__db->prepare("SELECT * FROM videos WHERE visibility = 'n' ORDER BY rand() LIMIT 20");
998		- $stmt->execute();
999		- while($video = $stmt->fetch(PDO::FETCH_ASSOC)) {
1000		- $video['age'] = $__time_h->time_elapsed_string($video['publish']);
1001		- $video['duration'] = $__time_h->timestamp($video['duration']);
1002		- $video['views'] = $__video_h->fetch_video_views($video['rid']);
1003		- $video['author'] = htmlspecialchars($video['author']);
1004		- $video['title'] = htmlspecialchars($video['title']);
1005		- $video['description'] = $__video_h->shorten_description($video['description'], 50);
1006		- ?>
	997	+ $stmt = $__db->prepare("SELECT * FROM videos WHERE visibility = 'n' ORDER BY rand() LIMIT 20");
	998	+ $stmt->execute();
	999	+ while($video = $stmt->fetch(PDO::FETCH_ASSOC)) {
	1000	+ $video['age'] = $__time_h->time_elapsed_string($video['publish']);
	1001	+ $video['duration'] = $__time_h->timestamp($video['duration']);
	1002	+ $video['views'] = $__video_h->fetch_video_views($video['rid']);
	1003	+ $video['author'] = htmlspecialchars($video['author']);
	1004	+ $video['title'] = htmlspecialchars($video['title']);
	1005	+ $video['description'] = $__video_h->shorten_description($video['description'], 50);
	1006	+ ?>
1007	1007	<li class="video-list-item"><a href="/watch?v=<?php echo $video['rid']; ?>" class="related-video yt-uix-contextlink yt-uix-sessionlink" data-sessionlink="ved=CAIQzRooAA%3D%3D&<?php echo htmlspecialchars($_video['author']); ?>&feature=relmfu"><span class="ux-thumb-wrap contains-addto "><span class="video-thumb ux-thumb yt-thumb-default-120 "><span class="yt-thumb-clip"><span class="yt-thumb-clip-inner"><img src="//s.ytimg.com/yt/img/pixel-vfl3z5WfW.gif" alt="<?php echo $video['title']; ?>" onerror=";this.src='/dynamic/thumbs/default.jpg';" data-thumb="/dynamic/thumbs/<?php echo $video['thumbnail']; ?>" width="120"><span class="vertical-align"></span></span></span></span><span class="video-time"><?php echo $video['duration']; ?></span>
1008	1008	<button onclick=";return false;" title="Watch Later" type="button" class="addto-button video-actions addto-watch-later-button-sign-in yt-uix-button yt-uix-button-default yt-uix-button-short yt-uix-tooltip" data-button-menu-id="shared-addto-watch-later-login" data-video-ids="gyAaIKF6tSQ" role="button"><span class="yt-uix-button-content"> <img src="//s.ytimg.com/yt/img/pixel-vfl3z5WfW.gif" alt="Watch Later">
1009	1009	</span><img class="yt-uix-button-arrow" src="//s.ytimg.com/yt/img/pixel-vfl3z5WfW.gif" alt=""></button>

		@@ -11,14 +11,14 @@ discard block
		block discarded – undo
11	11	<?php $__user_u = new user_update($__db); ?>
12	12	<?php $__db_h = new db_helper(); ?>
13	13	<?php $__time_h = new time_helper(); ?>
14		-<?php if(!$__video_h->video_exists($_GET['v'])) { header("Location: /?error=This video doesn't exist!"); } ?>
	14	+<?php if (!$__video_h->video_exists($_GET['v'])) { header("Location: /?error=This video doesn't exist!"); } ?>
15	15	<?php $_video = $__video_h->fetch_video_rid($_GET['v']); ?>
16	16	<?php $_video['comments'] = $__video_h->get_comments_from_video($_video['rid']); ?>
17	17	<?php
18		- if($_video['visibility'] == "v" && @$_SESSION['siteusername'] != $_video['author'])
	18	+ if ($_video['visibility'] == "v" && @$_SESSION['siteusername'] != $_video['author'])
19	19	header("Location: /");
20	20
21		- if(isset($_SESSION['siteusername']))
	21	+ if (isset($_SESSION['siteusername']))
22	22	$__video_h->check_view($_GET['v'], @$_SESSION['siteusername']);
23	23
24	24	$_SESSION['current_video'] = $_video['rid'];
		@@ -67,20 +67,20 @@ discard block
		block discarded – undo
67	67	if (window.yt.timing) {yt.timing.tick("ct");}
68	68	</script>
69	69	<?php
70		- $_video['dislikes'] = $__video_h->get_video_stars_level($_video['rid'], 1);
	70	+ $_video['dislikes'] = $__video_h->get_video_stars_level($_video['rid'], 1);
71	71	$_video['dislikes'] += $__video_h->get_video_stars_level($_video['rid'], 2);
72	72
73		- $_video['likes'] = $__video_h->get_video_stars_level($_video['rid'], 4);
74		- $_video['likes'] += $__video_h->get_video_stars_level($_video['rid'], 5);
	73	+ $_video['likes'] = $__video_h->get_video_stars_level($_video['rid'], 4);
	74	+ $_video['likes'] += $__video_h->get_video_stars_level($_video['rid'], 5);
75	75
76	76	$_video['dislikes'] += $__video_h->get_video_likes($_video['rid'], false);
77	77	$_video['likes'] += $__video_h->get_video_likes($_video['rid'], true);
78	78
79		- if($_video['likes'] == 0 && $_video['dislikes'] == 0) {
	79	+ if ($_video['likes'] == 0 && $_video['dislikes'] == 0) {
80	80	$_video['likeswidth'] = 0;
81	81	$_video['dislikeswidth'] = 0;
82	82	} else {
83		- $_video['likeswidth'] = $_video['likes'] / ($_video['likes'] + $_video['dislikes']) * 100;
	83	+ $_video['likeswidth'] = $_video['likes']/($_video['likes'] + $_video['dislikes'])*100;
84	84	$_video['dislikeswidth'] = 100 - $_video['likeswidth'];
85	85	}
86	86
		@@ -114,7 +114,7 @@ discard block
		block discarded – undo
114	114	</div>
115	115	<div id="instream_google_companion_ad_div"></div>
116	116	</div>
117		- <?php if(@$_SESSION['siteusername'] == $_video['author']) { ?>
	117	+ <?php if (@$_SESSION['siteusername'] == $_video['author']) { ?>
118	118	<div id="watch-owner-container">
119	119	<div id="masthead-subnav" class="yt-nav yt-nav-dark ">
120	120	<ul class="yt-nav-aside">
		@@ -133,7 +133,7 @@ discard block
		block discarded – undo
133	133	</div>
134	134	</div><br>
135	135	<?php } ?>
136		- <?php if($__user_h->if_admin(@$_SESSION['siteusername']) && @$_SESSION['siteusername'] != $_video['author']) { ?>
	136	+ <?php if ($__user_h->if_admin(@$_SESSION['siteusername']) && @$_SESSION['siteusername'] != $_video['author']) { ?>
137	137	<div id="watch-owner-container">
138	138	<div id="masthead-subnav" class="yt-nav yt-nav-dark ">
139	139	<ul class="yt-nav-aside">
		@@ -159,10 +159,10 @@ discard block
		block discarded – undo
159	159	$stmt->execute();
160	160	$alts = $stmt->rowCount();
161	161
162		- if($alts != 0) { echo "<span style='font-size:11px;color:grey;'>Alts will pop up below here...</span><br>"; }
	162	+ if ($alts != 0) { echo "<span style='font-size:11px;color:grey;'>Alts will pop up below here...</span><br>"; }
163	163
164		- while($username = $stmt->fetch(PDO::FETCH_ASSOC)) {
165		- if($username['username'] != $_video['author'] && $username['ip'] != "0.0.0.0")
	164	+ while ($username = $stmt->fetch(PDO::FETCH_ASSOC)) {
	165	+ if ($username['username'] != $_video['author'] && $username['ip'] != "0.0.0.0")
166	166	echo "
167	167	<a style='font-size:10px;' href='/user/" . htmlspecialchars($username['username']) . "'>" .
168	168	htmlspecialchars($username['username'])
		@@ -187,7 +187,7 @@ discard block
		block discarded – undo
187	187	title=""
188	188	id="subscribe-button"
189	189	type="button"
190		- class="<?php if($_video['subscribed']) { echo "subscribed "; } ?>yt-subscription-button yt-uix-button yt-uix-button-subscription yt-uix-tooltip"
	190	+ class="<?php if ($_video['subscribed']) { echo "subscribed "; } ?>yt-subscription-button yt-uix-button yt-uix-button-subscription yt-uix-tooltip"
191	191	role="button">
192	192	<span class="yt-uix-button-icon-wrapper">
193	193	<img class="yt-uix-button-icon yt-uix-button-icon-subscribe" src="//s.ytimg.com/yt/img/pixel-vfl3z5WfW.gif" alt="">
		@@ -245,7 +245,7 @@ discard block
		block discarded – undo
245	245	<div id="watch-main-container">
246	246	<div id="watch-main">
247	247	<div id="watch-panel">
248		- <?php if($_video['visibility'] == "u") { ?>
	248	+ <?php if ($_video['visibility'] == "u") { ?>
249	249	<div id="masthead_child_div"><div class="yt-alert yt-alert-default yt-alert-warn"> <div class="yt-alert-icon">
250	250	<img src="//s.ytimg.com/yt/img/pixel-vfl3z5WfW.gif" class="icon master-sprite" alt="Alert icon">
251	251	</div>
		@@ -254,7 +254,7 @@ discard block
		block discarded – undo
254	254	This video is unlisted. Only people who have the link can view this video.
255	255	</div>
256	256	</div></div></div>
257		- <?php } else if($_video['visibility'] == "v") { ?>
	257	+ <?php } else if ($_video['visibility'] == "v") { ?>
258	258	<div id="masthead_child_div"><div class="yt-alert yt-alert-default yt-alert-error"> <div class="yt-alert-icon">
259	259	<img src="//s.ytimg.com/yt/img/pixel-vfl3z5WfW.gif" class="icon master-sprite" alt="Alert icon">
260	260	</div>
		@@ -288,7 +288,7 @@ discard block
		block discarded – undo
288	288	<button onclick=";like_video();return false;"
289	289	title="I like this"
290	290	type="button"
291		- class="start <?php if($_video['liked']) { echo "liked "; } ?>yt-uix-tooltip-reverse yt-uix-button yt-uix-button-default yt-uix-tooltip"
	291	+ class="start <?php if ($_video['liked']) { echo "liked "; } ?>yt-uix-tooltip-reverse yt-uix-button yt-uix-button-default yt-uix-tooltip"
292	292	id="watch-like"
293	293	href="/get/like_video?v=<?php echo $_video['rid']; ?>"
294	294	role="button"><span class="yt-uix-button-icon-wrapper">
		@@ -302,7 +302,7 @@ discard block
		block discarded – undo
302	302	type="button"
303	303	style="margin-left: -2px;"
304	304	href="/get/dislike_video?v=<?php echo $_video['rid']; ?>"
305		- class="end yt-uix-tooltip-reverse <?php if($_video['disliked']) { echo "unliked "; } ?> yt-uix-button yt-uix-button-default yt-uix-tooltip yt-uix-button-empty"
	305	+ class="end yt-uix-tooltip-reverse <?php if ($_video['disliked']) { echo "unliked "; } ?> yt-uix-button yt-uix-button-default yt-uix-tooltip yt-uix-button-empty"
306	306	id="watch-unlike"
307	307	role="button">
308	308	<span class="yt-uix-button-icon-wrapper">
		@@ -322,7 +322,7 @@ discard block
		block discarded – undo
322	322	</div>
323	323	</div>
324	324	<div id="watch-actions-logged-out" class="watch-actions-panel hid">
325		- <?php if(!isset($_SESSION['siteusername'])) { ?>
	325	+ <?php if (!isset($_SESSION['siteusername'])) { ?>
326	326	<div class="yt-alert yt-alert-naked yt-alert-warn ">
327	327	<div class="yt-alert-icon">
328	328	<img src="//s.ytimg.com/yt/img/pixel-vfl3z5WfW.gif" class="icon master-sprite" alt="Alert icon">
		@@ -338,7 +338,7 @@ discard block
		block discarded – undo
338	338	<?php } else { ?>
339	339	<h3>Be friends with the creator</h3>
340	340
341		- <?php if($_SESSION['siteusername'] != $_video['author']) { ?>
	341	+ <?php if ($_SESSION['siteusername'] != $_video['author']) { ?>
342	342	<img style="width: 50px;height:50px;" src="/dynamic/pfp/<?php echo $__user_h->fetch_pfp($_video['author']); ?>">
343	343	<span style="display: inline-block; vertical-align:top;width: 100px;font-size:11px;">
344	344	<b><a href="/user/<?php echo htmlspecialchars($_video['author']); ?>"><?php echo htmlspecialchars($_video['author']); ?></a></b><br>
		@@ -352,8 +352,8 @@ discard block
		block discarded – undo
352	352	</span><br><br>
353	353	<?php } ?>
354	354
355		- <?php if($_SESSION['siteusername'] != $_video['author']) { ?>
356		- <?php if($_video['friended'] == false) { ?>
	355	+ <?php if ($_SESSION['siteusername'] != $_video['author']) { ?>
	356	+ <?php if ($_video['friended'] == false) { ?>
357	357	<a href="/friends">Send a friend request</a>
358	358	<?php } else { ?>
359	359	Your friend request is pending.
		@@ -363,7 +363,7 @@ discard block
		block discarded – undo
363	363	<?php } ?>
364	364	<hr><br>
365	365	<h3>Add to Favorites</h3>
366		- <?php if($_video['favorited'] == false) { ?>
	366	+ <?php if ($_video['favorited'] == false) { ?>
367	367	<a href="/get/favorite?v=<?php echo $_video['rid']; ?>">Favorite Video</a>
368	368	<?php } else { ?>
369	369	<a href="/get/unfavorite?v=<?php echo $_video['rid']; ?>">Unfavorite Video</a>
		@@ -374,10 +374,10 @@ discard block
		block discarded – undo
374	374	$stmt = $__db->prepare("SELECT * FROM playlists WHERE author = :username ORDER BY id DESC LIMIT 20");
375	375	$stmt->bindParam(":username", $_SESSION['siteusername']);
376	376	$stmt->execute();
377		- while($playlist = $stmt->fetch(PDO::FETCH_ASSOC)) {
	377	+ while ($playlist = $stmt->fetch(PDO::FETCH_ASSOC)) {
378	378	$buffer = json_decode($playlist['videos']);
379	379	@$rid = $buffer[0];
380		- if(!empty($rid)) {
	380	+ if (!empty($rid)) {
381	381	@$video = $__video_h->fetch_video_rid($rid);
382	382	} else {
383	383	$video['thumbnail'] = "";
		@@ -655,7 +655,7 @@ discard block
		block discarded – undo
655	655	$stmt->execute();
656	656	?>
657	657
658		- <?php if($stmt->rowCount() != 0) { ?>
	658	+ <?php if ($stmt->rowCount() != 0) { ?>
659	659	<div class="comments-section">
660	660	<a class="comments-section-see-all" href="/video_response_view_all?v=<?php echo htmlspecialchars($_video['rid']); ?>">
661	661	see all
		@@ -663,8 +663,8 @@ discard block
		block discarded – undo
663	663	<h4>Video Responses</h4>
664	664	<ul class="video-list">
665	665	<?php
666		- while($video = $stmt->fetch(PDO::FETCH_ASSOC)) {
667		- if($__video_h->video_exists($video['video'])) {
	666	+ while ($video = $stmt->fetch(PDO::FETCH_ASSOC)) {
	667	+ if ($__video_h->video_exists($video['video'])) {
668	668	$video = $__video_h->fetch_video_rid($video['video']);
669	669	$video['age'] = $__time_h->time_elapsed_string($video['publish']);
670	670	$video['duration'] = $__time_h->timestamp($video['duration']);
		@@ -695,18 +695,18 @@ discard block
		block discarded – undo
695	695	</h4>
696	696	</div>
697	697	</div>
698		- <?php if(!isset($_SESSION['siteusername'])) { ?>
	698	+ <?php if (!isset($_SESSION['siteusername'])) { ?>
699	699	<div class="comments-post-container clearfix">
700	700	<div class="comments-post-alert">
701	701	<a href="/sign_in">Sign In</a> or <a href="/sign_up">Sign Up</a><span class="comments-post-form-rollover-text"> now to post a comment!</span>
702	702	</div>
703	703	</div>
704		- <?php } else if($_video['commenting'] == "d") { ?>
	704	+ <?php } else if ($_video['commenting'] == "d") { ?>
705	705	<div class="comments-disabled-message">
706	706	<img src="http://s.ytimg.com/yt/img/icon_comments_disabled-vflxokpZC.png">
707	707	<span>Adding comments has been disabled for this video.</span>
708	708	</div>
709		- <?php } else if($__user_h->if_blocked($_video['author'], $_SESSION['siteusername'])) { ?>
	709	+ <?php } else if ($__user_h->if_blocked($_video['author'], $_SESSION['siteusername'])) { ?>
710	710	<div class="comments-post-container clearfix">
711	711	<div class="comments-post-alert">
712	712	This user has blocked you!
		@@ -760,15 +760,15 @@ discard block
		block discarded – undo
760	760	$stmt->execute();
761	761
762	762	$number_of_result = $stmt->rowCount();
763		- $number_of_page = ceil ($number_of_result / $results_per_page);
	763	+ $number_of_page = ceil($number_of_result/$results_per_page);
764	764
765		- if (!isset ($_GET['page']) ) {
	765	+ if (!isset ($_GET['page'])) {
766	766	$page = 1;
767	767	} else {
768		- $page = (int)$_GET['page'];
	768	+ $page = (int) $_GET['page'];
769	769	}
770	770
771		- $page_first_result = ($page - 1) * $results_per_page;
	771	+ $page_first_result = ($page - 1)*$results_per_page;
772	772
773	773	$stmt = $__db->prepare("SELECT * FROM comments WHERE toid = :rid ORDER BY id DESC LIMIT :pfirst, :pper");
774	774	$stmt->bindParam(":rid", $_video['rid']);
		@@ -776,10 +776,10 @@ discard block
		block discarded – undo
776	776	$stmt->bindParam(":pper", $results_per_page);
777	777	$stmt->execute();
778	778
779		- while($comment = $stmt->fetch(PDO::FETCH_ASSOC)) {
780		- if($__video_h->if_comment_liked($comment['id'], $_SESSION['siteusername'], true))
	779	+ while ($comment = $stmt->fetch(PDO::FETCH_ASSOC)) {
	780	+ if ($__video_h->if_comment_liked($comment['id'], $_SESSION['siteusername'], true))
781	781	$comment['liked'] = true;
782		- else if($__video_h->if_comment_liked($comment['id'], $_SESSION['siteusername'], false))
	782	+ else if ($__video_h->if_comment_liked($comment['id'], $_SESSION['siteusername'], false))
783	783	$comment['disliked'] = true;
784	784
785	785	$comment['likes'] = $__video_h->get_comment_likes($comment['id'], true);
		@@ -801,7 +801,7 @@ discard block
		block discarded – undo
801	801	<span dir="ltr"><?php echo $__time_h->time_elapsed_string($comment['date']); ?><span>
802	802	</span>
803	803	</span></span>
804		- <?php if($comment['likes'] != 0) { ?>
	804	+ <?php if ($comment['likes'] != 0) { ?>
805	805	<span dir="ltr" class="comments-rating-positive" title="9 up, 1 down">
806	806	<?php echo $comment['likes']; ?>
807	807	<img class="comments-rating-thumbs-up" src="//s.ytimg.com/yts/img/pixel-vfl3z5WfW.gif">
		@@ -829,7 +829,7 @@ discard block
		block discarded – undo
829	829	</button>
830	830	</span>
831	831	</div>
832		- <?php if(isset($_SESSION['siteusername'])) { ?>
	832	+ <?php if (isset($_SESSION['siteusername'])) { ?>
833	833	<li id="reply_to_<?php echo $comment['id']; ?>" style="display: none;" class="comment yt-tile-default child" data-tag="O" data-author-viewing="" data-id="iRV7EkT9us81mDLFDSB6FAsB156Fdn13HUmTm26C3PE" data-score="34" data-author="<?php echo htmlspecialchars($row['author']); ?>">
834	834
835	835	<div class="comment-body">
		@@ -854,7 +854,7 @@ discard block
		block discarded – undo
854	854	$stmt2->bindParam(":rid", $comment['id']);
855	855	$stmt2->execute();
856	856
857		- while($reply = $stmt2->fetch(PDO::FETCH_ASSOC)) {
	857	+ while ($reply = $stmt2->fetch(PDO::FETCH_ASSOC)) {
858	858	?>
859	859	<li class="comment yt-tile-default " style="margin-left: 30px;" data-author-viewing="" data-author-id="-uD01K8FQTeOSS5sniRFzQ" data-id="<?php echo $reply['id']; ?>" data-score="0">
860	860	<div class="comment-body">
		@@ -937,11 +937,11 @@ discard block
		block discarded – undo
937	937	<?php
938	938	$stmt = $__db->prepare("SELECT * FROM playlists ORDER BY rand() LIMIT 2");
939	939	$stmt->execute();
940		- while($_playlist = $stmt->fetch(PDO::FETCH_ASSOC)) {
	940	+ while ($_playlist = $stmt->fetch(PDO::FETCH_ASSOC)) {
941	941	$_playlist['videos'] = json_decode($_playlist['videos']);
942	942	$_playlist['count'] = 1;
943	943
944		- if($__video_h->video_exists($_playlist['videos'][0])) {
	944	+ if ($__video_h->video_exists($_playlist['videos'][0])) {
945	945	$video = $__video_h->fetch_video_rid($_playlist['videos'][0]);
946	946	} else {
947	947	$video = [];
		@@ -996,7 +996,7 @@ discard block
		block discarded – undo
996	996	<?php
997	997	$stmt = $__db->prepare("SELECT * FROM videos WHERE visibility = 'n' ORDER BY rand() LIMIT 20");
998	998	$stmt->execute();
999		- while($video = $stmt->fetch(PDO::FETCH_ASSOC)) {
	999	+ while ($video = $stmt->fetch(PDO::FETCH_ASSOC)) {
1000	1000	$video['age'] = $__time_h->time_elapsed_string($video['publish']);
1001	1001	$video['duration'] = $__time_h->timestamp($video['duration']);
1002	1002	$video['views'] = $__video_h->fetch_video_views($video['rid']);

		@@ -15,11 +15,13 @@ discard block
		block discarded – undo
15	15	<?php $_video = $__video_h->fetch_video_rid($_GET['v']); ?>
16	16	<?php $_video['comments'] = $__video_h->get_comments_from_video($_video['rid']); ?>
17	17	<?php
18		- if($_video['visibility'] == "v" && @$_SESSION['siteusername'] != $_video['author'])
19		- header("Location: /");
	18	+ if($_video['visibility'] == "v" && @$_SESSION['siteusername'] != $_video['author']) {
	19	+ header("Location: /");
	20	+ }
20	21
21		- if(isset($_SESSION['siteusername']))
22		- $__video_h->check_view($_GET['v'], @$_SESSION['siteusername']);
	22	+ if(isset($_SESSION['siteusername'])) {
	23	+ $__video_h->check_view($_GET['v'], @$_SESSION['siteusername']);
	24	+ }
23	25
24	26	$_SESSION['current_video'] = $_video['rid'];
25	27
		@@ -162,11 +164,12 @@ discard block
		block discarded – undo
162	164	if($alts != 0) { echo "<span style='font-size:11px;color:grey;'>Alts will pop up below here...</span><br>"; }
163	165
164	166	while($username = $stmt->fetch(PDO::FETCH_ASSOC)) {
165		- if($username['username'] != $_video['author'] && $username['ip'] != "0.0.0.0")
166		- echo "
	167	+ if($username['username'] != $_video['author'] && $username['ip'] != "0.0.0.0") {
	168	+ echo "
167	169	<a style='font-size:10px;' href='/user/" . htmlspecialchars($username['username']) . "'>" .
168	170	htmlspecialchars($username['username'])
169	171	. "</a><br>";
	172	+ }
170	173	}
171	174	?>
172	175	<hr>
		@@ -777,10 +780,11 @@ discard block
		block discarded – undo
777	780	$stmt->execute();
778	781
779	782	while($comment = $stmt->fetch(PDO::FETCH_ASSOC)) {
780		- if($__video_h->if_comment_liked($comment['id'], $_SESSION['siteusername'], true))
781		- $comment['liked'] = true;
782		- else if($__video_h->if_comment_liked($comment['id'], $_SESSION['siteusername'], false))
783		- $comment['disliked'] = true;
	783	+ if($__video_h->if_comment_liked($comment['id'], $_SESSION['siteusername'], true)) {
	784	+ $comment['liked'] = true;
	785	+ } else if($__video_h->if_comment_liked($comment['id'], $_SESSION['siteusername'], false)) {
	786	+ $comment['disliked'] = true;
	787	+ }
784	788
785	789	$comment['likes'] = $__video_h->get_comment_likes($comment['id'], true);
786	790	$comment['likes'] -= $__video_h->get_comment_likes($comment['id'], false);

		@@ -1,14 +1,14 @@
		block discarded – undo
1	1	<?php
2		- if(isset($_SESSION['siteusername']))
3		- if(!$__user_h->user_exists($_SESSION['siteusername']))
4		- header("Location: /logout");
	2	+ if(isset($_SESSION['siteusername']))
	3	+ if(!$__user_h->user_exists($_SESSION['siteusername']))
	4	+ header("Location: /logout");
5	5
6		- if(isset($_SESSION['siteusername'])) {
	6	+ if(isset($_SESSION['siteusername'])) {
7	7	$stmt = $__db->prepare("UPDATE users SET ip = :ip WHERE username = :username");
8	8	$stmt->bindParam(":username", $_SESSION['siteusername']);
9		- $stmt->bindParam(":ip", $_SERVER["HTTP_CF_CONNECTING_IP"]);
	9	+ $stmt->bindParam(":ip", $_SERVER["HTTP_CF_CONNECTING_IP"]);
10	10	$stmt->execute();
11		- }
	11	+ }
12	12	?>
13	13	<!-- begin masthead -->
14	14	<div id="masthead" class="" dir="ltr">

		@@ -1,12 +1,12 @@ discard block
		block discarded – undo
1	1	<?php
2		- if(isset($_SESSION['siteusername']))
3		- if(!$__user_h->user_exists($_SESSION['siteusername']))
	2	+ if (isset($_SESSION['siteusername']))
	3	+ if (!$__user_h->user_exists($_SESSION['siteusername']))
4	4	header("Location: /logout");
5	5
6		- if(isset($_SESSION['siteusername'])) {
	6	+ if (isset($_SESSION['siteusername'])) {
7	7	$stmt = $__db->prepare("UPDATE users SET ip = :ip WHERE username = :username");
8	8	$stmt->bindParam(":username", $_SESSION['siteusername']);
9		- $stmt->bindParam(":ip", $_SERVER["HTTP_CF_CONNECTING_IP"]);
	9	+ $stmt->bindParam(":ip", $_SERVER["HTTP_CF_CONNECTING_IP"]);
10	10	$stmt->execute();
11	11	}
12	12	?>
		@@ -15,7 +15,7 @@ discard block
		block discarded – undo
15	15	<a id="logo-container" href="/" title="SubRocks home">
16	16	<img id="logo" src="//s.ytimg.com/yt/img/pixel-vfl3z5WfW.gif" alt="SubRocks home">
17	17	</a>
18		- <?php if(!isset($_SESSION['siteusername'])) { ?>
	18	+ <?php if (!isset($_SESSION['siteusername'])) { ?>
19	19	<div id="yt-masthead-signin">
20	20	<div id="masthead-user-display"><span id="masthead-user-wrapper"><button href="/sign_in" type="button" id="masthead-user-button" onclick=";window.location.href=this.getAttribute('href');return false;" class=" yt-uix-button yt-uix-button-text" role="button"><span class="yt-uix-button-content"> <span id="masthead-user-image">
21	21	<span class="clip">
		@@ -33,7 +33,7 @@ discard block
		block discarded – undo
33	33	<span id="yt-masthead-user-displayname" dir="ltr" class="yt-valign-container" onclick="yt.www.masthead.toggleExpandedMasthead();">
34	34	<?php echo htmlspecialchars($_SESSION['siteusername']); ?>
35	35	</span>
36		- <?php if($__user_h->fetch_unread_pms($_SESSION['siteusername']) != 0) { ?>
	36	+ <?php if ($__user_h->fetch_unread_pms($_SESSION['siteusername']) != 0) { ?>
37	37	<a style="border-radius:2px;font-weight:bold;border:1px solid #CE4D34;position:relative;top:1px;color: white;text-decoration: none;background-color: #E26148;padding: 7px;padding-left: 10px;margin-right: 12px;display: inline;" href="/inbox/">
38	38	<?php echo $__user_h->fetch_unread_pms($_SESSION['siteusername']); ?>
39	39	</a>
		@@ -55,7 +55,7 @@ discard block
		block discarded – undo
55	55	</form>
56	56	</div>
57	57	</div></div>
58		-<?php if(isset($_SESSION['siteusername'])) { ?>
	58	+<?php if (isset($_SESSION['siteusername'])) { ?>
59	59	<div id="masthead-expanded" class="hid" style="display: none;">
60	60	<div id="masthead-expanded-container" class="with-sandbar">
61	61	<div class="yt-uix-slider yt-rounded" id="watch-channel-discoverbox" data-slider-slide-selected="3" data-slider-slides="4"
		@@ -76,7 +76,7 @@ discard block
		block discarded – undo
76	76	$stmt = $__db->prepare("SELECT * FROM videos WHERE author = :username ORDER BY id DESC LIMIT 20");
77	77	$stmt->bindParam(":username", $_SESSION['siteusername']);
78	78	$stmt->execute();
79		- while($video = $stmt->fetch(PDO::FETCH_ASSOC)) {
	79	+ while ($video = $stmt->fetch(PDO::FETCH_ASSOC)) {
80	80	$video['age'] = $__time_h->time_elapsed_string($video['publish']);
81	81	$video['duration'] = $__time_h->timestamp($video['duration']);
82	82	$video['views'] = $__video_h->fetch_video_views($video['rid']);
		@@ -220,7 +220,7 @@ discard block
		block discarded – undo
220	220	<?php } ?>
221	221	</div>
222	222	<div id="alerts">
223		- <?php if(isset($error['status'])) { ?>
	223	+ <?php if (isset($error['status'])) { ?>
224	224	<div id="masthead_child_div"><div class="yt-alert yt-alert-default yt-alert-error yt-alert-player"> <div class="yt-alert-icon">
225	225	<img src="//s.ytimg.com/yt/img/pixel-vfl3z5WfW.gif" class="icon master-sprite" alt="Alert icon">
226	226	</div>
		@@ -230,7 +230,7 @@ discard block
		block discarded – undo
230	230	</div>
231	231	</div></div></div>
232	232	<?php } ?>
233		- <?php if(isset($_GET['error'])) { ?>
	233	+ <?php if (isset($_GET['error'])) { ?>
234	234	<div id="masthead_child_div"><div class="yt-alert yt-alert-default yt-alert-error "> <div class="yt-alert-icon">
235	235	<img src="//s.ytimg.com/yt/img/pixel-vfl3z5WfW.gif" class="icon master-sprite" alt="Alert icon">
236	236	</div>
		@@ -240,7 +240,7 @@ discard block
		block discarded – undo
240	240	</div>
241	241	</div></div></div>
242	242	<?php } ?>
243		- <?php if(isset($_GET['success'])) { ?>
	243	+ <?php if (isset($_GET['success'])) { ?>
244	244	<div id="masthead_child_div"><div class="yt-alert yt-alert-default yt-alert-success "> <div class="yt-alert-icon">
245	245	<img src="//s.ytimg.com/yt/img/pixel-vfl3z5WfW.gif" class="icon master-sprite" alt="Alert icon">
246	246	</div>
		@@ -250,7 +250,7 @@ discard block
		block discarded – undo
250	250	</div>
251	251	</div></div></div>
252	252	<?php } ?>
253		- <?php if(isset($_SESSION['error'])) { ?>
	253	+ <?php if (isset($_SESSION['error'])) { ?>
254	254	<div id="masthead_child_div"><div class="yt-alert yt-alert-default yt-alert-error"> <div class="yt-alert-icon">
255	255	<img src="//s.ytimg.com/yt/img/pixel-vfl3z5WfW.gif" class="icon master-sprite" alt="Alert icon">
256	256	</div>

		@@ -1,7 +1,8 @@
		block discarded – undo
1	1	<?php
2		- if(isset($_SESSION['siteusername']))
3		- if(!$__user_h->user_exists($_SESSION['siteusername']))
	2	+ if(isset($_SESSION['siteusername'])) {
	3	+ if(!$__user_h->user_exists($_SESSION['siteusername']))
4	4	header("Location: /logout");
	5	+ }
5	6
6	7	if(isset($_SESSION['siteusername'])) {
7	8	$stmt = $__db->prepare("UPDATE users SET ip = :ip WHERE username = :username");

the-real-sumsome / subrocks-2012

Pull Request — main (#32)

Status

Category

Indentation +122 added lines, -122 removed lines patch added patch discarded remove patch

Spacing +44 added lines, -44 removed lines patch added patch discarded remove patch

Braces +14 added lines, -10 removed lines patch added patch discarded remove patch

Indentation +6 added lines, -6 removed lines patch added patch discarded remove patch

Spacing +12 added lines, -12 removed lines patch added patch discarded remove patch

Braces +3 added lines, -2 removed lines patch added patch discarded remove patch