james/fembooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

publicise Ratings functions because Pools wants to do the same thing

Browse Source
This commit is contained in:
Shish 2009-11-15 05:45:50 +00:00
parent e61b1fe954
commit 63d186d8c9
2 changed files with 28 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
contrib/pools/main.php
View File

@ -467,7 +467,7 @@ class Pools extends SimpleExtension {
private function get_posts($event, $poolID) { private function get_posts($event, $poolID) {
global $config, $user, $database; global $config, $user, $database;
$pageNumber = $event->get_arg(2); $pageNumber = int_esscape($event->get_arg(2));
if(is_null($pageNumber) || !is_numeric($pageNumber)) if(is_null($pageNumber) || !is_numeric($pageNumber))
$pageNumber = 0; $pageNumber = 0;
else if ($pageNumber <= 0) else if ($pageNumber <= 0)
@ -480,7 +480,7 @@ class Pools extends SimpleExtension {
$imagesPerPage = $config->get_int("poolsImagesPerPage"); $imagesPerPage = $config->get_int("poolsImagesPerPage");
// WE CHECK IF THE EXTENSION RATING IS INSTALLED, WICH VERSION AND IF IT WORKS TO SHOW/HIDE SAFE, QUESTIONABLE, EXPLICIT AND UNRATED IMAGES FROM USER // WE CHECK IF THE EXTENSION RATING IS INSTALLED, WICH VERSION AND IF IT WORKS TO SHOW/HIDE SAFE, QUESTIONABLE, EXPLICIT AND UNRATED IMAGES FROM USER
if($config->get_int("ext_ratings2_version") < 3) { if(class_exists("Ratings") && $config->get_int("ext_ratings2_version") < 3) {
$result = $database->get_all("SELECT image_id ". $result = $database->get_all("SELECT image_id ".
"FROM pool_images ". "FROM pool_images ".
"WHERE pool_id=? ". "WHERE pool_id=? ".
@ -490,21 +490,8 @@ class Pools extends SimpleExtension {
$totalPages = ceil($database->db->GetOne("SELECT COUNT(*) FROM pool_images WHERE pool_id=?",array($poolID)) / $imagesPerPage); $totalPages = ceil($database->db->GetOne("SELECT COUNT(*) FROM pool_images WHERE pool_id=?",array($poolID)) / $imagesPerPage);
} }
if($config->get_int("ext_ratings2_version") >= 3) { if(class_exists("Ratings") && $config->get_int("ext_ratings2_version") >= 3) {
if($user->is_anonymous()) { $rating = Ratings::privs_to_sql(Ratings::get_user_privs($user));
$sqes = $config->get_string("ext_rating_anon_privs");
}
else if($user->is_admin()) {
$sqes = $config->get_string("ext_rating_admin_privs");
}
else {
$sqes = $config->get_string("ext_rating_user_privs");
}
$arr = array();
for($i=0; $i<strlen($sqes); $i++) {
$arr[] = "'" . $sqes[$i] . "'";
}
$rating = join(', ', $arr);
$result = $database->get_all("SELECT p.image_id ". $result = $database->get_all("SELECT p.image_id ".
"FROM pool_images AS p ". "FROM pool_images AS p ".

38
contrib/rating/main.php
View File

@ -101,20 +101,7 @@ class Ratings implements Extension {
if($event instanceof SearchTermParseEvent) { if($event instanceof SearchTermParseEvent) {
$matches = array(); $matches = array();
if(is_null($event->term) && $this->no_rating_query($event->context)) { if(is_null($event->term) && $this->no_rating_query($event->context)) {
if($user->is_anonymous()) { $set = Ratings::privs_to_sql(Ratings::get_user_privs($user));
$sqes = $config->get_string("ext_rating_anon_privs");
}
else if($user->is_admin()) {
$sqes = $config->get_string("ext_rating_admin_privs");
}
else {
$sqes = $config->get_string("ext_rating_user_privs");
}
$arr = array();
for($i=0; $i<strlen($sqes); $i++) {
$arr[] = "'" . $sqes[$i] . "'";
}
$set = join(', ', $arr);
$event->add_querylet(new Querylet("rating IN ($set)")); $event->add_querylet(new Querylet("rating IN ($set)"));
} }
if(preg_match("/^rating=([sqeu]+)$/", $event->term, $matches)) { if(preg_match("/^rating=([sqeu]+)$/", $event->term, $matches)) {
@ -134,6 +121,29 @@ class Ratings implements Extension {
} }
} }
public static function get_user_privs($user) {
global $config;
if($user->is_anonymous()) {
$sqes = $config->get_string("ext_rating_anon_privs");
}
else if($user->is_admin()) {
$sqes = $config->get_string("ext_rating_admin_privs");
}
else {
$sqes = $config->get_string("ext_rating_user_privs");
}
return $sqes;
}
public static function privs_to_sql($sqes) {
$arr = array();
for($i=0; $i<strlen($sqes); $i++) {
$arr[] = "'" . $sqes[$i] . "'";
}
$set = join(', ', $arr);
return $set;
}
// FIXME: this is a bit ugly and guessey, should have proper options // FIXME: this is a bit ugly and guessey, should have proper options
private function can_rate() { private function can_rate() {
global $config, $user; global $config, $user;