diff --git a/contrib/report_image/main.php.use.this.for.rcX.and.remove.the.other.main.php.file b/contrib/report_image/main.php.use.this.for.rcX.and.remove.the.other.main.php.file
deleted file mode 100755
index f7e625b8..00000000
--- a/contrib/report_image/main.php.use.this.for.rcX.and.remove.the.other.main.php.file
+++ /dev/null
@@ -1,173 +0,0 @@
-id = $id;
- }
-}
-
-class AddReportedImageEvent extends Event {
- var $reporter_name;
- var $image_id;
- var $reason_type;
- var $reason;
- public function AddReportedImageEvent($image_id, $reporter_name, $reason_type, $reason) {
- $this->reporter_name = $reporter_name;
- $this->image_id = $image_id;
- $this->reason_type = $reason_type;
- $this->reason = $reason;
- }
-}
-
-class report_image extends Extension {
- var $theme;
-
- public function receive_event($event) {
-
- if(is_null($this->theme)) $this->theme = get_theme_object("report_image", "ReportImageTheme");
-
- if(is_a($event, 'InitExtEvent')) {
- global $config;
- if($config->get_int("ext_ReportImage_version") < 1) {
- $this->install();
- }
- }
-
- if(is_a($event, 'PageRequestEvent') && ($event->page_name == "ReportImage")) {
- global $user;
- if($event->get_arg(0) == "add") {
- if(isset($_POST['image_id']) && isset($_POST['reason_type']) && isset($_POST['reason'])) {
- send_event(new AddReportedImageEvent($_POST['image_id'], $user->name, $_POST['reason_type'], $_POST['reason']));
- global $page;
- $page->set_mode("redirect");
- $page->set_redirect(make_link("post/view/".int_escape($_POST['image_id'])));
- }
- }
- else if($event->get_arg(0) == "remove") {
- if(isset($_POST['id'])) {
- if($user->is_admin()) {
- send_event(new RemoveReportedImageEvent($_POST['id']));
- global $page;
- $page->set_mode("redirect");
- $page->set_redirect(make_link("ReportImage/list"));
- }
- }
- }
- else if($event->get_arg(0) == "list") {
- if($user->is_admin()) {
- global $page;
- $this->theme->display_reported_images($page, $this->get_reported_images());
- }
- }
- }
-
-// if(is_a($event, 'AdminBuildingEvent')) {
-// global $page;
-// $this->theme->display_reported_images($page, $this->get_reported_images());
-// }
-
- if(is_a($event, 'AddReportedImageEvent')) {
- $this->add_reported_image($event->image_id, $event->reporter_name, $event->reason_type, $event->reason);
- }
-
- if(is_a($event, 'RemoveReportedImageEvent')) {
- $this->remove_reported_image($event->id);
- }
-
- if(is_a($event, 'DisplayingImageEvent')) {
- global $user;
- global $config;
- if(!$config->get_bool('report_image_anon') && $user->is_anonymous()) {
- // Show nothing
- } else {
- $this->theme->display_image_banner($event->page, $event->image->id);
- }
- }
-
- if(is_a($event, 'SetupBuildingEvent')) {
- $sb = new SetupBlock("Report Image Options");
- $sb->add_bool_option("report_image_anon", "Allow anonymous image reporting: ");
- $sb->add_label("
");
- $sb->add_bool_option("report_image_show_thumbs", "Show thumbnails in admin panel: ");
- $event->panel->add_block($sb);
- }
-
- if(is_a($event, 'UserBlockBuildingEvent')) {
- if($event->user->is_admin()) {
- $event->add_link("Reported Images", make_link("ReportImage/list"));
- }
- }
-
- }
-
- protected function install() {
- global $database;
- global $config;
- if($config->get_int("ext_ReportImage_version") < 1) {
- $database->Execute("CREATE TABLE ReportImage (
- id int(11) NOT NULL auto_increment,
- image_id int(11) default NULL,
- reporter_name varchar(32) default NULL,
- reason_type varchar(255) default NULL,
- reason varchar(255) default NULL,
- PRIMARY KEY (id)
- )");
- $config->set_int("ext_ReportImage_version", 1);
- }
- }
-
-
- // DB funness
-
- public function get_reported_images() {
- // FIXME: many
- global $database;
- $reportedimages = $database->db->GetAll("SELECT * FROM ReportImage");
- if($reportedimages) {return $reportedimages;}
- else {return array();}
- }
-
- public function get_reported_image($id) {
- global $database;
- return $database->db->GetRow("SELECT * FROM ReportImage WHERE id = ?", array($id));
- }
-
- public function add_reported_image($image_id, $reporter_name, $reason_type, $reason) {
- global $database;
- $database->Execute(
- "INSERT INTO ReportImage (image_id, reporter_name, reason_type, reason) VALUES (?, ?, ?, ?)",
- array($image_id, $reporter_name, $reason_type, $reason));
- }
-
- public function remove_reported_image($id) {
- global $database;
- $database->Execute("DELETE FROM ReportImage WHERE id = ?", array($id));
- }
-
-}
-add_event_listener(new report_image(), 29); // Not sure what I'm in before.
-
-// ===== Changelog =====
-// * Version 0.3 - 11/06/07 - Added the option to display thumbnails, moved the reported image list to it's
-// own page, and checked to make sure the user is an admin before letting them delete / view reported images.
-// * Version 0.2c_rc2 - 10/27/07 - Now (really!) supports Shimmie2 RC2!
-// * Version 0.2b - 10/27/07 - Now supports Shimmie2 RC2!
-// * Version 0.2a - 10/24/07 - Fixed some SQL issues. I will make sure to test before commiting :)
-// * Version 0.2 - 10/24/07 - First public release.
-
-?>
diff --git a/contrib/report_image/theme.php.use.this.for.rcX.and.remove.the.other.theme.php.file b/contrib/report_image/theme.php.use.this.for.rcX.and.remove.the.other.theme.php.file
deleted file mode 100755
index 825daac5..00000000
--- a/contrib/report_image/theme.php.use.this.for.rcX.and.remove.the.other.theme.php.file
+++ /dev/null
@@ -1,99 +0,0 @@
-".$reportedimage['reason']."";
- $reason .= $this->make_thumbnail_html($reportedimage['reason']);
- } else {
- $reason = $reportedimage['reason'];
- }
-
- $image_link = "".$reportedimage['image_id']."";
- $image_link .= $this->make_thumbnail_html($reportedimage['image_id']);
- $userlink = "{$reportedimage['reporter_name']}";
-
- $h_reportedimages .= "
-
Image | Reporter | Reason Type | Reason / Image ID | Action | - $h_reportedimages -