Fixed edit skipping on sandbox and added user@wiki search to logs

Author: kfiven

js/swv.js

@@ -976,7 +976,7 @@ angular.module("swv", ["ui.directives", "ui.filters"])
                 }
                 function addSandbox(sbList, wiki, page) {
                     if (sbList.hasOwnProperty(wiki))
-                        sbList[wiki] = sbList[wiki] + ", " + page;
+                        sbList[wiki] = sbList[wiki] + "," + page;
                 }
                 addSandbox(window.sandboxlist, "eswiki", "Wikipedia:Zona_de_pruebas/1");
                 addSandbox(window.sandboxlist, "eswiki", "Wikipedia:Zona_de_pruebas/2");
@@ -990,7 +990,6 @@ angular.module("swv", ["ui.directives", "ui.filters"])
                 addSandbox(window.sandboxlist, "eswiki", "Wikipedia:Zona_de_pruebas/10");
                 addSandbox(window.sandboxlist, "mediawikiwiki", "VisualEditor:Test");
                 addSandbox(window.sandboxlist, "simplewiki", "Wikipedia:Introduction");
-                addSandbox(window.sandboxlist, "wikidatawiki", "Wikidata:Sandbox");
                 addSandbox(window.sandboxlist, "wikidatawiki", "Q4115189");
                 addSandbox(window.sandboxlist, "wikidatawiki", "Q13406268");
                 addSandbox(window.sandboxlist, "wikidatawiki", "Q15397819");
@@ -1573,6 +1572,7 @@ function getDiff(serverUrl, scriptPath, wiki, newId, oldId) {
                     if (data.error.code === "nosuchrevid") reject(useLang["error-del"]);
                     reject(useLang["error-opening-del-spec"].replace("$1", escapeXSS(data.error.info)));
                 }
+                if (typeof data.compare === 'undefined') reject(`Please report this error to developer. ERROR: Unable to get difference. Info: ${url}`);
                 if (data.compare['*'] === "" || data.compare['*'].indexOf("<tr>") === -1) {
                     if (typeof oldId !== 'undefined') reject(useLang["error-already-reverted"]);
                     var newPageDiff = startstring + data.compare['*'] + endstring;

php/logs.php

@@ -11,21 +11,31 @@
 
 $_POST = json_decode(file_get_contents('php://input'), true);
 $searchPhrase = $_POST['sp'] . '%';
+$userPhrase = $searchPhrase;
+$wikiPhrase = $searchPhrase;
 $searchType = $_POST['st'] . '%';
 $limit = $_POST['li'];
 $offset = $_POST['of'];
 if ((!is_numeric($limit) && !is_null($limit) && !isset($limit)))
     exit();
 
+$separatorPos = strpos($searchPhrase, '@');
+
+if ($separatorPos !== false) {
+    $userPhrase = substr($searchPhrase, 0, $separatorPos);
+    $wikiPhrase = substr($searchPhrase, $separatorPos + 1);
+}
+
 $ts_pw = posix_getpwuid(posix_getuid());
 $ts_mycnf = parse_ini_file("/data/project/swviewer/security/replica.my.cnf");
 $db = new PDO("mysql:host=tools.labsdb;dbname=s53950__SWViewer;charset=utf8", $ts_mycnf['user'], $ts_mycnf['password']);
 unset($ts_mycnf, $ts_pw);
 
 $db->setAttribute(PDO::ATTR_EMULATE_PREPARES, false);
-$q = $db->prepare('SELECT * FROM logs WHERE (user LIKE :searchUser OR wiki LIKE :searchWiki) AND (type LIKE :searchType) ORDER BY date DESC LIMIT :limit OFFSET :offset');
-$q->bindParam(':searchUser', $searchPhrase, PDO::PARAM_STR);
-$q->bindParam(':searchWiki', $searchPhrase, PDO::PARAM_STR);
+if ($separatorPos === false) $q = $db->prepare('SELECT * FROM logs WHERE (user LIKE :searchUser OR wiki LIKE :searchWiki) AND (type LIKE :searchType) ORDER BY date DESC LIMIT :limit OFFSET :offset');
+else $q = $db->prepare('SELECT * FROM logs WHERE (user LIKE :searchUser AND wiki LIKE :searchWiki) AND (type LIKE :searchType) ORDER BY date DESC LIMIT :limit OFFSET :offset');
+$q->bindParam(':searchUser', $userPhrase, PDO::PARAM_STR);
+$q->bindParam(':searchWiki', $wikiPhrase, PDO::PARAM_STR);
 $q->bindParam(':searchType', $searchType, PDO::PARAM_STR);
 $q->bindParam(':limit', $limit, PDO::PARAM_INT);
 $q->bindParam(':offset', $offset, PDO::PARAM_INT);