the-real-sumsome / subrocks-2012

web/public/d/upload.php

Spacing +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
         'target_upload_name' => md5_file($_FILES["video_file"]["tmp_name"]) . ".mp4",
     ];
 
-    if(move_uploaded_file(
+    if (move_uploaded_file(
         $_FILES['video_file']['tmp_name'], 
         "dynamic/temp/" . $video_properties->video_rid . $video_validation->video_file_type
     )) {

web/public/d/edit_video.php

Spacing +5 added lines, -5 removed lines

@@ -14,7 +14,7 @@ 
 <?php $__time_h = new time_helper(); ?>
 <?php
     $_video = $__video_h->fetch_video_rid($_GET['v']);
-    if($_video['author'] != @$_SESSION['siteusername']) {
+    if ($_video['author'] != @$_SESSION['siteusername']) {
         die();
     }
 
@@ -39,8 +39,8 @@ 
     $__video_u->update_row($_GET['v'], "thumbnail", $request->thumbnail);
     $__video_u->update_row($_GET['v'], "category", $request->category);
 
-    if($_SERVER['REQUEST_METHOD'] == 'POST' && @$_FILES['thumbnail']) {
-        if(!empty($_FILES["thumbnail"]["name"])) {
+    if ($_SERVER['REQUEST_METHOD'] == 'POST' && @$_FILES['thumbnail']) {
+        if (!empty($_FILES["thumbnail"]["name"])) {
             $target_dir = "dynamic/thumbs/";
             $imageFileType = strtolower(pathinfo($_FILES["thumbnail"]["name"], PATHINFO_EXTENSION));
             $target_name = md5_file($_FILES["thumbnail"]["tmp_name"]) . "." . $imageFileType;
@@ -50,8 +50,8 @@ 
             $uploadOk = true;
             $movedFile = false;
     
-            if($imageFileType != "jpg" && $imageFileType != "png" && $imageFileType != "jpeg"
-                && $imageFileType != "gif" ) {
+            if ($imageFileType != "jpg" && $imageFileType != "png" && $imageFileType != "jpeg"
+                && $imageFileType != "gif") {
                 $fileerror = 'unsupported file type. must be jpg, png, jpeg, or gif';
                 $uploadOk = false;
                 goto skip;

web/public/d/signup.php

Spacing +9 added lines, -9 removed lines

@@ -9,7 +9,7 @@ 
 <?php $__db_h = new db_helper(); ?>
 <?php $__time_h = new time_helper(); ?>
 <?php
-    if($_SERVER['REQUEST_METHOD'] == 'POST' && $_POST['password'] && $_POST['username']) {
+    if ($_SERVER['REQUEST_METHOD'] == 'POST' && $_POST['password'] && $_POST['username']) {
         $request = (object) [
             "username" => $_POST['username'],
             "password" => $_POST['password'],
@@ -23,25 +23,25 @@ 
         ]; 
 
         if (!filter_var($request->email, FILTER_VALIDATE_EMAIL)) 
-            { $request->error->message = "Your email is invalid!"; $request->error->status = "";  }
-        if(strlen($request->username) > 21) 
+            { $request->error->message = "Your email is invalid!"; $request->error->status = ""; }
+        if (strlen($request->username) > 21) 
             { $request->error->message = "Your username must be shorter than 21 characters."; $request->error->status = ""; }
-        if(strlen($request->password) < 8) 
+        if (strlen($request->password) < 8) 
             { $request->error->message = "Your password must at least be 8 characters long."; $request->error->status = ""; }
-        if(!preg_match('/[A-Za-z].*[0-9]|[0-9].*[A-Za-z]/', $request->password)) 
+        if (!preg_match('/[A-Za-z].*[0-9]|[0-9].*[A-Za-z]/', $request->password)) 
             { $request->error->message = "Include numbers and letters in your password!"; $request->error->status = ""; }
-        if(!preg_match('/^\S+\w\S{1,}/', $request->username)) 
+        if (!preg_match('/^\S+\w\S{1,}/', $request->username)) 
             { $request->error->message = "Your username cannot contain any special characters!"; $request->error->status = ""; }
-        if(empty(trim($request->username))) 
+        if (empty(trim($request->username))) 
             { $request->error->message = "Your username cannot be empty!"; $request->error->status = ""; }
         
         $stmt = $__db->prepare("SELECT username FROM users WHERE username = :username");
         $stmt->bindParam(":username", $username);
         $stmt->execute();
-        if($stmt->rowCount()) 
+        if ($stmt->rowCount()) 
             { $request->error->message = "There's already a user with that same username!"; $request->error->status = ""; }
         
-        if($request->error->status == "OK") {
+        if ($request->error->status == "OK") {
             $stmt = $__db->prepare("INSERT INTO users (username, email, password) VALUES (:username, :email, :password)");
             $stmt->bindParam(":username", $request->username);
             $stmt->bindParam(":email", $request->email);

web/public/homepage.php

Spacing +6 added lines, -6 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
@@ -174,7 +174,7 @@ 
 											</span>
 											</a>
 										</li>
-										<?php foreach($__server->featured_channels as $channel) { ?>
+										<?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" data-thumb="/dynamic/pfp/<?php echo $__user_h->fetch_pfp($channel); ?>" width="28"><span class="vertical-align"></span></span></span></span>
@@ -212,7 +212,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']);
@@ -235,7 +235,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']);
@@ -268,7 +268,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/classes/config.inc.php

Spacing +6 added lines, -6 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,7 +39,7 @@ 
         );
         $__server->db_properties->db_connected = true;
     }
-    catch(PDOException $e)
+    catch (PDOException $e)
     {
         $__server->db_properties->db_connected = false;
         die($e);

web/public/s/classes/user_insert.php

Spacing +2 added lines, -2 removed lines

@@ -10,7 +10,7 @@ 
 class user_insert {
     public $__db;
 
-	public function __construct($conn){
+	public function __construct($conn) {
         $this->__db = $conn;
 	}
 
@@ -19,7 +19,7 @@ 
         $stmt->bindParam(":user", $user);
         $stmt->bindParam(":vidid", $vidid);
         $stmt->execute();
-        if($stmt->rowCount() === 0) {
+        if ($stmt->rowCount() === 0) {
             $this->add_view_channel($vidid, $user);
         }
     }

web/public/s/classes/user_helper.php

Spacing +2 added lines, -2 removed lines

@@ -11,7 +11,7 @@ 
 class user_helper {
     public $__db;
 
-	public function __construct($conn){
+	public function __construct($conn) {
         $this->__db = $conn;
 	}
 
@@ -19,7 +19,7 @@ 
         $stmt = $this->__db->prepare("SELECT pfp FROM users WHERE username = :username");
         $stmt->bindParam(":username", $username);
         $stmt->execute();
-        while($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
+        while ($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
             $pfp = $row['pfp'];
         } // why the while statement? just remove it (i cant be bothered to)
 

web/public/s/classes/user_update.php

Spacing +3 added lines, -3 removed lines

@@ -10,20 +10,20 @@
 class user_update {
     public $__db;
 
-	public function __construct($conn){
+	public function __construct($conn) {
         $this->__db = $conn;
 	}
 
     // fuck this, this can be compressed into 2 functions
 
     function update_cooldown_time($username, $rowName) {
-        $stmt = $this->__db->prepare("UPDATE users SET ".$rowName." = now() WHERE username = :username");
+        $stmt = $this->__db->prepare("UPDATE users SET " . $rowName . " = now() WHERE username = :username");
         $stmt->bindParam(":username", $username);
         $stmt->execute();
     }
 
     function update_row($username, $rowName, $new) {
-        $stmt = $this->__db->prepare("UPDATE users SET ".$rowName." = :new WHERE username = :username");
+        $stmt = $this->__db->prepare("UPDATE users SET " . $rowName . " = :new WHERE username = :username");
         $stmt->bindParam(":new", $new);
         $stmt->bindParam(":username", $username);
         $stmt->execute();

web/public/s/classes/time_manip.php

Spacing +13 added lines, -13 removed lines

@@ -14,10 +14,10 @@ 
         $ago = new DateTime($datetime);
         $diff = $now->diff($ago);
     
-        $diff->w = floor($diff->d / 7);
-        $diff->d -= $diff->w * 7;
+        $diff->w = floor($diff->d/7);
+        $diff->d -= $diff->w*7;
     
-        if(!isset($cLang)) {
+        if (!isset($cLang)) {
             $string = array(
                 'y' => 'year',
                 'm' => 'month',
@@ -39,7 +39,7 @@ 
             );
         }
     
-        if(!isset($cLang)) {
+        if (!isset($cLang)) {
             foreach ($string as $k => &$v) {
                 if ($diff->$k) {
                     $v = $diff->$k . ' ' . $v . ($diff->$k > 1 ? 's' : '');
@@ -57,7 +57,7 @@ 
             }
         }
     
-        if(!isset($cLang)) {
+        if (!isset($cLang)) {
             if (!$full) $string = array_slice($string, 0, 1);
             return $string ? implode(', ', $string) . ' ago' : 'just now';
         } else {
@@ -71,23 +71,23 @@ 
         if ($seconds > 60*60*24) {
             // over a day
             return sprintf("%d:%s:%s:%s",
-                floor($seconds/60/60/24),                                 // Days
-                str_pad( floor($seconds/60/60%24), 2, "0", STR_PAD_LEFT), // Hours
-                str_pad( floor($seconds/60%60),    2, "0", STR_PAD_LEFT), // Minutes
-                str_pad(       $seconds%60,        2, "0", STR_PAD_LEFT)  // Seconds
+                floor($seconds/60/60/24), // Days
+                str_pad(floor($seconds/60/60%24), 2, "0", STR_PAD_LEFT), // Hours
+                str_pad(floor($seconds/60%60), 2, "0", STR_PAD_LEFT), // Minutes
+                str_pad($seconds%60, 2, "0", STR_PAD_LEFT)  // Seconds
             );
         } else if ($seconds > 60*60) {
             // over an hour
             return sprintf("%d:%s:%s",
-                        floor($seconds/60/60),                        // Hours
+                        floor($seconds/60/60), // Hours
                 str_pad(floor($seconds/60%60), 2, "0", STR_PAD_LEFT), // Minutes
-                str_pad(      $seconds%60,     2, "0", STR_PAD_LEFT)  // Seconds
+                str_pad($seconds%60, 2, "0", STR_PAD_LEFT)  // Seconds
             );
         } else {
             // less than an hour
             return sprintf("%d:%s",
-                        floor($seconds/60),                       // Minutes
-                str_pad(      $seconds%60,  2, "0", STR_PAD_LEFT) // Seconds
+                        floor($seconds/60), // Minutes
+                str_pad($seconds%60, 2, "0", STR_PAD_LEFT) // Seconds
             );
         }
     }