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

Merge branch 'master' of github.com:shish/shimmie2

Browse Source
This commit is contained in:
Shish 2012-01-26 15:26:08 +00:00
commit 1877aa9973
4 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.gitignore vendored
View File

@ -65,12 +65,3 @@ ext/upload_cmd
ext/wiki ext/wiki
ext/word_filter ext/word_filter
ext/zoom ext/zoom
/ext/resize/main.php
/ext/resize/style.css
/ext/resize/theme.php
/ext/twitter_soc/main.php
/ext/twitter_soc/script.js
/ext/twitter_soc/style.css
/ext/twitter_soc/test.php
/ext/twitter_soc/theme.php

16
ext/user/main.php
View File

@ -487,14 +487,14 @@ class UserPage extends SimpleExtension {
"You need to specify the account number to edit")); "You need to specify the account number to edit"));
} }
else{ else{
$rows = $database->get_all("SELECT * FROM images WHERE owner_id = :owner_id", array("owner_id" => $_POST['id'])); $database->Execute(
foreach ($rows as $key => $value) "UPDATE images SET owner_id = :new_owner_id WHERE owner_id = :old_owner_id",
{ array("new_owner_id" => $config->get_int('anon_id'), "old_owner_id" => $_POST['id'])
$database->Execute("UPDATE images SET owner_id = :owner_id WHERE id = :id;", array("owner_id" => 1, "id" => $value['id'])); );
} $database->execute(
$database->execute("DELETE FROM users "DELETE FROM users WHERE id = :id",
WHERE id = :id" array("id" => $_POST['id'])
, array("id"=>$_POST['id'])); );
$page->set_mode("redirect"); $page->set_mode("redirect");
$page->set_redirect(make_link("post/list")); $page->set_redirect(make_link("post/list"));

2
ext/user/theme.php
View File

@ -150,7 +150,7 @@ class UserPageTheme extends Themelet {
protected function build_options(User $duser) { protected function build_options(User $duser) {
global $config, $database, $user; global $config, $database, $user;
$html = ""; $html = "";
if($duser->id != 1){ //justa fool-admin protection so they dont mess around with anon users. if($duser->id != $config->get_int('anon_id')){ //justa fool-admin protection so they dont mess around with anon users.
$html .= " $html .= "
".make_form(make_link("user_admin/change_pass"))." ".make_form(make_link("user_admin/change_pass"))."

4
install.php
View File

@ -310,8 +310,8 @@ function create_tables() { // {{{
INDEX(image_id), INDEX(image_id),
INDEX(tag_id), INDEX(tag_id),
UNIQUE(image_id, tag_id), UNIQUE(image_id, tag_id),
CONSTRAINT foreign_images_tags_image_id FOREIGN KEY (image_id) REFERENCES images(id) ON DELETE CASCADE, CONSTRAINT foreign_image_tags_image_id FOREIGN KEY (image_id) REFERENCES images(id) ON DELETE CASCADE,
CONSTRAINT foreign_images_tags_tag_id FOREIGN KEY (tag_id) REFERENCES tags(id) ON DELETE CASCADE CONSTRAINT foreign_image_tags_tag_id FOREIGN KEY (tag_id) REFERENCES tags(id) ON DELETE CASCADE
"); ");
$db->execute("INSERT INTO config(name, value) VALUES('db_version', 8)"); $db->execute("INSERT INTO config(name, value) VALUES('db_version', 8)");
} }