From 08df6d64dd365f02cc767ecae512f0457db5f979 Mon Sep 17 00:00:00 2001
From: Lukas Heiligenbrunner <lukas.heiligenbrunner@gmail.com>
Date: Fri, 31 Jul 2020 01:05:58 +0200
Subject: [PATCH] delete unnecessary ordering in sql statements

---
 api/Settings.php  | 6 ------
 api/videoload.php | 6 +++---
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/api/Settings.php b/api/Settings.php
index c0afc23..f45410c 100644
--- a/api/Settings.php
+++ b/api/Settings.php
@@ -7,9 +7,6 @@ class Settings extends RequestBase {
             $query = "SELECT * from settings";
 
             $result = $this->conn->query($query);
-            if ($result->num_rows > 1) {
-                // todo throw error
-            }
 
             $r = mysqli_fetch_assoc($result);
             // booleans need to be set manually
@@ -45,9 +42,6 @@ class Settings extends RequestBase {
             $query = "SELECT * from settings";
 
             $result = $this->conn->query($query);
-            if ($result->num_rows > 1) {
-                // todo throw error
-            }
 
             $r = mysqli_fetch_assoc($result);
             if ($r['password'] != "-1") {
diff --git a/api/videoload.php b/api/videoload.php
index 0119650..b2c2e0f 100755
--- a/api/videoload.php
+++ b/api/videoload.php
@@ -14,7 +14,7 @@ class Video extends RequestBase {
 
     function initHandlers() {
         $this->addActionHandler("getMovies", function () {
-            $query = "SELECT movie_id,movie_name FROM videos ORDER BY create_date DESC, movie_name ASC";
+            $query = "SELECT movie_id,movie_name FROM videos ORDER BY create_date DESC, movie_name";
             if (isset($_POST['tag'])) {
                 $tag = $_POST['tag'];
                 if ($_POST['tag'] != "all") {
@@ -22,7 +22,7 @@ class Video extends RequestBase {
                             INNER JOIN video_tags vt on videos.movie_id = vt.video_id
                             INNER JOIN tags t on vt.tag_id = t.tag_id
                             WHERE t.tag_name = '$tag'
-                            ORDER BY likes DESC, create_date ASC, movie_name ASC";
+                            ORDER BY likes DESC, create_date, movie_name";
                 }
             }
             $result = $this->conn->query($query);
@@ -67,7 +67,7 @@ class Video extends RequestBase {
 
             $query = "SELECT movie_id,movie_name FROM videos 
                         WHERE movie_name LIKE '%$search%'
-                        ORDER BY likes DESC, create_date DESC, movie_name ASC";
+                        ORDER BY likes DESC, create_date DESC, movie_name";
             $result = $this->conn->query($query);
             $rows = array();
             while ($r = mysqli_fetch_assoc($result)) {