Lanmikeman/openvk
Lanmikeman/openvk
1
1
Fork 0
mirror of https://github.com/openvk/openvk synced 2025-07-07 16:29:50 +03:00
Code Issues Projects Releases Packages Wiki Activity

fiksy bagiv

Browse source
This commit is contained in:
lalka2016 2023-05-30 12:39:36 +03:00
parent 4041fbc345
commit 95825b4b92
7 changed files with 104 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Web/Models/Repositories/Comments.php
View file

@ -66,20 +66,28 @@ class Comments
$notNullParams = []; $notNullParams = [];
foreach($pars as $paramName => $paramValue) { foreach($pars as $paramName => $paramValue)
if($paramName != "before" && $paramName != "after") if($paramName != "before" && $paramName != "after")
$paramValue != NULL ? $notNullParams+=["$paramName" => "%$paramValue%"] : NULL; $paramValue != NULL ? $notNullParams+=["$paramName" => "%$paramValue%"] : NULL;
else else
$paramValue != NULL ? $notNullParams+=["$paramName" => "$paramValue"] : NULL; $paramValue != NULL ? $notNullParams+=["$paramName" => "$paramValue"] : NULL;
}
$result = $this->comments->where("content LIKE ?", $query)->where("deleted", 0); $result = $this->comments->where("content LIKE ?", $query)->where("deleted", 0);
$nnparamsCount = sizeof($notNullParams); $nnparamsCount = sizeof($notNullParams);
if($nnparamsCount > 0) { if($nnparamsCount > 0) {
!is_null($notNullParams["before"]) ? $result->where("created < ?", $notNullParams["before"]) : NULL; foreach($notNullParams as $paramName => $paramValue) {
!is_null($notNullParams["after"]) ? $result->where("created > ?", $notNullParams["after"]) : NULL; switch($paramName) {
case "before":
$result->where("created < ?", $paramValue);
break;
case "after":
$result->where("created > ?", $paramValue);
break;
} }
}
}
return new Util\EntityStream("Comment", $result->order("$sort")); return new Util\EntityStream("Comment", $result->order("$sort"));
} }
} }

17
Web/Models/Repositories/Posts.php
View file

@ -106,20 +106,29 @@ class Posts
$notNullParams = []; $notNullParams = [];
foreach($pars as $paramName => $paramValue) { foreach($pars as $paramName => $paramValue)
if($paramName != "before" && $paramName != "after") if($paramName != "before" && $paramName != "after")
$paramValue != NULL ? $notNullParams+=["$paramName" => "%$paramValue%"] : NULL; $paramValue != NULL ? $notNullParams+=["$paramName" => "%$paramValue%"] : NULL;
else else
$paramValue != NULL ? $notNullParams+=["$paramName" => "$paramValue"] : NULL; $paramValue != NULL ? $notNullParams+=["$paramName" => "$paramValue"] : NULL;
}
$result = $this->posts->where("content LIKE ?", $query)->where("deleted", 0); $result = $this->posts->where("content LIKE ?", $query)->where("deleted", 0);
$nnparamsCount = sizeof($notNullParams); $nnparamsCount = sizeof($notNullParams);
if($nnparamsCount > 0) { if($nnparamsCount > 0) {
!is_null($notNullParams["before"]) ? $result->where("created < ?", $notNullParams["before"]) : NULL; foreach($notNullParams as $paramName => $paramValue) {
!is_null($notNullParams["after"]) ? $result->where("created > ?", $notNullParams["after"]) : NULL; switch($paramName) {
case "before":
$result->where("created < ?", $paramValue);
break;
case "after":
$result->where("created > ?", $paramValue);
break;
} }
}
}
return new Util\EntityStream("Post", $result->order("$sort")); return new Util\EntityStream("Post", $result->order("$sort"));
} }

86
Web/Models/Repositories/Users.php
View file

