Remove deprecated && and || operators.

Author: wdamien

server/Maintenance.php

@@ -40,7 +40,7 @@
     $users = $db->execute("SELECT u.id as userId
                 FROM users as u
                 LEFT JOIN sessions as s ON s.userId=u.id
-                WHERE u.type='temporary' && s.id IS NULL LIMIT 10000");
+                WHERE u.type='temporary' AND s.id IS NULL LIMIT 10000");
 
     $tmpUserCount = count($users);
 
@@ -55,7 +55,7 @@
     $usersToDelete = quoteStringArray(array_column($users, "userId"));
 
     $db->begin();
-    $db->execute("DELETE FROM patterns WHERE visibility='private' && owner IN ($usersToDelete)");
+    $db->execute("DELETE FROM patterns WHERE visibility='private' AND owner IN ($usersToDelete)");
     $db->execute("DELETE FROM favorites WHERE userId IN ($usersToDelete)");
     $db->execute("DELETE FROM users WHERE id IN ($usersToDelete)");
     $db->commit();

server/actions/account/login.php

@@ -66,7 +66,7 @@ function tryLogin($type) {
                     if ($sessionData->type == "temporary") {
                         // Migrate all the temp users favorites / ratings / patterns to the correct user
                         // Then delete the old user / session.
-                        $existingUser = $this->db->execute("SELECT * FROM users WHERE email=? && type=?", [
+                        $existingUser = $this->db->execute("SELECT * FROM users WHERE email=? AND type=?", [
                             ["s", $email],
                             ["s", $type]
                         ], true);
@@ -87,7 +87,7 @@ function tryLogin($type) {
                             $this->db->execute("DELETE IGNORE
                                                 FROM favorites
                                                 WHERE userId=?
-                                                && patternId IN (SELECT patternId FROM (SELECT patternId FROM favorites WHERE userId=?) as child)
+                                                AND patternId IN (SELECT patternId FROM (SELECT patternId FROM favorites WHERE userId=?) as child)
                                             ", [
                                                 ["s", $temporaryUserId],
                                                 ["s", $existingUserId]
@@ -106,7 +106,7 @@ function tryLogin($type) {
                             $this->db->execute("DELETE IGNORE
                                                 FROM userRatings
                                                 WHERE userId=?
-                                                && patternId IN (SELECT patternId FROM (SELECT patternId FROM userRatings WHERE userId=?) as child)
+                                                AND patternId IN (SELECT patternId FROM (SELECT patternId FROM userRatings WHERE userId=?) as child)
                                             ", [
                                                 ["s", $temporaryUserId],
                                                 ["s", $existingUserId]
@@ -159,7 +159,7 @@ function tryLogin($type) {
                                 ]);
 
                 $accessToken = serialize($adapter->getAccessToken());
-                $userIdData = $this->db->execute("SELECT * FROM users WHERE email=? && type=?", [
+                $userIdData = $this->db->execute("SELECT * FROM users WHERE email=? AND type=?", [
                     ["s", $email],
                     ["s", $type]
                 ],true);

server/actions/patterns/delete.php

@@ -40,8 +40,8 @@ public function execute() {
 
             $sql = "SELECT id FROM patterns
                     WHERE id=?
-                    && owner=?
-                    && visibility IN ('$privateConst', '$protectedConst')";
+                    AND owner=?
+                    AND visibility IN ('$privateConst', '$protectedConst')";
 
             $exists = $this->db->execute($sql, [
                 ["s", $patternId],

server/actions/patterns/favorite.php

@@ -39,7 +39,7 @@ public function execute() {
                 ["s", $patternId],
             ]);
         } else {
-            $sql = "DELETE IGNORE FROM favorites WHERE patternId=? && userId=?";
+            $sql = "DELETE IGNORE FROM favorites WHERE patternId=? AND userId=?";
             $this->db->execute($sql, [
                 ["s", $patternId],
                 ["s", $userProfile->userId],

server/actions/patterns/rate.php

@@ -35,7 +35,7 @@ public function execute() {
         $userProfile = $this->getUserProfile();
         $voteQuery = null;
 
-        $sql = "SELECT * FROM userRatings WHERE patternId=? && userId=? LIMIT 1";
+        $sql = "SELECT * FROM userRatings WHERE patternId=? AND userId=? LIMIT 1";
         $existing = $this->db->execute($sql, [
             ["s", $patternId],
             ["s", $userProfile->userId]

server/actions/patterns/save.php

@@ -54,7 +54,7 @@ function savePattern($userProfile) {
             $protectedState = \core\PatternVisibility::PROTECTED;
             $privateState = \core\PatternVisibility::PRIVATE;
 
-            $sql = "SELECT * FROM patterns WHERE id=? && owner=? && visibility IN (?, ?) LIMIT 1";
+            $sql = "SELECT * FROM patterns WHERE id=? AND owner=? AND visibility IN (?, ?) LIMIT 1";
             $existingPattern = $this->db->execute($sql, [
                 ["s", $patternId],
                 ["s", $userProfile->userId],

server/actions/patterns/search.php

@@ -54,11 +54,11 @@ public function searchCommunity($query, $startIndex, $limit, $type) {
 
         if (!is_null($type)) {
             $typeArray = quoteStringArray($type);
-            $q .= " && p.flavor IN ($typeArray)";
+            $q .= " AND p.flavor IN ($typeArray)";
         }
 
         if (count($whereStatements) > 0) {
-            $q .= " && (" . implode("||", $whereStatements) . ")";
+            $q .= " AND (" . implode(" OR ", $whereStatements) . ")";
         }
 
         $q .= " GROUP BY p.id ORDER by p.ratingSort DESC LIMIT ?, ?";

server/core/DB.php

@@ -129,7 +129,7 @@ function exists($table, $values, &$result = null) {
             $params[] = ["s", $value];
         }
 
-        $where = implode(" && ", $where);
+        $where = implode(" AND ", $where);
 
         $q = "SELECT * FROM $table WHERE {$where} LIMIT 1";
         $result = $this->execute($q, $params);