Skip to content

Commit a49d77a

Browse files
author
crispytx
committed
Merge pull request #29 from crispytx/a-branch
A branch
2 parents 7a44c3f + 468c8c9 commit a49d77a

File tree

4 files changed

+71
-58
lines changed

4 files changed

+71
-58
lines changed

‎index.html‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,6 @@ <h1 id="h1" onclick="goHome();">tube.php</h1>
157157
// the variable buttonClickStatus moniters the user-interface state for this single page application
158158
var buttonClickStatus = false;
159159
/*
160-
161160
~ User Interface Code ~
162161
163162
This single page application's userinterface consists of only 3 buttons:
@@ -173,7 +172,6 @@ <h1 id="h1" onclick="goHome();">tube.php</h1>
173172
174173
The right button will either change the user-interface state, or trigger an "upload file"
175174
event depending upon the status of buttonClickStatus variable.
176-
177175
*/
178176
function rightButtonFunction() {
179177
if (buttonClickStatus == false) {
@@ -190,7 +188,7 @@ <h1 id="h1" onclick="goHome();">tube.php</h1>
190188
} else {
191189
// DISPLAY MOVIES VIA AJAX
192190
var httpRequest = new XMLHttpRequest();
193-
var url = "movies.php"
191+
var url = "tube.php"
194192
httpRequest.open("GET", url, true);
195193
httpRequest.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
196194
httpRequest.onreadystatechange = function() {

‎movies.php‎

Lines changed: 0 additions & 27 deletions
This file was deleted.

‎tube.php‎

Lines changed: 65 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,69 @@
11
<?php
2-
$fileTitle = $_POST['file2'];
3-
$fileName= $_FILES["file1"]["name"];
4-
$fileTmpLoc = $_FILES["file1"]["tmp_name"];
5-
$fileType = $_FILES["file1"]["type"];
6-
$fileSize = $_FILES["file1"]["size"];
7-
$fileErrorMsg = $_FILES["file1"]["error"];
8-
if (!$fileTmpLoc) {
9-
echo "PC LOAD LETTER"; // no file selected before submitting AJAX POST Request
10-
exit();
2+
$databaseName = "DATABASE-NAME-GOES-HERE";
3+
$admin = "ADMIN-NAME-GOES-HERE";
4+
$password = "PASSWORD-GOES-HERE";
5+
function echoJSON($databaseName, $admin, $password) {
6+
$mysqli = new mysqli("localhost", $admin, $password, $databaseName);
7+
$query = "SELECT * FROM tubeTable;";
8+
$result = $mysqli->query($query);
9+
$movieCount = 0;
10+
while ($row = $result->fetch_assoc()) {
11+
$movieCount++;
12+
$movie[$movieCount]['title'] = $row['title'];
13+
$movie[$movieCount]['filename'] = $row['filename'];
14+
}
15+
if ($movieCount >= 1) {
16+
echo "{";
17+
echo "\"movies\": [";
18+
for ($i = $movieCount; $i >= 1; $i--) {
19+
echo "{";
20+
echo "\"title\":\"{$movie[$i]['title']}\",";
21+
echo "\"filename\":\"{$movie[$i]['filename']}\"";
22+
echo "}";
23+
if ($i > 1) {
24+
echo ",";
25+
}
26+
}
27+
echo "]";
28+
echo "}";
29+
}
30+
$mysqli->close();
1131
}
12-
if(move_uploaded_file($fileTmpLoc, "$fileName")) { // the second parameter can include a path to specify a location. example: "movies/$fileName"
13-
// ------------------------------------------------------------------------------------------------
14-
echo "UPLOAD COMPLETE: $fileName uploaded successfully"; // $fileName uploaded successfully
15-
mysql_connect('localhost', 'DATABASE-ADMINISTRATOR-NAME-GOES-HERE', 'DATABASE-PASSWORD-GOES-HERE');
16-
mysql_select_db('DATBASE-NAME-GOES-HERE') or die("Unable to select database");
17-
$query = "INSERT INTO dangerousTable VALUES (\"$fileTitle\", \"$fileName\");";
18-
mysql_query($query);
19-
mysql_close('DATABASE-NAME-GOES-HERE');
20-
// ------------------------------------------------------------------------------------------------
21-
$oldFileName = basename($_FILES["file1"]["name"]);
22-
$newFileName = substr($oldFileName, 0, strrpos($oldFileName, '.'));
23-
$newestFileName = $newFileName . ".html";
24-
$myfile = fopen("$newestFileName", "w") or die("Unable to open file!");
25-
$txt = "<center><video class=\"videoClass\" src=\"$oldFileName\" controls></video></center>";
26-
fwrite($myfile, $txt);
27-
fclose($myfile);
28-
// ------------------------------------------------------------------------------------------------
29-
} else {
30-
echo "PC LOAD LETTER"; // move_uploaded_file function failed
32+
function uploadFile($databaseName, $admin, $password) {
33+
$fileTitle = $_POST['file2'];
34+
$fileName= $_FILES["file1"]["name"];
35+
$fileTmpLoc = $_FILES["file1"]["tmp_name"];
36+
$fileType = $_FILES["file1"]["type"];
37+
$fileSize = $_FILES["file1"]["size"];
38+
$fileErrorMsg = $_FILES["file1"]["error"];
39+
if (!$fileTmpLoc) {
40+
echo "PC LOAD LETTER"; // no file selected before submitting AJAX POST Request
41+
exit();
42+
}
43+
if(move_uploaded_file($fileTmpLoc, "$fileName")) { // the second parameter can include a path to specify a location. example: "movies/$fileName"
44+
// ------------------------------------------------------------------------------------------------
45+
echo "UPLOAD COMPLETE: $fileName uploaded successfully"; // $fileName uploaded successfully
46+
mysql_connect('localhost', $admin, $password);
47+
mysql_select_db($databaseName) or die("Unable to select database");
48+
$query = "INSERT INTO tubeTable VALUES (\"$fileTitle\", \"$fileName\");";
49+
mysql_query($query);
50+
mysql_close($databaseName);
51+
// ------------------------------------------------------------------------------------------------
52+
$oldFileName = basename($_FILES["file1"]["name"]);
53+
$newFileName = substr($oldFileName, 0, strrpos($oldFileName, '.'));
54+
$newestFileName = $newFileName . ".html";
55+
$myfile = fopen("$newestFileName", "w") or die("Unable to open file!");
56+
$txt = "<center><video class=\"videoClass\" src=\"$oldFileName\" controls></video></center>";
57+
fwrite($myfile, $txt);
58+
fclose($myfile);
59+
// ------------------------------------------------------------------------------------------------
60+
} else {
61+
echo "PC LOAD LETTER"; // move_uploaded_file function failed
62+
}
63+
}
64+
if ($_SERVER['REQUEST_METHOD'] === 'GET') {
65+
echoJSON($databaseName, $admin, $password);
66+
} else if ($_SERVER['REQUEST_METHOD'] === 'POST') {
67+
uploadFile($databaseName, $admin, $password);
3168
}
3269
?>

‎tube.sql‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
CREATE DATABASE tubeDatabase;
2+
CREATE TABLE tubeTable (title TEXT, filename TEXT);
3+
4+
5+

0 commit comments

Comments
 (0)