If you couldn\'t possibly be guilty of what you\'re banned for, the person we banned probably had a dynamic IP address and so do you.
+
$CONTACT');
$this->check_ip_ban();
}
@@ -84,7 +88,7 @@ class IPBan extends Extension {
public function onSetupBuilding(SetupBuildingEvent $event) {
$sb = new SetupBlock("IP Ban");
- $sb->add_longtext_option("ipban_message", 'Message to show to banned users:');
+ $sb->add_longtext_option("ipban_message", 'Message to show to banned users:
(with $IP, $DATE, $ADMIN, $REASON, and $CONTACT)');
$event->panel->add_block($sb);
}
@@ -226,14 +230,20 @@ class IPBan extends Extension {
$admin = User::by_id($row[$prefix.'banner_id']);
$date = date("Y-m-d", $row[$prefix.'end_timestamp']);
$msg = $config->get_string("ipban_message");
- header("HTTP/1.0 403 Forbidden");
- print "IP $ip has been banned until $date by {$admin->name} because of $reason\n";
- print "
$msg";
-
+ $msg = str_replace('$IP', $ip, $msg);
+ $msg = str_replace('$DATE', $date, $msg);
+ $msg = str_replace('$ADMIN', $admin->name, $msg);
+ $msg = str_replace('$REASON', $reason, $msg);
$contact_link = contact_link();
if(!empty($contact_link)) {
- print "
"+
+ $("BODY").addClass("censored");
+ $("BODY").append("
");
+ $("BODY").append(""+
+ "
"+
"");
}
});
+function tnc_agree() {
+ Cookies.set("ui-tnc-agreed", "true", {path: '/', expires: 365});
+ $("BODY").removeClass("censored");
+ $(".tnc_bg").hide();
+ $(".tnc").hide();
+}
+
function image_hash_ban(id) {
var reason = prompt("WHY?", "DNP");
if(reason) {
diff --git a/ext/rule34/style.css b/ext/rule34/style.css
new file mode 100644
index 00000000..b4687560
--- /dev/null
+++ b/ext/rule34/style.css
@@ -0,0 +1,35 @@
+BODY.censored #header,
+BODY.censored NAV,
+BODY.censored ARTICLE,
+BODY.censored FOOTER {
+ filter: blur(10px);
+}
+.tnc_bg {
+ position: fixed;
+ top: 0px;
+ left: 0px;
+ right: 0px;
+ bottom: 0px;
+ background: #ACE4A3;
+ opacity: 0.75;
+ z-index: 999999999999999999999;
+}
+.tnc {
+ position: fixed;
+ top: 20%;
+ left: 20%;
+ right: 20%;
+ text-align: center;
+ font-size: 2em;
+ background: #ACE4A3;
+ border: 1px solid #7EB977;
+ z-index: 9999999999999999999999;
+}
+@media (max-width: 1024px) {
+ .tnc {
+ top: 5%;
+ left: 5%;
+ right: 5%;
+ font-size: 3vw;
+ }
+}
diff --git a/ext/statsd/main.php b/ext/statsd/main.php
index 01cbb757..174daf71 100644
--- a/ext/statsd/main.php
+++ b/ext/statsd/main.php
@@ -66,19 +66,19 @@ class StatsDInterface extends Extension {
}
public function onUserCreation(UserCreationEvent $event) {
- StatsDInterface::$stats["shimmie.events.user_creations"] = "1|c";
+ StatsDInterface::$stats["shimmie_events.user_creations"] = "1|c";
}
public function onDataUpload(DataUploadEvent $event) {
- StatsDInterface::$stats["shimmie.events.uploads"] = "1|c";
+ StatsDInterface::$stats["shimmie_events.uploads"] = "1|c";
}
public function onCommentPosting(CommentPostingEvent $event) {
- StatsDInterface::$stats["shimmie.events.comments"] = "1|c";
+ StatsDInterface::$stats["shimmie_events.comments"] = "1|c";
}
public function onImageInfoSet(ImageInfoSetEvent $event) {
- StatsDInterface::$stats["shimmie.events.info-sets"] = "1|c";
+ StatsDInterface::$stats["shimmie_events.info-sets"] = "1|c";
}
/**
diff --git a/ext/tag_list/main.php b/ext/tag_list/main.php
index 1be00b33..c736d6ed 100644
--- a/ext/tag_list/main.php
+++ b/ext/tag_list/main.php
@@ -497,6 +497,8 @@ class TagList extends Extension {
private function add_refine_block(Page $page, array $search) {
global $database, $config;
+ if(count($search) > 5) return;
+
$wild_tags = $search;
$str_search = Tag::implode($search);
$related_tags = $database->cache->get("related_tags:$str_search");
@@ -509,7 +511,7 @@ class TagList extends Extension {
foreach($wild_tags as $tag) {
$tag = str_replace("*", "%", $tag);
$tag = str_replace("?", "_", $tag);
- $tag_ids = $database->get_col("SELECT id FROM tags WHERE tag LIKE :tag", array("tag"=>$tag));
+ $tag_ids = $database->get_col("SELECT id FROM tags WHERE tag LIKE :tag AND count < 25000", array("tag"=>$tag));
// $search_tags = array_merge($search_tags,
// $database->get_col("SELECT tag FROM tags WHERE tag LIKE :tag", array("tag"=>$tag)));
$tag_id_array = array_merge($tag_id_array, $tag_ids);
@@ -518,6 +520,8 @@ class TagList extends Extension {
}
$tag_id_list = join(', ', $tag_id_array);
+ if(count($tag_id_array) > 5) return;
+
if($tags_ok) {
$query = "
SELECT t2.tag AS tag, COUNT(it2.image_id) AS calc_count
diff --git a/ext/upload/main.php b/ext/upload/main.php
index 5ac90ac3..64e6ae91 100644
--- a/ext/upload/main.php
+++ b/ext/upload/main.php
@@ -82,18 +82,6 @@ class Upload extends Extension {
}
}
- public function onPostListBuilding(PostListBuildingEvent $event) {
- global $user, $page;
- if($user->can("create_image")) {
- if($this->is_full) {
- $this->theme->display_full($page);
- }
- else {
- $this->theme->display_block($page);
- }
- }
- }
-
public function onSetupBuilding(SetupBuildingEvent $event) {
$tes = array();
$tes["Disabled"] = "none";
@@ -130,6 +118,15 @@ class Upload extends Extension {
public function onPageRequest(PageRequestEvent $event) {
global $database, $page, $user;
+ if($user->can("create_image")) {
+ if($this->is_full) {
+ $this->theme->display_full($page);
+ }
+ else {
+ $this->theme->display_block($page);
+ }
+ }
+
if($event->page_matches("upload/replace")) {
// check if the user is an administrator and can upload files.
if(!$user->can("replace_image")) {
diff --git a/ext/upload/theme.php b/ext/upload/theme.php
index 149c2624..ae8dd540 100644
--- a/ext/upload/theme.php
+++ b/ext/upload/theme.php
@@ -19,9 +19,9 @@ class UploadTheme extends Themelet {
$html = "
".make_form(make_link("upload"), "POST", $multipart=True, 'file_upload')."
diff --git a/ext/user/main.php b/ext/user/main.php
index cf75c5cc..b998469c 100644
--- a/ext/user/main.php
+++ b/ext/user/main.php
@@ -240,7 +240,9 @@ class UserPage extends Extension {
$this->theme->display_ip_list(
$page,
$this->count_upload_ips($event->display_user),
- $this->count_comment_ips($event->display_user));
+ $this->count_comment_ips($event->display_user),
+ $this->count_log_ips($event->display_user)
+ );
}
}
@@ -344,7 +346,6 @@ class UserPage extends Extension {
if(!is_null($duser)) {
$user = $duser;
$this->set_login_cookie($duser->name, $pass);
- log_info("user", "{$user->class->name} logged in");
$page->set_mode("redirect");
// Try returning to previous page
@@ -358,7 +359,6 @@ class UserPage extends Extension {
}
}
else {
- log_warning("user", "Failed to log in as ".html_escape($name));
$this->theme->display_error(401, "Error", "No user with those details was found");
}
}
@@ -587,6 +587,21 @@ class UserPage extends Extension {
return $rows;
}
+ private function count_log_ips(User $duser): array {
+ if(!class_exists('LogDatabase')) return array();
+ global $database;
+ $rows = $database->get_pairs("
+ SELECT
+ address,
+ COUNT(id) AS count,
+ MAX(date_sent) AS most_recent
+ FROM score_log
+ WHERE username=:username
+ GROUP BY address
+ ORDER BY most_recent DESC", array("username"=>$duser->name));
+ return $rows;
+ }
+
private function delete_user(Page $page, bool $with_images=false, bool $with_comments=false) {
global $user, $config, $database;
diff --git a/ext/user/theme.php b/ext/user/theme.php
index b261ec08..d2f55b11 100644
--- a/ext/user/theme.php
+++ b/ext/user/theme.php
@@ -168,7 +168,7 @@ class UserPageTheme extends Themelet {
$page->add_block(new Block("Login", $html, "left", 90));
}
- public function display_ip_list(Page $page, array $uploads, array $comments) {
+ public function display_ip_list(Page $page, array $uploads, array $comments, array $events) {
$html = "
";
$html .= "| Uploaded from: ";
$n = 0;
@@ -190,8 +190,18 @@ class UserPageTheme extends Themelet {
}
}
+ $html .= " | Logged Events:";
+ $n = 0;
+ foreach($events as $ip => $count) {
+ $html .= '
'.$ip.' ('.$count.')';
+ if(++$n >= 20) {
+ $html .= "
...";
+ break;
+ }
+ }
+
$html .= " |
";
- $html .= "| (Most recent at top) |
";
+ $html .= "
| (Most recent at top) |
";
$page->add_block(new Block("IPs", $html, "main", 70));
}
diff --git a/index.php b/index.php
index e748c06b..7c9ee6b9 100644
--- a/index.php
+++ b/index.php
@@ -107,4 +107,5 @@ catch(Exception $e) {
_fatal_error($e);
$_shm_ctx->log_ender();
}
+log_slow();