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

Test Failed

Pull Request — main (#10)

unknown

created 2021-10-18 01:53 UTC

Status

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

@@ -8,17 +8,17 @@
 block discarded – undo
 <?php $__db_h = new db_helper(); ?>
 <?php $__time_h = new time_helper(); ?>
 <?php
-	if(!$__video_h->video_exists($_GET['v']))
-		header("Location: /?error=Your video has not processed correctly. Try reuploading it with a shorter title, description, or tag.");
+    if(!$__video_h->video_exists($_GET['v']))
+        header("Location: /?error=Your video has not processed correctly. Try reuploading it with a shorter title, description, or tag.");
 
-	$video = $__video_h->fetch_video_rid($_GET['v']);
-	$video['video_responses'] = $__video_h->get_video_responses($video['rid']);
-	$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);
+    $video = $__video_h->fetch_video_rid($_GET['v']);
+    $video['video_responses'] = $__video_h->get_video_responses($video['rid']);
+    $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);
 
     if($_SESSION['siteusername'] != $video['author'])
         header("Location: /");

Please login to merge, or discard this patch.

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

@@ -8,7 +8,7 @@  discard block
 block discarded – undo
 <?php $__db_h = new db_helper(); ?>
 <?php $__time_h = new time_helper(); ?>
 <?php
-	if(!$__video_h->video_exists($_GET['v']))
+	if (!$__video_h->video_exists($_GET['v']))
 		header("Location: /?error=Your video has not processed correctly. Try reuploading it with a shorter title, description, or tag.");
 
 	$video = $__video_h->fetch_video_rid($_GET['v']);
@@ -20,7 +20,7 @@  discard block
 block discarded – undo
 	$video['title'] = htmlspecialchars($video['title']);
 	$video['description'] = $__video_h->shorten_description($video['description'], 50);
 
-    if($_SESSION['siteusername'] != $video['author'])
+    if ($_SESSION['siteusername'] != $video['author'])
         header("Location: /");
 ?>
 <!DOCTYPE html>

Please login to merge, or discard this patch.

Braces +7 added lines, -5 removed lines patch added patch discarded remove patch

@@ -8,8 +8,9 @@  discard block
 block discarded – undo
 <?php $__db_h = new db_helper(); ?>
 <?php $__time_h = new time_helper(); ?>
 <?php
-	if(!$__video_h->video_exists($_GET['v']))
-		header("Location: /?error=Your video has not processed correctly. Try reuploading it with a shorter title, description, or tag.");
+	if(!$__video_h->video_exists($_GET['v'])) {
+			header("Location: /?error=Your video has not processed correctly. Try reuploading it with a shorter title, description, or tag.");
+	}
 
 	$video = $__video_h->fetch_video_rid($_GET['v']);
 	$video['video_responses'] = $__video_h->get_video_responses($video['rid']);
@@ -20,9 +21,10 @@  discard block
 block discarded – undo
 	$video['title'] = htmlspecialchars($video['title']);
 	$video['description'] = $__video_h->shorten_description($video['description'], 50);
 
-    if($_SESSION['siteusername'] != $video['author'])
-        header("Location: /");
-?>
+    if($_SESSION['siteusername'] != $video['author']) {
+            header("Location: /");
+    }
+    ?>
 <!DOCTYPE html>
 <html>
 	<head>

Please login to merge, or discard this patch.

web/public/get/add_to_playlist.php 1 patch

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

@@ -11,7 +11,7 @@
 block discarded – undo
 <?php
 $playlist = $__video_h->fetch_playlist_rid($_GET['playlist']);
 
