the-real-sumsome / subrocks-2012

web/public/get/add_to_playlist.php

Spacing +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
 <?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);

web/public/index.php

Indentation +32 added lines, -32 removed lines

@@ -56,8 +56,8 @@ 
 							</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 @@ 
 							</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 @@ 
 							</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 @@ 
 									<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">

Spacing +8 added lines, -8 removed lines

@@ -37,7 +37,7 @@ 
 				<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 @@ 
 							</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 @@ 
 											</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 @@ 
                                                 $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 @@ 
 								<?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 @@ 
 								<?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 @@ 
 											<?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']);

web/public/s/mod/header.php

Spacing +8 added lines, -8 removed lines

@@ -5,7 +5,7 @@ 
 	<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 @@ 
 		<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 @@ 
 			</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 @@ 
                     $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 @@ 
 <?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 @@ 
 			</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 @@ 
 			</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 @@ 
 			</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>

web/public/s/classes/config.inc.php

Spacing +7 added lines, -7 removed lines

@@ -21,15 +21,15 @@ 
             "db_connected" => false,
         ], 
 
-        "video_properties" => (object) [ "status" => "unloaded" ],
-        "user_properties"  => (object) [ "status" => "unloaded" ],
-        "group_properties" => (object) [ "status" => "unloaded" ],
-        "forum_properties" => (object) [ "status" => "unloaded" ],
+        "video_properties" => (object) ["status" => "unloaded"],
+        "user_properties"  => (object) ["status" => "unloaded"],
+        "group_properties" => (object) ["status" => "unloaded"],
+        "forum_properties" => (object) ["status" => "unloaded"],
     ];
 
     try
     {
-        $__db = new PDO("mysql:host=".$__server->db_properties->db_host.";dbname=".$__server->db_properties->db_database.";charset=utf8mb4",
+        $__db = new PDO("mysql:host=" . $__server->db_properties->db_host . ";dbname=" . $__server->db_properties->db_database . ";charset=utf8mb4",
             $__server->db_properties->db_user,
             $__server->db_properties->db_password,
             [
@@ -39,9 +39,9 @@ 
         );
         $__server->db_properties->db_connected = true;
     }
-    catch(PDOException $e)
+    catch (PDOException $e)
     {
-        die("An error occured connecting to the database: ".$e->getMessage());
+        die("An error occured connecting to the database: " . $e->getMessage());
     }
 
     session_start();

Braces +1 added lines, -2 removed lines

@@ -38,8 +38,7 @@
             ]
         );
         $__server->db_properties->db_connected = true;
-    }
-    catch(PDOException $e)
+    } catch(PDOException $e)
     {
         die("An error occured connecting to the database: ".$e->getMessage());
     }