badmanners/shimmie2
badmanners/shimmie2
Archived
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

booleanise private_image

Browse source
This commit is contained in:
Shish 2020-10-26 21:54:43 +00:00
parent 06cb261aa6
commit e6e9d6db1c
1 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
ext/private_image/main.php
View file

@ -14,8 +14,6 @@ class PrivateImage extends Extension
public function onInitExt(InitExtEvent $event) public function onInitExt(InitExtEvent $event)
{ {
global $config;
Image::$bool_props[] = "private "; Image::$bool_props[] = "private ";
} }
@ -114,7 +112,7 @@ class PrivateImage extends Extension
} }
public function onDisplayingImage(DisplayingImageEvent $event) public function onDisplayingImage(DisplayingImageEvent $event)
{ {
global $user, $page, $config; global $user, $page;
if ($event->image->private===true && $event->image->owner_id!=$user->id && !$user->can(Permissions::SET_OTHERS_PRIVATE_IMAGES)) { if ($event->image->private===true && $event->image->owner_id!=$user->id && !$user->can(Permissions::SET_OTHERS_PRIVATE_IMAGES)) {
$page->set_mode(PageMode::REDIRECT); $page->set_mode(PageMode::REDIRECT);
@ -135,15 +133,13 @@ class PrivateImage extends Extension
if ($show_private) { if ($show_private) {
$event->add_querylet( $event->add_querylet(
new Querylet( new Querylet(
$database->scoreql_to_sql("private = SCORE_BOOL_N OR owner_id = :private_owner_id"), "private != :true OR owner_id = :private_owner_id",
["private_owner_id"=>$user->id] ["private_owner_id"=>$user->id, "true"=>true]
) )
); );
} else { } else {
$event->add_querylet( $event->add_querylet(
new Querylet( new Querylet("private != :true", ["true"=>true])
$database->scoreql_to_sql("private = SCORE_BOOL_N")
)
); );
} }
} }
@ -157,10 +153,12 @@ class PrivateImage extends Extension
$query = ""; $query = "";
switch ($matches[1]) { switch ($matches[1]) {
case "no": case "no":
$query .= "private = SCORE_BOOL_N"; $query .= "private != :true";
$params["true"] = true;
break; break;
case "yes": case "yes":
$query .= "private = SCORE_BOOL_Y"; $query .= "private = :true";
$params["true"] = true;
// Admins can view others private images, but they have to specify the user // Admins can view others private images, but they have to specify the user
if (!$user->can(Permissions::SET_OTHERS_PRIVATE_IMAGES) || if (!$user->can(Permissions::SET_OTHERS_PRIVATE_IMAGES) ||
@ -170,11 +168,12 @@ class PrivateImage extends Extension
} }
break; break;
case "any": case "any":
$query .= "private = SCORE_BOOL_N OR owner_id = :private_owner_id"; $query .= "private != :true OR owner_id = :private_owner_id";
$params["true"] = true;
$params["private_owner_id"] = $user->id; $params["private_owner_id"] = $user->id;
break; break;
} }
$event->add_querylet(new Querylet($database->scoreql_to_sql($query), $params)); $event->add_querylet(new Querylet($query, $params));
} }
} }
@ -205,7 +204,7 @@ class PrivateImage extends Extension
$database->execute( $database->execute(
"UPDATE images SET private = :true WHERE id = :id AND private = :false", "UPDATE images SET private = :true WHERE id = :id AND private = :false",
["id"=>$image_id, "true"=>true, "false"=>$database->scoresql_value_prepare(false)] ["id"=>$image_id, "true"=>true, "false"=>false]
); );
} }
@ -215,7 +214,7 @@ class PrivateImage extends Extension
$database->execute( $database->execute(
"UPDATE images SET private = :false WHERE id = :id AND private = :true", "UPDATE images SET private = :false WHERE id = :id AND private = :true",
["id"=>$image_id, "true"=>true, "false"=>$database->scoresql_value_prepare(false)] ["id"=>$image_id, "true"=>true, "false"=>false]
); );
} }
@ -281,12 +280,13 @@ class PrivateImage extends Extension
global $database; global $database;
if ($this->get_version(PrivateImageConfig::VERSION) < 1) { if ($this->get_version(PrivateImageConfig::VERSION) < 1) {
$database->execute($database->scoreql_to_sql( $database->execute("ALTER TABLE images ADD COLUMN private BOOLEAN NOT NULL DEFAULT FALSE");
"ALTER TABLE images ADD COLUMN private SCORE_BOOL NOT NULL DEFAULT SCORE_BOOL_N"
));
$database->execute("CREATE INDEX images_private_idx ON images(private)"); $database->execute("CREATE INDEX images_private_idx ON images(private)");
$this->set_version(PrivateImageConfig::VERSION, 1); $this->set_version(PrivateImageConfig::VERSION, 2);
}
if ($this->get_version(PrivateImageConfig::VERSION) < 2) {
$database->standardise_boolean("images", "private");
$this->set_version(PrivateImageConfig::VERSION, 2);
} }
} }
} }