-if($playlist['author'] == $_SESSION['siteusername']) {
+if ($playlist['author'] == $_SESSION['siteusername']) {
     $b = json_decode($playlist['videos']);
     array_push($b, $_GET['id']);
     $b = json_encode($b);

Please login to merge, or discard this patch.

web/public/index.php 2 patches

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

@@ -56,8 +56,8 @@  discard block
 block discarded – undo
 							</div>
 							<div class="guide">
 							<?php 
-								if(isset($_SESSION['siteusername'])) {
-								?>
+                                if(isset($_SESSION['siteusername'])) {
+                                ?>
 								<div style="/*! margin-top: 0px; *//*! margin-left: 10px; *//*! margin-bottom: 13px; */height: 99px;" class="guide-section feed-header channel first"><img alt="" src="/dynamic/pfp/<?php echo $__user_h->fetch_pfp($_SESSION['siteusername']); ?>" style="height: 88px;position: relative;top: 4px;left: 4px;" class="feed-header-thumb channel-thumb" width="88px"><div id="links" style="/*! margin-left: 5px; */position: relative;left: 13px;top: 7px;"><div style="font-size: 11px;margin-bottom: 6px;" class="metadata">
 								<a href="/user/<?php echo htmlspecialchars($_SESSION['siteusername']); ?>" style="color: inherit;">My channel
 								<img src="//s.ytimg.com/yt/img/pixel-vfl3z5WfW.gif" class="see-more-arrow" alt=""></a>        
@@ -203,16 +203,16 @@  discard block
 block discarded – undo
 							</p>
 							<ul>
 								<?php
-									$stmt = $__db->prepare("SELECT * FROM videos ORDER BY rand() LIMIT 4");
-									$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 ORDER BY rand() LIMIT 4");
+                                    $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="video-list-item-link yt-uix-sessionlink" data-sessionlink="ei=CNLr3rbS3rICFSwSIQodSW397Q%3D%3D&amp;feature=g-sptl%26cid%3Dinp-hs-ytg"><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="http://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="yuTBQ86r8o0" 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>
@@ -226,16 +226,16 @@  discard block
 block discarded – undo
 							</h3>
 							<ul>
 								<?php
-									$stmt = $__db->prepare("SELECT * FROM videos WHERE featured = 'v' ORDER BY id DESC LIMIT 4");
-									$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 featured = 'v' ORDER BY id DESC LIMIT 4");
+                                    $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="video-list-item-link yt-uix-sessionlink" data-sessionlink="ei=CNLr3rbS3rICFSwSIQodSW397Q%3D%3D&amp;feature=g-sptl%26cid%3Dinp-hs-ytg"><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="http://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="yuTBQ86r8o0" 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>
@@ -259,16 +259,16 @@  discard block
 block discarded – undo
 									<div class="feed-page">
 										<ul>
 											<?php
-												$stmt = $__db->prepare("SELECT * FROM videos ORDER BY id DESC 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 ORDER BY id DESC 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>
 												<div class="feed-item-container first " data-channel-key="UCR2A9ZNliJfgC66IvIpe-Zw">
 													<div class="feed-author-bubble-container">

Please login to merge, or discard this patch.

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

@@ -37,7 +37,7 @@  discard block
 block discarded – undo
 				<div id="content">
 					<div class="guide-layout-container enable-fancy-subscribe-button">
 						<div class="guide-container">
-						<?php if(!isset($_SESSION['siteusername'])) { ?>
+						<?php if (!isset($_SESSION['siteusername'])) { ?>
 									<div id="guide-builder-promo">
 								<h2>
 							Sign in to add channels to your homepage
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
 							</div>
 							<div class="guide">
 							<?php 
-								if(isset($_SESSION['siteusername'])) {
+								if (isset($_SESSION['siteusername'])) {
 								?>
 								<div style="/*! margin-top: 0px; *//*! margin-left: 10px; *//*! margin-bottom: 13px; */height: 99px;" class="guide-section feed-header channel first"><img alt="" src="/dynamic/pfp/<?php echo $__user_h->fetch_pfp($_SESSION['siteusername']); ?>" style="height: 88px;position: relative;top: 4px;left: 4px;" class="feed-header-thumb channel-thumb" width="88px"><div id="links" style="/*! margin-left: 5px; */position: relative;left: 13px;top: 7px;"><div style="font-size: 11px;margin-bottom: 6px;" class="metadata">
 								<a href="/user/<?php echo htmlspecialchars($_SESSION['siteusername']); ?>" style="color: inherit;">My channel
@@ -167,8 +167,8 @@  discard block
 block discarded – undo
 											</span>
 											</a>
 										</li>
-                                        <?php if(!isset($_SESSION['siteusername'])) { ?>
-                                            <?php foreach($__server->featured_channels as $channel) { ?>
+                                        <?php if (!isset($_SESSION['siteusername'])) { ?>
+                                            <?php foreach ($__server->featured_channels as $channel) { ?>
                                                 <li class="guide-item-container ">
                                                     <a class="guide-item" data-external-id="<?php echo htmlspecialchars($channel); ?>" data-feed-name="<?php echo htmlspecialchars($channel); ?>" data-feed-type="user">
                                                     <span class="thumb">  <span class="video-thumb ux-thumb yt-thumb-square-28 "><span class="yt-thumb-clip"><span class="yt-thumb-clip-inner"><img src="http://s.ytimg.com/yt/img/pixel-vfl3z5WfW.gif" alt="Thumbnail" onerror="this.onerror=null;this.src='/dynamic/thumbs/default.jpg';" data-thumb="/dynamic/pfp/<?php echo $__user_h->fetch_pfp($channel); ?>" width="28"><span class="vertical-align"></span></span></span></span>
@@ -183,7 +183,7 @@  discard block
 block discarded – undo
                                                 $stmt = $__db->prepare("SELECT * FROM subscribers WHERE sender = :username ORDER BY id DESC LIMIT 20");
                                                 $stmt->bindParam(":username", $_SESSION['siteusername']);
                                                 $stmt->execute();
-                                                while($channel = $stmt->fetch(PDO::FETCH_ASSOC)) { $channel = $channel['reciever']; ?>
+                                                while ($channel = $stmt->fetch(PDO::FETCH_ASSOC)) { $channel = $channel['reciever']; ?>
                                                 <li class="guide-item-container ">
                                                     <a class="guide-item" data-external-id="<?php echo htmlspecialchars($channel); ?>" data-feed-name="<?php echo htmlspecialchars($channel); ?>" data-feed-type="user">
                                                     <span class="thumb">  <span class="video-thumb ux-thumb yt-thumb-square-28 "><span class="yt-thumb-clip"><span class="yt-thumb-clip-inner"><img src="http://s.ytimg.com/yt/img/pixel-vfl3z5WfW.gif" alt="Thumbnail" onerror="this.onerror=null;this.src='/dynamic/thumbs/default.jpg';" data-thumb="/dynamic/pfp/<?php echo $__user_h->fetch_pfp($channel); ?>" width="28"><span class="vertical-align"></span></span></span></span>
@@ -222,7 +222,7 @@  discard block
 block discarded – undo
 								<?php
 									$stmt = $__db->prepare("SELECT * FROM videos ORDER BY rand() LIMIT 4");
 									$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']);
@@ -245,7 +245,7 @@  discard block
 block discarded – undo
 								<?php
 									$stmt = $__db->prepare("SELECT * FROM videos WHERE featured = 'v' ORDER BY id DESC LIMIT 4");
 									$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']);
@@ -278,7 +278,7 @@  discard block
 block discarded – undo
 											<?php
 												$stmt = $__db->prepare("SELECT * FROM videos ORDER BY id DESC 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.

web/public/s/mod/header.php 1 patch

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

@@ -5,7 +5,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">
@@ -23,7 +23,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>
@@ -45,7 +45,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"
@@ -66,7 +66,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']);
@@ -210,7 +210,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>
@@ -220,7 +220,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>
@@ -230,7 +230,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>
@@ -240,7 +240,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.

		@@ -8,17 +8,17 @@
		block discarded – undo
8	8	<?php $__db_h = new db_helper(); ?>
9	9	<?php $__time_h = new time_helper(); ?>
10	10	<?php
11		- if(!$__video_h->video_exists($_GET['v']))
12		- header("Location: /?error=Your video has not processed correctly. Try reuploading it with a shorter title, description, or tag.");
	11	+ if(!$__video_h->video_exists($_GET['v']))
	12	+ header("Location: /?error=Your video has not processed correctly. Try reuploading it with a shorter title, description, or tag.");
13	13
14		- $video = $__video_h->fetch_video_rid($_GET['v']);
15		- $video['video_responses'] = $__video_h->get_video_responses($video['rid']);
16		- $video['age'] = $__time_h->time_elapsed_string($video['publish']);
17		- $video['duration'] = $__time_h->timestamp($video['duration']);
18		- $video['views'] = $__video_h->fetch_video_views($video['rid']);
19		- $video['author'] = htmlspecialchars($video['author']);
20		- $video['title'] = htmlspecialchars($video['title']);
21		- $video['description'] = $__video_h->shorten_description($video['description'], 50);
	14	+ $video = $__video_h->fetch_video_rid($_GET['v']);
	15	+ $video['video_responses'] = $__video_h->get_video_responses($video['rid']);
	16	+ $video['age'] = $__time_h->time_elapsed_string($video['publish']);
	17	+ $video['duration'] = $__time_h->timestamp($video['duration']);
	18	+ $video['views'] = $__video_h->fetch_video_views($video['rid']);
	19	+ $video['author'] = htmlspecialchars($video['author']);
	20	+ $video['title'] = htmlspecialchars($video['title']);
	21	+ $video['description'] = $__video_h->shorten_description($video['description'], 50);
22	22
23	23	if($_SESSION['siteusername'] != $video['author'])
24	24	header("Location: /");

		@@ -8,7 +8,7 @@ discard block
		block discarded – undo
8	8	<?php $__db_h = new db_helper(); ?>
9	9	<?php $__time_h = new time_helper(); ?>
10	10	<?php
11		- if(!$__video_h->video_exists($_GET['v']))
	11	+ if (!$__video_h->video_exists($_GET['v']))
12	12	header("Location: /?error=Your video has not processed correctly. Try reuploading it with a shorter title, description, or tag.");
13	13
14	14	$video = $__video_h->fetch_video_rid($_GET['v']);
		@@ -20,7 +20,7 @@ discard block
		block discarded – undo
20	20	$video['title'] = htmlspecialchars($video['title']);
21	21	$video['description'] = $__video_h->shorten_description($video['description'], 50);
22	22
23		- if($_SESSION['siteusername'] != $video['author'])
	23	+ if ($_SESSION['siteusername'] != $video['author'])
24	24	header("Location: /");
25	25	?>
26	26	<!DOCTYPE html>

		@@ -8,8 +8,9 @@ discard block
		block discarded – undo
8	8	<?php $__db_h = new db_helper(); ?>
9	9	<?php $__time_h = new time_helper(); ?>
10	10	<?php
11		- if(!$__video_h->video_exists($_GET['v']))
12		- header("Location: /?error=Your video has not processed correctly. Try reuploading it with a shorter title, description, or tag.");
	11	+ if(!$__video_h->video_exists($_GET['v'])) {
	12	+ header("Location: /?error=Your video has not processed correctly. Try reuploading it with a shorter title, description, or tag.");
	13	+ }
13	14
14	15	$video = $__video_h->fetch_video_rid($_GET['v']);
15	16	$video['video_responses'] = $__video_h->get_video_responses($video['rid']);
		@@ -20,9 +21,10 @@ discard block
		block discarded – undo
20	21	$video['title'] = htmlspecialchars($video['title']);
21	22	$video['description'] = $__video_h->shorten_description($video['description'], 50);
22	23
23		- if($_SESSION['siteusername'] != $video['author'])
24		- header("Location: /");
25		-?>
	24	+ if($_SESSION['siteusername'] != $video['author']) {
	25	+ header("Location: /");
	26	+ }
	27	+ ?>
26	28	<!DOCTYPE html>
27	29	<html>
28	30	<head>

		@@ -11,7 +11,7 @@
		block discarded – undo
11	11	<?php
12	12	$playlist = $__video_h->fetch_playlist_rid($_GET['playlist']);
13	13
14		-if($playlist['author'] == $_SESSION['siteusername']) {
	14	+if ($playlist['author'] == $_SESSION['siteusername']) {
15	15	$b = json_decode($playlist['videos']);
16	16	array_push($b, $_GET['id']);
17	17	$b = json_encode($b);

		@@ -56,8 +56,8 @@ discard block
		block discarded – undo
56	56	</div>
57	57	<div class="guide">
58	58	<?php
59		- if(isset($_SESSION['siteusername'])) {
60		- ?>
	59	+ if(isset($_SESSION['siteusername'])) {
	60	+ ?>
61	61	<div style="/! margin-top: 0px; //! margin-left: 10px; //! margin-bottom: 13px; /height: 99px;" class="guide-section feed-header channel first"><img alt="" src="/dynamic/pfp/<?php echo $__user_h->fetch_pfp($_SESSION['siteusername']); ?>" style="height: 88px;position: relative;top: 4px;left: 4px;" class="feed-header-thumb channel-thumb" width="88px"><div id="links" style="/! margin-left: 5px; /position: relative;left: 13px;top: 7px;"><div style="font-size: 11px;margin-bottom: 6px;" class="metadata">
62	62	<a href="/user/<?php echo htmlspecialchars($_SESSION['siteusername']); ?>" style="color: inherit;">My channel
63	63	<img src="//s.ytimg.com/yt/img/pixel-vfl3z5WfW.gif" class="see-more-arrow" alt=""></a>
		@@ -203,16 +203,16 @@ discard block
		block discarded – undo
203	203	</p>
204	204	<ul>
205	205	<?php
206		- $stmt = $__db->prepare("SELECT * FROM videos ORDER BY rand() LIMIT 4");
207		- $stmt->execute();
208		- while($video = $stmt->fetch(PDO::FETCH_ASSOC)) {
209		- $video['age'] = $__time_h->time_elapsed_string($video['publish']);
210		- $video['duration'] = $__time_h->timestamp($video['duration']);
211		- $video['views'] = $__video_h->fetch_video_views($video['rid']);
212		- $video['author'] = htmlspecialchars($video['author']);
213		- $video['title'] = htmlspecialchars($video['title']);
214		- $video['description'] = $__video_h->shorten_description($video['description'], 50);
215		- ?>
	206	+ $stmt = $__db->prepare("SELECT * FROM videos ORDER BY rand() LIMIT 4");
	207	+ $stmt->execute();
	208	+ while($video = $stmt->fetch(PDO::FETCH_ASSOC)) {
	209	+ $video['age'] = $__time_h->time_elapsed_string($video['publish']);
	210	+ $video['duration'] = $__time_h->timestamp($video['duration']);
	211	+ $video['views'] = $__video_h->fetch_video_views($video['rid']);
	212	+ $video['author'] = htmlspecialchars($video['author']);
	213	+ $video['title'] = htmlspecialchars($video['title']);
	214	+ $video['description'] = $__video_h->shorten_description($video['description'], 50);
	215	+ ?>
216	216	<li class="video-list-item "><a href="/watch?v=<?php echo $video['rid']; ?>" class="video-list-item-link yt-uix-sessionlink" data-sessionlink="ei=CNLr3rbS3rICFSwSIQodSW397Q%3D%3D&feature=g-sptl%26cid%3Dinp-hs-ytg"><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="http://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>
217	217	<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="yuTBQ86r8o0" role="button"><span class="yt-uix-button-content"> <img src="//s.ytimg.com/yt/img/pixel-vfl3z5WfW.gif" alt="Watch Later">
218	218	</span><img class="yt-uix-button-arrow" src="//s.ytimg.com/yt/img/pixel-vfl3z5WfW.gif" alt=""></button>
		@@ -226,16 +226,16 @@ discard block
		block discarded – undo
226	226	</h3>
227	227	<ul>
228	228	<?php
229		- $stmt = $__db->prepare("SELECT * FROM videos WHERE featured = 'v' ORDER BY id DESC LIMIT 4");
230		- $stmt->execute();
231		- while($video = $stmt->fetch(PDO::FETCH_ASSOC)) {
232		- $video['age'] = $__time_h->time_elapsed_string($video['publish']);
233		- $video['duration'] = $__time_h->timestamp($video['duration']);
234		- $video['views'] = $__video_h->fetch_video_views($video['rid']);
235		- $video['author'] = htmlspecialchars($video['author']);
236		- $video['title'] = htmlspecialchars($video['title']);
237		- $video['description'] = $__video_h->shorten_description($video['description'], 50);
238		- ?>
	229	+ $stmt = $__db->prepare("SELECT * FROM videos WHERE featured = 'v' ORDER BY id DESC LIMIT 4");
	230	+ $stmt->execute();
	231	+ while($video = $stmt->fetch(PDO::FETCH_ASSOC)) {
	232	+ $video['age'] = $__time_h->time_elapsed_string($video['publish']);
	233	+ $video['duration'] = $__time_h->timestamp($video['duration']);
	234	+ $video['views'] = $__video_h->fetch_video_views($video['rid']);
	235	+ $video['author'] = htmlspecialchars($video['author']);
	236	+ $video['title'] = htmlspecialchars($video['title']);
	237	+ $video['description'] = $__video_h->shorten_description($video['description'], 50);
	238	+ ?>
239	239	<li class="video-list-item "><a href="/watch?v=<?php echo $video['rid']; ?>" class="video-list-item-link yt-uix-sessionlink" data-sessionlink="ei=CNLr3rbS3rICFSwSIQodSW397Q%3D%3D&feature=g-sptl%26cid%3Dinp-hs-ytg"><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="http://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>
240	240	<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="yuTBQ86r8o0" role="button"><span class="yt-uix-button-content"> <img src="//s.ytimg.com/yt/img/pixel-vfl3z5WfW.gif" alt="Watch Later">
241	241	</span><img class="yt-uix-button-arrow" src="//s.ytimg.com/yt/img/pixel-vfl3z5WfW.gif" alt=""></button>
		@@ -259,16 +259,16 @@ discard block
		block discarded – undo
259	259	<div class="feed-page">
260	260	<ul>
261	261	<?php
262		- $stmt = $__db->prepare("SELECT * FROM videos ORDER BY id DESC LIMIT 20");
263		- $stmt->execute();
264		- while($video = $stmt->fetch(PDO::FETCH_ASSOC)) {
265		- $video['age'] = $__time_h->time_elapsed_string($video['publish']);
266		- $video['duration'] = $__time_h->timestamp($video['duration']);
267		- $video['views'] = $__video_h->fetch_video_views($video['rid']);
268		- $video['author'] = htmlspecialchars($video['author']);
269		- $video['title'] = htmlspecialchars($video['title']);
270		- $video['description'] = $__video_h->shorten_description($video['description'], 50);
271		- ?>
	262	+ $stmt = $__db->prepare("SELECT * FROM videos ORDER BY id DESC LIMIT 20");
	263	+ $stmt->execute();
	264	+ while($video = $stmt->fetch(PDO::FETCH_ASSOC)) {
	265	+ $video['age'] = $__time_h->time_elapsed_string($video['publish']);
	266	+ $video['duration'] = $__time_h->timestamp($video['duration']);
	267	+ $video['views'] = $__video_h->fetch_video_views($video['rid']);
	268	+ $video['author'] = htmlspecialchars($video['author']);
	269	+ $video['title'] = htmlspecialchars($video['title']);
	270	+ $video['description'] = $__video_h->shorten_description($video['description'], 50);
	271	+ ?>
272	272	<li>
273	273	<div class="feed-item-container first " data-channel-key="UCR2A9ZNliJfgC66IvIpe-Zw">
274	274	<div class="feed-author-bubble-container">

		@@ -37,7 +37,7 @@ discard block
		block discarded – undo
37	37	<div id="content">
38	38	<div class="guide-layout-container enable-fancy-subscribe-button">
39	39	<div class="guide-container">
40		- <?php if(!isset($_SESSION['siteusername'])) { ?>
	40	+ <?php if (!isset($_SESSION['siteusername'])) { ?>
41	41	<div id="guide-builder-promo">
42	42	<h2>
43	43	Sign in to add channels to your homepage
		@@ -56,7 +56,7 @@ discard block
		block discarded – undo
56	56	</div>
57	57	<div class="guide">
58	58	<?php
59		- if(isset($_SESSION['siteusername'])) {
	59	+ if (isset($_SESSION['siteusername'])) {
60	60	?>
61	61	<div style="/! margin-top: 0px; //! margin-left: 10px; //! margin-bottom: 13px; /height: 99px;" class="guide-section feed-header channel first"><img alt="" src="/dynamic/pfp/<?php echo $__user_h->fetch_pfp($_SESSION['siteusername']); ?>" style="height: 88px;position: relative;top: 4px;left: 4px;" class="feed-header-thumb channel-thumb" width="88px"><div id="links" style="/! margin-left: 5px; /position: relative;left: 13px;top: 7px;"><div style="font-size: 11px;margin-bottom: 6px;" class="metadata">
62	62	<a href="/user/<?php echo htmlspecialchars($_SESSION['siteusername']); ?>" style="color: inherit;">My channel
		@@ -167,8 +167,8 @@ discard block
		block discarded – undo
167	167	</span>
168	168	</a>
169	169	</li>
170		- <?php if(!isset($_SESSION['siteusername'])) { ?>
171		- <?php foreach($__server->featured_channels as $channel) { ?>
	170	+ <?php if (!isset($_SESSION['siteusername'])) { ?>
	171	+ <?php foreach ($__server->featured_channels as $channel) { ?>
172	172	<li class="guide-item-container ">
173	173	<a class="guide-item" data-external-id="<?php echo htmlspecialchars($channel); ?>" data-feed-name="<?php echo htmlspecialchars($channel); ?>" data-feed-type="user">
174	174	<span class="thumb"> <span class="video-thumb ux-thumb yt-thumb-square-28 "><span class="yt-thumb-clip"><span class="yt-thumb-clip-inner"><img src="http://s.ytimg.com/yt/img/pixel-vfl3z5WfW.gif" alt="Thumbnail" onerror="this.onerror=null;this.src='/dynamic/thumbs/default.jpg';" data-thumb="/dynamic/pfp/<?php echo $__user_h->fetch_pfp($channel); ?>" width="28"><span class="vertical-align"></span></span></span></span>
		@@ -183,7 +183,7 @@ discard block
		block discarded – undo
183	183	$stmt = $__db->prepare("SELECT * FROM subscribers WHERE sender = :username ORDER BY id DESC LIMIT 20");
184	184	$stmt->bindParam(":username", $_SESSION['siteusername']);
185	185	$stmt->execute();
186		- while($channel = $stmt->fetch(PDO::FETCH_ASSOC)) { $channel = $channel['reciever']; ?>
	186	+ while ($channel = $stmt->fetch(PDO::FETCH_ASSOC)) { $channel = $channel['reciever']; ?>
187	187	<li class="guide-item-container ">
188	188	<a class="guide-item" data-external-id="<?php echo htmlspecialchars($channel); ?>" data-feed-name="<?php echo htmlspecialchars($channel); ?>" data-feed-type="user">
189	189	<span class="thumb"> <span class="video-thumb ux-thumb yt-thumb-square-28 "><span class="yt-thumb-clip"><span class="yt-thumb-clip-inner"><img src="http://s.ytimg.com/yt/img/pixel-vfl3z5WfW.gif" alt="Thumbnail" onerror="this.onerror=null;this.src='/dynamic/thumbs/default.jpg';" data-thumb="/dynamic/pfp/<?php echo $__user_h->fetch_pfp($channel); ?>" width="28"><span class="vertical-align"></span></span></span></span>
		@@ -222,7 +222,7 @@ discard block
		block discarded – undo
222	222	<?php
223	223	$stmt = $__db->prepare("SELECT * FROM videos ORDER BY rand() LIMIT 4");
224	224	$stmt->execute();
225		- while($video = $stmt->fetch(PDO::FETCH_ASSOC)) {
	225	+ while ($video = $stmt->fetch(PDO::FETCH_ASSOC)) {
226	226	$video['age'] = $__time_h->time_elapsed_string($video['publish']);
227	227	$video['duration'] = $__time_h->timestamp($video['duration']);
228	228	$video['views'] = $__video_h->fetch_video_views($video['rid']);
		@@ -245,7 +245,7 @@ discard block
		block discarded – undo
245	245	<?php
246	246	$stmt = $__db->prepare("SELECT * FROM videos WHERE featured = 'v' ORDER BY id DESC LIMIT 4");
247	247	$stmt->execute();
248		- while($video = $stmt->fetch(PDO::FETCH_ASSOC)) {
	248	+ while ($video = $stmt->fetch(PDO::FETCH_ASSOC)) {
249	249	$video['age'] = $__time_h->time_elapsed_string($video['publish']);
250	250	$video['duration'] = $__time_h->timestamp($video['duration']);
251	251	$video['views'] = $__video_h->fetch_video_views($video['rid']);
		@@ -278,7 +278,7 @@ discard block
		block discarded – undo
278	278	<?php
279	279	$stmt = $__db->prepare("SELECT * FROM videos ORDER BY id DESC LIMIT 20");
280	280	$stmt->execute();
281		- while($video = $stmt->fetch(PDO::FETCH_ASSOC)) {
	281	+ while ($video = $stmt->fetch(PDO::FETCH_ASSOC)) {
282	282	$video['age'] = $__time_h->time_elapsed_string($video['publish']);
283	283	$video['duration'] = $__time_h->timestamp($video['duration']);
284	284	$video['views'] = $__video_h->fetch_video_views($video['rid']);

		@@ -5,7 +5,7 @@ discard block
		block discarded – undo
5	5	<a id="logo-container" href="/" title="SubRocks home">
6	6	<img id="logo" src="//s.ytimg.com/yt/img/pixel-vfl3z5WfW.gif" alt="SubRocks home">
7	7	</a>
8		- <?php if(!isset($_SESSION['siteusername'])) { ?>
	8	+ <?php if (!isset($_SESSION['siteusername'])) { ?>
9	9	<div id="yt-masthead-signin">
10	10	<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">
11	11	<span class="clip">
		@@ -23,7 +23,7 @@ discard block
		block discarded – undo
23	23	<span id="yt-masthead-user-displayname" dir="ltr" class="yt-valign-container" onclick="yt.www.masthead.toggleExpandedMasthead();">
24	24	<?php echo htmlspecialchars($_SESSION['siteusername']); ?>
25	25	</span>
26		- <?php if($__user_h->fetch_unread_pms($_SESSION['siteusername']) != 0) { ?>
	26	+ <?php if ($__user_h->fetch_unread_pms($_SESSION['siteusername']) != 0) { ?>
27	27	<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/">
28	28	<?php echo $__user_h->fetch_unread_pms($_SESSION['siteusername']); ?>
29	29	</a>
		@@ -45,7 +45,7 @@ discard block
		block discarded – undo
45	45	</form>
46	46	</div>
47	47	</div></div>
48		-<?php if(isset($_SESSION['siteusername'])) { ?>
	48	+<?php if (isset($_SESSION['siteusername'])) { ?>
49	49	<div id="masthead-expanded" class="hid" style="display: none;">
50	50	<div id="masthead-expanded-container" class="with-sandbar">
51	51	<div class="yt-uix-slider yt-rounded" id="watch-channel-discoverbox" data-slider-slide-selected="3" data-slider-slides="4"
		@@ -66,7 +66,7 @@ discard block
		block discarded – undo
66	66	$stmt = $__db->prepare("SELECT * FROM videos WHERE author = :username ORDER BY id DESC LIMIT 20");
67	67	$stmt->bindParam(":username", $_SESSION['siteusername']);
68	68	$stmt->execute();
69		- while($video = $stmt->fetch(PDO::FETCH_ASSOC)) {
	69	+ while ($video = $stmt->fetch(PDO::FETCH_ASSOC)) {
70	70	$video['age'] = $__time_h->time_elapsed_string($video['publish']);
71	71	$video['duration'] = $__time_h->timestamp($video['duration']);
72	72	$video['views'] = $__video_h->fetch_video_views($video['rid']);
		@@ -210,7 +210,7 @@ discard block
		block discarded – undo
210	210	<?php } ?>
211	211	</div>
212	212	<div id="alerts">
213		- <?php if(isset($error['status'])) { ?>
	213	+ <?php if (isset($error['status'])) { ?>
214	214	<div id="masthead_child_div"><div class="yt-alert yt-alert-default yt-alert-error yt-alert-player"> <div class="yt-alert-icon">
215	215	<img src="//s.ytimg.com/yt/img/pixel-vfl3z5WfW.gif" class="icon master-sprite" alt="Alert icon">
216	216	</div>
		@@ -220,7 +220,7 @@ discard block
		block discarded – undo
220	220	</div>
221	221	</div></div></div>
222	222	<?php } ?>
223		- <?php if(isset($_GET['error'])) { ?>
	223	+ <?php if (isset($_GET['error'])) { ?>
224	224	<div id="masthead_child_div"><div class="yt-alert yt-alert-default yt-alert-error "> <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['success'])) { ?>
	233	+ <?php if (isset($_GET['success'])) { ?>
234	234	<div id="masthead_child_div"><div class="yt-alert yt-alert-default yt-alert-success "> <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($_SESSION['error'])) { ?>
	243	+ <?php if (isset($_SESSION['error'])) { ?>
244	244	<div id="masthead_child_div"><div class="yt-alert yt-alert-default yt-alert-error"> <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>

the-real-sumsome / subrocks-2012

Pull Request — main (#10)

Status

Category

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

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

Braces +7 added lines, -5 removed lines patch added patch discarded remove patch

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

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

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

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