From 0b02e9b0bc95ffc1ea2ac000057ef12566633a35 Mon Sep 17 00:00:00 2001 From: tcourage Date: Mon, 4 Apr 2016 09:00:56 -0400 Subject: [PATCH] v0.3.0 - Added Search function --- .gitignore | 1 + browse/browse.php | 5 +--- browse/index.php | 12 ++++++-- browse/query.php | 72 +++++++++++++++++++++++++++++++++++++++++++++++ index.php | 5 ++-- upload.php | 6 +--- 6 files changed, 87 insertions(+), 14 deletions(-) create mode 100644 browse/query.php diff --git a/.gitignore b/.gitignore index e69de29..9672757 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +credentials.php diff --git a/browse/browse.php b/browse/browse.php index 49bc699..3238bc2 100644 --- a/browse/browse.php +++ b/browse/browse.php @@ -1,4 +1,5 @@ '; @@ -19,10 +20,6 @@ $fileType = array( // Types of files that are thumbnail'd ); // MySQL server connection info -$servername = "db_address"; -$username = "db_username"; -$password = "db_password"; -$dbname = "db_name"; $count = 0; diff --git a/browse/index.php b/browse/index.php index b4a1db8..4ad304d 100644 --- a/browse/index.php +++ b/browse/index.php @@ -12,8 +12,8 @@

Search by name

- Search: - + +
@@ -130,6 +130,14 @@ Member-Specific The Fuck You Say? + Laugh/Laughing + Racist + Spiderman + + + + + Spongebob diff --git a/browse/query.php b/browse/query.php new file mode 100644 index 0000000..a5ce18f --- /dev/null +++ b/browse/query.php @@ -0,0 +1,72 @@ +'; +echo ''; +echo 'Browse - Meme Machine'; +echo ''; +echo ''; +echo ''; +echo '
'; +echo '

Meme Machine

'; + + $count = 0; + //Connect to MySQL + $conn = mysqli_connect($servername, $username, $password, $dbname); + + if (!$conn) { + die ("CONNECTION FAIL " .mysqli_connect_error()); + } else { + } + + $term = $_POST['term']; + + + $tokens = explode(' ', $term); + $tokens = array_map( + function($term) { + return mysqli_real_escape_string(trim($term)); + }, + $tokens + ); + + $sql = "SELECT * FROM memes WHERE name LIKE '$term"; + $sql .= implode("%' or name LIKE '%", $tokens) . "'"; + + if(isset($_POST['search']) && $term){ + echo "Search term is: " . $term . "
"; + + $result = mysqli_query($conn, $sql); + + echo $sql; + if (mysqli_num_rows($result) > 0) { + while($row = mysqli_fetch_assoc($result)) { + $count++; + echo '' . $row['; + if ($count == 3) { + echo '
'; + } + } + } else { + echo "Your search returned no results. Please go back and try again"; + ?> +

 

+ Back + +

Please go back and enter a search query

+
+
+ Back + '; +echo ''; +?> diff --git a/index.php b/index.php index b546e08..025b3af 100644 --- a/index.php +++ b/index.php @@ -118,8 +118,7 @@ - Member-Specific - The Fuck You Say? + Spongebob @@ -141,6 +140,6 @@


-
Meme Machine v0.2.0 BETA
+
Meme Machine v0.3.0 BETA
diff --git a/upload.php b/upload.php index d84a702..a7de8df 100644 --- a/upload.php +++ b/upload.php @@ -1,14 +1,10 @@