@ -57,37 +57,79 @@ class Users
$notNullParams = []; $notNullParams = [];
$nnparamsCount = 0; $nnparamsCount = 0;
foreach($pars as $paramName => $paramValue) { foreach($pars as $paramName => $paramValue)
if($paramName != "before" && $paramName != "after" && $paramName != "gender") if($paramName != "before" && $paramName != "after" && $paramName != "gender")
$paramValue != NULL ? $notNullParams += ["$paramName" => "%$paramValue%"] : NULL; $paramValue != NULL ? $notNullParams += ["$paramName" => "%$paramValue%"] : NULL;
else else
$paramValue != NULL ? $notNullParams += ["$paramName" => "$paramValue"] : NULL; $paramValue != NULL ? $notNullParams += ["$paramName" => "$paramValue"] : NULL;
}
$nnparamsCount = sizeof($notNullParams); $nnparamsCount = sizeof($notNullParams);
if($nnparamsCount > 0) { if($nnparamsCount > 0) {
!is_null($notNullParams["hometown"]) ? $result->where("hometown LIKE ?", $notNullParams["hometown"]) : NULL; foreach($notNullParams as $paramName => $paramValue) {
!is_null($notNullParams["city"]) ? $result->where("city LIKE ?", $notNullParams["city"]) : NULL; switch($paramName) {
!is_null($notNullParams["maritalstatus"]) ? $result->where("marital_status LIKE ?", $notNullParams["maritalstatus"]) : NULL; case "hometown":
!is_null($notNullParams["status"]) ? $result->where("status LIKE ?", $notNullParams["status"]) : NULL; $result->where("hometown LIKE ?", $paramValue);
!is_null($notNullParams["politViews"]) ? $result->where("polit_views LIKE ?", $notNullParams["politViews"]) : NULL; break;
!is_null($notNullParams["email"]) ? $result->where("email_contact LIKE ?", $notNullParams["email"]) : NULL; case "city":
!is_null($notNullParams["telegram"]) ? $result->where("telegram LIKE ?", $notNullParams["telegram"]) : NULL; $result->where("city LIKE ?", $paramValue);
!is_null($notNullParams["site"]) ? $result->where("website LIKE ?", $notNullParams["site"]) : NULL; break;
!is_null($notNullParams["address"]) ? $result->where("address LIKE ?", $notNullParams["address"]) : NULL; case "maritalstatus":
!is_null($notNullParams["is_online"]) ? $result->where("online >= ?", time() - 900) : NULL; $result->where("marital_status LIKE ?", $paramValue);
!is_null($notNullParams["interests"]) ? $result->where("interests LIKE ?", $notNullParams["interests"]) : NULL; break;
!is_null($notNullParams["fav_mus"]) ? $result->where("fav_music LIKE ?", $notNullParams["fav_mus"]) : NULL; case "status":
!is_null($notNullParams["fav_films"]) ? $result->where("fav_films LIKE ?", $notNullParams["fav_films"]) : NULL; $result->where("status LIKE ?", $paramValue);
!is_null($notNullParams["fav_shows"]) ? $result->where("fav_shows LIKE ?", $notNullParams["fav_shows"]) : NULL; break;
!is_null($notNullParams["fav_books"]) ? $result->where("fav_books LIKE ?", $notNullParams["fav_books"]) : NULL; case "politViews":
!is_null($notNullParams["fav_quote"]) ? $result->where("fav_quote LIKE ?", $notNullParams["fav_quote"]) : NULL; $result->where("polit_views LIKE ?", $paramValue);
!is_null($notNullParams["before"]) ? $result->where("UNIX_TIMESTAMP(since) < ?", $notNullParams["before"]) : NULL; break;
!is_null($notNullParams["after"]) ? $result->where("UNIX_TIMESTAMP(since) > ?", $notNullParams["after"]) : NULL; case "email":
!is_null($notNullParams["gender"]) ? $result->where("sex ?", $notNullParams["gender"]) : NULL; $result->where("email_contact LIKE ?", $paramValue);
# !is_null($notNullParams["has_avatar"]) ? $result->related(): NULL; break;
case "telegram":
$result->where("telegram LIKE ?", $paramValue);
break;
case "site":
$result->where("telegram LIKE ?", $paramValue);
break;
case "address":
$result->where("address LIKE ?", $paramValue);
break;
case "is_online":
$result->where("online >= ?", time() - 900);
break;
case "interests":
$result->where("interests LIKE ?", $paramValue);
break;
case "fav_mus":
$result->where("fav_music LIKE ?", $paramValue);
break;
case "fav_films":
$result->where("fav_films LIKE ?", $paramValue);
break;
case "fav_shows":
$result->where("fav_shows LIKE ?", $paramValue);
break;
case "fav_books":
$result->where("fav_books LIKE ?", $paramValue);
break;
case "fav_quote":
$result->where("fav_quote LIKE ?", $paramValue);
break;
case "before":
$result->where("UNIX_TIMESTAMP(since) < ?", $paramValue);
break;
case "after":
$result->where("UNIX_TIMESTAMP(since) > ?", $paramValue);
break;
case "gender":
$result->where("sex ?", $paramValue);
break;
} }
}
}
return new Util\EntityStream("User", $result->order($sort)); return new Util\EntityStream("User", $result->order($sort));
} }

