Merge pull request #31 from crispytx/a-branch

A branch

Author: crispytx

tube.php

@@ -1,55 +1,10 @@
 <?php
-            // bubble sort & delete oldest movie
-            $databaseName = "DATABASE-NAME-GOES-HERE";
-            $admin = "ADMIN-NAME-GOES-HERE";
-            $password = "PASSWORD-GOES-HERE";
-	        $tableName = "TABLE-NAME-GOES-HERE";
-	
-			// Create a Multi Dimensional Array of Movie Data (time, title, filename)
-			$mysqli = new mysqli("localhost", $admin, $password, $databaseName);
-            $query = "SELECT * FROM $tableName;";
-            $result = $mysqli->query($query);
-            $movieCount = 0;
-            while ($row = $result->fetch_assoc()) {
-	            global $movieCount;
-                $movieCount++;
-	            $movie[$movieCount]['time'] = $row['time'];
-                $movie[$movieCount]['title'] = $row['title'];
-                $movie[$movieCount]['filename'] = $row['filename'];
-            }
-            $mysqli->close();
-	        
-			
-			//echo "$movieCount <br>";
-			
-			if ($movieCount >= 9) {
-	            // bubble sort $movie[]['time'] to retrieve oldest movie unix epoch time
-	            $keepSorting = true;
-                while ($keepSorting == true) {
-	                global $movie;
-                    $keepSorting = false;
-                    for ($i = 1; $i < $movieCount; $i++) {
-                        $a = $i;
-	                    $b = $i + 1;
-	                    if ($movie[$a]['time'] > $movie[$b]['time']) {
-		                    global $keepSorting;
-		                    $keepSorting = true;
-	                        $placeholder = $movie[$b]['time'];
-		                    $movie[$b]['time'] = $movie[$a]['time'];
-		                    $movie[$a]['time'] = $placeholder;
-	                    }  
-                    }
-                }
-				$oldestMovie = $movie[1]['time'];
-				//echo "$oldestMovie";
-				mysql_connect('localhost', $admin, $password);
-                mysql_select_db($databaseName) or die("Unable to select database");
-		        $query = "DELETE FROM $tableName WHERE time = $oldestMovie;";
-                mysql_query($query);
-                mysql_close($databaseName);
-			}
-			// movies sorted, oldest deleted
 
+    $databaseName = "DATABASE-NAME-GOES-HERE";
+    $admin = "ADMIN-NAME-GOES-HERE";
+    $password = "PASSWORD-GOES-HERE";
+	$tableName = "TABLE-NAME-GOES-HERE";
+	
     function echoJSON($databaseName, $admin, $password, $tableName) {
         $mysqli = new mysqli("localhost", $admin, $password, $databaseName);
         $query = "SELECT * FROM $tableName;";
@@ -77,6 +32,7 @@ function echoJSON($databaseName, $admin, $password, $tableName) {
         }
         $mysqli->close();
     }
+	
     function uploadFile($databaseName, $admin, $password, $tableName) {
         $fileTitle = $_POST['file2'];
         $fileName= $_FILES["file1"]["name"];
@@ -115,5 +71,47 @@ function uploadFile($databaseName, $admin, $password, $tableName) {
         echoJSON($databaseName, $admin, $password, $tableName);
     } else if ($_SERVER['REQUEST_METHOD'] === 'POST') {
         uploadFile($databaseName, $admin, $password, $tableName);
-    }
+		            
+		// bubble sort & delete oldest movie
+	    // Create a Multi Dimensional Array of Movie Data (time, title, filename)
+		$mysqli = new mysqli("localhost", $admin, $password, $databaseName);
+        $query = "SELECT * FROM $tableName;";
+        $result = $mysqli->query($query);
+        $movieCount = 0;
+        while ($row = $result->fetch_assoc()) {
+	        global $movieCount;
+            $movieCount++;
+	        $movie[$movieCount]['time'] = $row['time'];
+            $movie[$movieCount]['title'] = $row['title'];
+            $movie[$movieCount]['filename'] = $row['filename'];
+        }
+        $mysqli->close();
+	        
+		if ($movieCount >= 9) {
+	        // bubble sort $movie[]['time'] to retrieve oldest movie unix epoch time
+	        $keepSorting = true;
+            while ($keepSorting == true) {
+	            global $movie;
+                $keepSorting = false;
+                for ($i = 1; $i < $movieCount; $i++) {
+                    $a = $i;
+	                $b = $i + 1;
+	                if ($movie[$a]['time'] > $movie[$b]['time']) {
+		                global $keepSorting;
+		                $keepSorting = true;
+	                    $placeholder = $movie[$b]['time'];
+		                $movie[$b]['time'] = $movie[$a]['time'];
+		                $movie[$a]['time'] = $placeholder;
+	                }  
+                }
+            }
+			$oldestMovie = $movie[1]['time'];
+		    mysql_connect('localhost', $admin, $password);
+            mysql_select_db($databaseName) or die("Unable to select database");
+		    $query = "DELETE FROM $tableName WHERE time = $oldestMovie;";
+            mysql_query($query);
+            mysql_close($databaseName);
+		}
+		// movies sorted, oldest deleted
+    }    
 ?>