the-real-sumsome / subrocks-2012

d/post/upload.php

Spacing +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
         'target_upload_name' => md5_file($_FILES["fileToUpload"]["tmp_name"]) . "." . strtolower(pathinfo($_FILES["fileToUpload"]["name"], PATHINFO_EXTENSION)) // use video_file_type plzs
     ];
 
-    if(move_uploaded_file(
+    if (move_uploaded_file(
         $_FILES['fileToUpload']['tmp_name'], 
         "dynamic/temp/" . $video_properties->video_rid . $video_validation->video_file_type
     )) {

d/post/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,28 +23,28 @@ 
         ]; 
 
         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 = ?");
         $stmt->bind_param("s", $username);
         $stmt->execute();
         $result = $stmt->get_result();
-        if($result->num_rows) 
+        if ($result->num_rows) 
             { $request->error->message = "There's already a user with that same username!"; $request->error->status = ""; }
             
         echo json_encode($request->error);
         
-        if($request->error->status == "OK") {
+        if ($request->error->status == "OK") {
             $stmt = $__db->prepare("INSERT INTO users (username, email, password) VALUES (?, ?, ?)");
             $stmt->bind_param("sss", $request->username, $request->email, $request->password_hash);
             $stmt->execute();

d/post/channel_update.php

Spacing +38 added lines, -38 removed lines

@@ -34,8 +34,8 @@ 
         $stmt->execute();
         $stmt->close();
 
-        if($_SERVER['REQUEST_METHOD'] == 'POST' && @$_FILES['pfpset']) {
-            if(!empty($_FILES["pfpset"]["name"])) {
+        if ($_SERVER['REQUEST_METHOD'] == 'POST' && @$_FILES['pfpset']) {
+            if (!empty($_FILES["pfpset"]["name"])) {
                 $target_dir = "../pfp/";
                 $imageFileType = strtolower(pathinfo($_FILES["pfpset"]["name"], PATHINFO_EXTENSION));
                 $target_name = md5_file($_FILES["pfpset"]["tmp_name"]) . "." . $imageFileType;
@@ -45,8 +45,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;
@@ -69,8 +69,8 @@ 
                     }
                 }
             }
-        } else if($_SERVER['REQUEST_METHOD'] == 'POST' && @$_FILES['backgroundbgset']) {
-            if(!empty($_FILES["backgroundbgset"]["name"])) {
+        } else if ($_SERVER['REQUEST_METHOD'] == 'POST' && @$_FILES['backgroundbgset']) {
+            if (!empty($_FILES["backgroundbgset"]["name"])) {
                 $target_dir = "../banners/";
                 $imageFileType = strtolower(pathinfo($_FILES["backgroundbgset"]["name"], PATHINFO_EXTENSION));
                 $target_name = md5_file($_FILES["backgroundbgset"]["tmp_name"]) . "." . $imageFileType;
@@ -80,14 +80,14 @@ 
                 $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;
                 }
     
-                if($uploadOk) { 
+                if ($uploadOk) { 
                     if (file_exists($target_file)) {
                         $movedFile = true;
                     } else {
@@ -106,8 +106,8 @@ 
                     }
                 }
             }
-        } else if($_SERVER['REQUEST_METHOD'] == 'POST' && @$_POST['bannerset']) {
-            if(!empty($_FILES["file"]["name"])) {
+        } else if ($_SERVER['REQUEST_METHOD'] == 'POST' && @$_POST['bannerset']) {
+            if (!empty($_FILES["file"]["name"])) {
                 $target_dir = "../banners/";
                 $imageFileType = strtolower(pathinfo($_FILES["file"]["name"], PATHINFO_EXTENSION));
                 $target_name = md5_file($_FILES["file"]["tmp_name"]) . "." . $imageFileType;
@@ -117,14 +117,14 @@ 
                 $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;
                 }
     
-                if($uploadOk) { 
+                if ($uploadOk) { 
                     if (file_exists($target_file)) {
                         $movedFile = true;
                     } else {
@@ -143,8 +143,8 @@ 
                     }
                 } 
             }
-        } else if($_SERVER['REQUEST_METHOD'] == 'POST' && @$_FILES['videopagebanner']) {
-            if(!empty($_FILES["videopagebanner"]["name"])) {
+        } else if ($_SERVER['REQUEST_METHOD'] == 'POST' && @$_FILES['videopagebanner']) {
+            if (!empty($_FILES["videopagebanner"]["name"])) {
                 $target_dir = "../subscribe/";
                 $imageFileType = strtolower(pathinfo($_FILES["videopagebanner"]["name"], PATHINFO_EXTENSION));
                 $target_name = md5_file($_FILES["videopagebanner"]["tmp_name"]) . "." . $imageFileType;
@@ -154,14 +154,14 @@ 
                 $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;
                 }
     
-                if($uploadOk) { 
+                if ($uploadOk) { 
                     if (file_exists($target_file)) {
                         $movedFile = true;
                     } else {
@@ -182,126 +182,126 @@ 
             }
         }
 
-        if(!empty($_POST['bio'])) { 
+        if (!empty($_POST['bio'])) { 
             $__user_u->update_user_bio(
                 $_SESSION['siteusername'], 
                 $_POST['bio']
             );
         }
 
-        if(!empty($_POST['videoid'])) { 
+        if (!empty($_POST['videoid'])) { 
             $__user_u->update_user_channels(
                 $_SESSION['siteusername'], 
                 $_POST['videoid']
             );
         }
     
-        if(!empty($_POST['css'])) {
+        if (!empty($_POST['css'])) {
             $__user_u->update_user_css(
                 $_SESSION['siteusername'], 
                 $_POST['css']
             );
         }
 
-        if(!empty($_POST['videoid'])) {
+        if (!empty($_POST['videoid'])) {
             $__user_u->update_user_featured_video(
                 $_SESSION['siteusername'], 
                 $_POST['videoid']
             );
         }
 
-        if(!empty($_POST['solidcolor'])) {
+        if (!empty($_POST['solidcolor'])) {
             $__user_u->update_user_primary_color(
                 $_SESSION['siteusername'], 
                 $_POST['solidcolor']
             );
         }
 
-        if(!empty($_POST['transparency'])) {
+        if (!empty($_POST['transparency'])) {
             $__user_u->update_user_transparency(
                 $_SESSION['siteusername'], 
                 $_POST['transparency']
             );
         }
 
-        if(!empty($_POST['genre'])) {
+        if (!empty($_POST['genre'])) {
             $__user_u->update_user_genre(
                 $_SESSION['siteusername'], 
                 $_POST['genre']
             );
         }
 
-        if(!empty($_POST['bordercolor'])) {
+        if (!empty($_POST['bordercolor'])) {
             $__user_u->update_user_border_color(
                 $_SESSION['siteusername'], 
                 $_POST['bordercolor']
             );
         }
 
-        if(!empty($_POST['country'])) {
+        if (!empty($_POST['country'])) {
             $__user_u->update_user_country(
                 $_SESSION['siteusername'], 
                 $_POST['country']
             );
         }
 
-        if(!empty($_POST['header'])) {
+        if (!empty($_POST['header'])) {
             $__user_u->update_user_header(
                 $_SESSION['siteusername'], 
                 $_POST['header']
             );
         }
 
-        if(!empty($_POST['channels'])) {
+        if (!empty($_POST['channels'])) {
             $__user_u->update_user_channels(
                 $_SESSION['siteusername'], 
                 $_POST['channels']
             );
         }
 
-        if(!empty($_POST['customtext'])) {
+        if (!empty($_POST['customtext'])) {
             $__user_u->update_user_text(
                 $_SESSION['siteusername'], 
                 $_POST['customtext']
             );
         }
 
-        if(!empty($_POST['country'])) {
+        if (!empty($_POST['country'])) {
             $__user_u->update_user_text(
                 $_SESSION['siteusername'], 
                 $_POST['country']
             );
         }
 
-        if(!empty($_POST['website'])) {
+        if (!empty($_POST['website'])) {
             $__user_u->update_user_website(
                 $_SESSION['siteusername'], 
                 $_POST['website']
             );
         }
     
-        if(!empty($_POST['channelboxcolor'])) {
+        if (!empty($_POST['channelboxcolor'])) {
             $__user_u->update_user_secondary_color(
                 $_SESSION['siteusername'], 
                 $_POST['channelboxcolor']
             );
         }
 
-        if(!empty($_POST['backgroundcolor'])) {
+        if (!empty($_POST['backgroundcolor'])) {
             $__user_u->update_user_third_color(
                 $_POST['backgroundcolor'], 
                 $_SESSION['siteusername']
             );
         }
 
-        if(!empty($_POST['textmaincolor'])) {
+        if (!empty($_POST['textmaincolor'])) {
             $__user_u->update_user_primary_text_color(
                 $_SESSION['siteusername'], 
                 $_POST['textmaincolor']
             );
         }
 
-    if(!empty($_POST['bgoptionset'])) {
+    if (!empty($_POST['bgoptionset'])) {
         $bgoption = $_POST['bgoption'];
         $bgcolor = $_POST['solidcolor'];
         $default = "default.png";
@@ -316,7 +316,7 @@ 
             $_SESSION['siteusername']
         );  
 
-        if($bgoption == "solid") {
+        if ($bgoption == "solid") {
             $__user_u->update_user_bg_color_09(
                 $bgcolor, 
                 $_SESSION['siteusername']

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->bind_param("ss", $user, $vidid);
         $stmt->execute();
         $result = $stmt->get_result();
-        if($result->num_rows === 0) {
+        if ($result->num_rows === 0) {
             $this->add_view_channel($vidid, $user);
         }
         $stmt->close();

s/classes/user_update.php

Spacing +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
 class user_update {
     public $__db;
 
-	public function __construct($conn){
+	public function __construct($conn) {
         $this->__db = $conn;
 	}
 

s/classes/user_helper.php

Spacing +9 added lines, -9 removed lines

@@ -11,7 +11,7 @@ 
 class user_helper {
     public $__db;
 
-	public function __construct($conn){
+	public function __construct($conn) {
         $this->__db = $conn;
 	}
 
@@ -20,11 +20,11 @@ 
         $stmt->bind_param("s", $username);
         $stmt->execute();
         $result = $stmt->get_result();
-        while($row = $result->fetch_assoc()) {
+        while ($row = $result->fetch_assoc()) {
             $pfp = $row['pfp'];
         }
 
-        if(!isset($pfp))
+        if (!isset($pfp))
             return "default.png";
         else
             return $pfp;
@@ -50,7 +50,7 @@ 
             $stmt->execute();
         $result = $stmt->get_result();
         $user = $result->fetch_assoc();
-        if($result->num_rows === 1) { return true; } else { return false; }
+        if ($result->num_rows === 1) { return true; } else { return false; }
         $stmt->close();
         
         return $user;
@@ -62,7 +62,7 @@ 
         $stmt->execute();
         $result = $stmt->get_result();
         $user = $result->fetch_assoc();
-        if($result->num_rows === 1) { return true; } else { return false; }
+        if ($result->num_rows === 1) { return true; } else { return false; }
         $stmt->close();
         
         return $user;
@@ -74,7 +74,7 @@ 
         $stmt->execute();
         $result = $stmt->get_result();
         $user = $result->fetch_assoc();
-        if($result->num_rows === 1) { return true; } else { return false; }
+        if ($result->num_rows === 1) { return true; } else { return false; }
         $stmt->close();
         
         return $user;
@@ -87,7 +87,7 @@ 
         $result = $stmt->get_result();
         $user = $result->fetch_assoc();
 
-        if($result->num_rows === 0) 
+        if ($result->num_rows === 0) 
             return 0;
         else
             return $user;
@@ -101,7 +101,7 @@ 
             $stmt->execute();
         $result = $stmt->get_result();
         $user = $result->fetch_assoc();
-        if($result->num_rows === 1) { return true; } else { return false; }
+        if ($result->num_rows === 1) { return true; } else { return false; }
         $stmt->close();
         
         return $user;
@@ -113,7 +113,7 @@ 
         $stmt->execute();
         $result = $stmt->get_result();
         $user = $result->fetch_assoc();
-        if($result->num_rows === 1) { return true; } else { return false; }
+        if ($result->num_rows === 1) { return true; } else { return false; }
         $stmt->close();
         
         return $user;

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
             );
         }
     }

s/classes/db_helper.php

Spacing +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
 *
 **/
 class db_helper {
-	public function __construct(){
+	public function __construct() {
       
 	}
 

s/classes/config.inc.php

Spacing +5 added lines, -5 removed lines

@@ -17,10 +17,10 @@ 
             "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"],
     ];
 
     // sorry pdo doesnt cworkd i cant get it 2 work
@@ -29,7 +29,7 @@ 
                          $__server->db_properties->db_password,
                          $__server->db_properties->db_database);
 
-    if(!$__db->connect_error) {
+    if (!$__db->connect_error) {
         $__server->db_properties->db_connected = true;
     }
     mysqli_report(MYSQLI_REPORT_ERROR | MYSQLI_REPORT_STRICT);