17
Web/Models/Repositories/Videos.php
View file

@ -52,20 +52,29 @@ class Videos
$notNullParams = []; $notNullParams = [];
foreach($pars as $paramName => $paramValue) { foreach($pars as $paramName => $paramValue)
if($paramName != "before" && $paramName != "after") if($paramName != "before" && $paramName != "after")
$paramValue != NULL ? $notNullParams+=["$paramName" => "%$paramValue%"] : NULL; $paramValue != NULL ? $notNullParams+=["$paramName" => "%$paramValue%"] : NULL;
else else
$paramValue != NULL ? $notNullParams+=["$paramName" => "$paramValue"] : NULL; $paramValue != NULL ? $notNullParams+=["$paramName" => "$paramValue"] : NULL;
}
$result = $this->videos->where("name OR description LIKE ?", $query)->where("deleted", 0); $result = $this->videos->where("name OR description LIKE ?", $query)->where("deleted", 0);
$nnparamsCount = sizeof($notNullParams); $nnparamsCount = sizeof($notNullParams);
if($nnparamsCount > 0) { if($nnparamsCount > 0) {
!is_null($notNullParams["before"]) ? $result->where("created < ?", $notNullParams["before"]) : NULL; foreach($notNullParams as $paramName => $paramValue) {
!is_null($notNullParams["after"]) ? $result->where("created > ?", $notNullParams["after"]) : NULL; switch($paramName) {
case "before":
$result->where("created < ?", $paramValue);
break;
case "after":
$result->where("created > ?", $paramValue);
break;
} }
}
}
return new Util\EntityStream("Video", $result->order("$sort")); return new Util\EntityStream("Video", $result->order("$sort"));
} }
} }

3
Web/Presenters/SearchPresenter.php
View file

@ -57,9 +57,6 @@ final class SearchPresenter extends OpenVKPresenter
case "id": case "id":
$sort = "id " . $invert; $sort = "id " . $invert;
break; break;
case "random":
$sort = "RAND()";
break;
case "name": case "name":
$sort = "first_name " . $invert; $sort = "first_name " . $invert;
break; break;

1
Web/Presenters/templates/Search/Index.xml
View file

@ -249,7 +249,6 @@
<div class="searchOptionBlock" id="s_sort"> <div class="searchOptionBlock" id="s_sort">
<select name="sort" form="searcher" id="sortyor" onchange="this.value == 'random' ? document.getElementById('invertor').setAttribute('hidden', 'hidden') : document.getElementById('invertor').removeAttribute('hidden')"> <select name="sort" form="searcher" id="sortyor" onchange="this.value == 'random' ? document.getElementById('invertor').setAttribute('hidden', 'hidden') : document.getElementById('invertor').removeAttribute('hidden')">
<option value="id" {if $_GET["sort"] == "name"}selected{/if}>{_s_order_by_id}</option> <option value="id" {if $_GET["sort"] == "name"}selected{/if}>{_s_order_by_id}</option>
<option value="random" {if $_GET["sort"] == "random"}selected{/if}>{_s_order_by_random}</option>
{if $type == "users"} {if $type == "users"}
<option value="name" {if $_GET["sort"] == "name"}selected{/if}>{_s_order_by_name}</option> <option value="name" {if $_GET["sort"] == "name"}selected{/if}>{_s_order_by_name}</option>
{if OPENVK_ROOT_CONF["preferences"]["commerce"] != "false"} {if OPENVK_ROOT_CONF["preferences"]["commerce"] != "false"}

2
Web/static/js/openvk.cls.js
View file

@ -626,7 +626,7 @@ function resetSearch()
for(const select of selects) for(const select of selects)
{ {
if(select != sortyor) { if(select != sortyor && select != document.querySelector(".whatFind")) {
select.value = 0 select.value = 0
} }
} }