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

Merge remote-tracking branch 'remotes/shish/master' into pools_fixes

Browse Source
This commit is contained in:
green-ponies (jgen) 2012-02-08 23:25:52 -05:00
commit 7bb971cef0
83 changed files with 921 additions and 873 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitignore vendored
View File

@ -1,8 +1,10 @@
.svn .svn
backup
config.php config.php
images
thumbs
data data
images
imgdump-*.zip
thumbs
sql.log sql.log
shimmie.log shimmie.log
!lib/images !lib/images

81
contrib/admin/main.php
View File

@ -30,13 +30,13 @@
*/ */
class AdminBuildingEvent extends Event { class AdminBuildingEvent extends Event {
var $page; var $page;
public function AdminBuildingEvent($page) { public function AdminBuildingEvent(Page $page) {
$this->page = $page; $this->page = $page;
} }
} }
class AdminPage extends SimpleExtension { class AdminPage extends Extension {
public function onPageRequest($event) { public function onPageRequest(PageRequestEvent $event) {
global $page, $user; global $page, $user;
if($event->page_matches("admin")) { if($event->page_matches("admin")) {
@ -78,6 +78,13 @@ class AdminPage extends SimpleExtension {
case 'database dump': case 'database dump':
$this->dbdump($page); $this->dbdump($page);
break; break;
case 'reset image ids':
$this->reset_imageids();
$redirect = true;
break;
case 'image dump':
$this->imgdump($page);
break;
} }
if($redirect) { if($redirect) {
@ -88,20 +95,20 @@ class AdminPage extends SimpleExtension {
} }
} }
public function onAdminBuilding($event) { public function onAdminBuilding(AdminBuildingEvent $event) {
global $page; global $page;
$this->theme->display_page($page); $this->theme->display_page($page);
$this->theme->display_form($page); $this->theme->display_form($page);
} }
public function onUserBlockBuilding($event) { public function onUserBlockBuilding(UserBlockBuildingEvent $event) {
global $user; global $user;
if($user->is_admin()) { if($user->is_admin()) {
$event->add_link("Board Admin", make_link("admin")); $event->add_link("Board Admin", make_link("admin"));
} }
} }
private function delete_by_query($query) { private function delete_by_query(/*array(string)*/ $query) {
global $page, $user; global $page, $user;
assert(strlen($query) > 1); assert(strlen($query) > 1);
foreach(Image::find_images(0, 1000000, Tag::explode($query)) as $image) { foreach(Image::find_images(0, 1000000, Tag::explode($query)) as $image) {
@ -175,5 +182,67 @@ class AdminPage extends SimpleExtension {
} }
} }
*/ */
private function reset_imageids() {
global $database;
//This might be a bit laggy on boards with lots of images (?)
//Seems to work fine with 1.2k~ images though.
$i = 0;
$image = $database->get_all("SELECT * FROM images ORDER BY images.id ASC");
/*$score_log = $database->get_all("SELECT message FROM score_log");*/
foreach($image as $img){
$xid = $img[0];
$i = $i + 1;
$table = array( //Might be missing some tables?
"image_tags", "tag_histories", "image_reports", "comments", "user_favorites", "tag_histories",
"numeric_score_votes", "pool_images", "slext_progress_cache", "notes");
$sql =
"SET FOREIGN_KEY_CHECKS=0;
UPDATE images
SET id=".$i.
" WHERE id=".$xid.";"; //id for images
foreach($table as $tbl){
$sql .= "
UPDATE ".$tbl."
SET image_id=".$i."
WHERE image_id=".$xid.";";
}
/*foreach($score_log as $sl){
//This seems like a bad idea.
//TODO: Might be better for log_info to have an $id option (which would then affix the id to the table?)
preg_replace(".Image \\#[0-9]+.", "Image #".$i, $sl);
}*/
$sql .= " SET FOREIGN_KEY_CHECKS=1;";
$database->execute($sql);
}
$count = (count($image)) + 1;
$database->execute("ALTER TABLE images AUTO_INCREMENT=".$count);
}
private function imgdump($page) {
global $database;
$zip = new ZipArchive;
$images = $database->get_all("SELECT * FROM images");
$filename = 'imgdump-'.date('Ymd').'.zip';
if($zip->open($filename, 1 ? ZIPARCHIVE::OVERWRITE:ZIPARCHIVE::CREATE)===TRUE){
foreach($images as $img){
$hash = $img["hash"];
preg_match("^[A-Za-z0-9]{2}^", $hash, $matches);
$img_loc = "images/".$matches[0]."/".$hash;
if(file_exists($img_loc)){
$zip->addFile($img_loc, $hash.".".$img["ext"]);
}
}
$zip->close();
}
$page->set_mode("redirect");
$page->set_redirect(make_link($filename)); //Fairly sure there is better way to do this..
//TODO: Delete file after downloaded?
}
} }
?> ?>

19
contrib/admin/theme.php
View File

@ -19,13 +19,26 @@ class AdminPageTheme extends Themelet {
public function display_form(Page $page) { public function display_form(Page $page) {
global $user; global $user;
$html = " $html = '
".make_form(make_link("admin_utils"))." <script type="text/javascript">
<select name='action'> function imgidconfirm(){
if(document.getElementById("misc").selectedIndex == 4){
if(confirm("This function WILL break any bookmarks & links.\n The event log will also not be updated with new ids. \n Are you sure you wish to continue?")){
return true;
}else{
return false;
}
}
}
</script>
'.make_form(make_link("admin_utils"),"post", false, false, "return imgidconfirm()")."
<select name='action' id='misc'>
<option value='lowercase all tags'>All tags to lowercase</option> <option value='lowercase all tags'>All tags to lowercase</option>
<option value='recount tag use'>Recount tag use</option> <option value='recount tag use'>Recount tag use</option>
<option value='purge unused tags'>Purge unused tags</option> <option value='purge unused tags'>Purge unused tags</option>
<option value='database dump'>Download database contents</option> <option value='database dump'>Download database contents</option>
<option value='reset image ids'>Reset image ids</option>
<option value='image dump'>Download all images</option>
<!--<option value='convert to innodb'>Convert database to InnoDB (MySQL only)</option>--> <!--<option value='convert to innodb'>Convert database to InnoDB (MySQL only)</option>-->
</select> </select>
<input type='submit' value='Go'> <input type='submit' value='Go'>

2
contrib/amazon_s3/main.php
View File

@ -9,7 +9,7 @@
require_once "lib/S3.php"; require_once "lib/S3.php";
class UploadS3 extends SimpleExtension { class UploadS3 extends Extension {
public function onInitExt(InitExtEvent $event) { public function onInitExt(InitExtEvent $event) {
global $config; global $config;
$config->set_default_string("amazon_s3_access", ""); $config->set_default_string("amazon_s3_access", "");

64
contrib/artists/main.php
View File

@ -11,7 +11,7 @@
class AuthorSetEvent extends Event { class AuthorSetEvent extends Event {
var $image, $user, $author; var $image, $user, $author;
public function AuthorSetEvent(Image $image, User $user, $author) public function AuthorSetEvent(Image $image, User $user, /*string*/ $author)
{ {
$this->image = $image; $this->image = $image;
$this->user = $user; $this->user = $user;
@ -19,41 +19,37 @@ class AuthorSetEvent extends Event {
} }
} }
class Artists implements Extension { class Artists extends Extension {
var $theme; public function onImageInfoSet(ImageInfoSetEvent $event) {
public function get_priority() {return 50;}
public function receive_event(Event $event)
{
global $user; global $user;
if (isset($_POST["tag_edit__author"])) {
if(is_null($this->theme)) $this->theme = get_theme_object($this); send_event(new AuthorSetEvent($event->image, $user, $_POST["tag_edit__author"]));
if ($event instanceof ImageInfoSetEvent)
if (isset($_POST["tag_edit__author"]))
send_event(new AuthorSetEvent($event->image, $user, $_POST["tag_edit__author"]));
if ($event instanceof AuthorSetEvent)
$this->update_author($event);
if($event instanceof InitExtEvent)
$this->try_install();
if ($event instanceof ImageInfoBoxBuildingEvent)
$this->add_author_field_to_image($event);
if ($event instanceof PageRequestEvent)
$this->handle_commands($event);
if ($event instanceof SearchTermParseEvent) {
$matches = array();
if(preg_match("/^author=(.*)$/", $event->term, $matches)) {
$char = $matches[1];
$event->add_querylet(new Querylet("Author = :author_char", array("author_char"=>$char)));
}
} }
} }
public function onAuthorSet(AuthorSetEvent $event) {
$this->update_author($event);
}
public function onInitExt(InitExtEvent $event) {
$this->try_install();
}
public function onImageInfoBoxBuilding(ImageInfoBoxBuildingEvent $event) {
$this->add_author_field_to_image($event);
}
public function onPageRequest(PageRequestEvent $event) {
$this->handle_commands($event);
}
public function onSearchTermParse(SearchTermParseEvent $event) {
$matches = array();
if(preg_match("/^author=(.*)$/", $event->term, $matches)) {
$char = $matches[1];
$event->add_querylet(new Querylet("Author = :author_char", array("author_char"=>$char)));
}
}
public function try_install() { public function try_install() {
global $config, $database; global $config, $database;

2
contrib/ban_words/main.php
View File

@ -20,7 +20,7 @@
* from Essex" * from Essex"
*/ */
class BanWords extends SimpleExtension { class BanWords extends Extension {
public function onInitExt(InitExtEvent $event) { public function onInitExt(InitExtEvent $event) {
global $config; global $config;
$config->set_default_string('banned_words', " $config->set_default_string('banned_words', "

6
contrib/blocks/main.php
View File

@ -27,8 +27,8 @@
* </pre> * </pre>
*/ */
class Blocks extends SimpleExtension { class Blocks extends Extension {
public function onPageRequest($event) { public function onPageRequest(PageRequestEvent $event) {
global $config, $page; global $config, $page;
$all = $config->get_string("blocks_text"); $all = $config->get_string("blocks_text");
$blocks = explode("----", $all); $blocks = explode("----", $all);
@ -70,7 +70,7 @@ class Blocks extends SimpleExtension {
} }
} }
public function onSetupBuilding($event) { public function onSetupBuilding(SetupBuildingEvent $event) {
$sb = new SetupBlock("Blocks"); $sb = new SetupBlock("Blocks");
$sb->add_label("See <a href='".make_link("ext_doc/blocks")."'>the docs</a> for formatting"); $sb->add_label("See <a href='".make_link("ext_doc/blocks")."'>the docs</a> for formatting");
$sb->add_longtext_option("blocks_text"); $sb->add_longtext_option("blocks_text");

10
contrib/blotter/main.php
View File

@ -8,8 +8,8 @@
* *
* Development TODO at http://github.com/zshall/shimmie2/issues * Development TODO at http://github.com/zshall/shimmie2/issues
*/ */
class Blotter extends SimpleExtension { class Blotter extends Extension {
public function onInitExt(Event $event) { public function onInitExt(InitExtEvent $event) {
/** /**
* I love re-using this installer don't I... * I love re-using this installer don't I...
*/ */
@ -43,7 +43,7 @@ class Blotter extends SimpleExtension {
$config->set_default_string("blotter_position", "subheading"); $config->set_default_string("blotter_position", "subheading");
} }
public function onSetupBuilding(Event $event) { public function onSetupBuilding(SetupBuildingEvent $event) {
global $config; global $config;
$sb = new SetupBlock("Blotter"); $sb = new SetupBlock("Blotter");
$sb->add_int_option("blotter_recent", "<br />Number of recent entries to display: "); $sb->add_int_option("blotter_recent", "<br />Number of recent entries to display: ");
@ -51,13 +51,13 @@ class Blotter extends SimpleExtension {
$sb->add_choice_option("blotter_position", array("Top of page" => "subheading", "In navigation bar" => "left"), "<br>Position: "); $sb->add_choice_option("blotter_position", array("Top of page" => "subheading", "In navigation bar" => "left"), "<br>Position: ");
$event->panel->add_block($sb); $event->panel->add_block($sb);
} }
public function onUserBlockBuilding(Event $event) { public function onUserBlockBuilding(UserBlockBuildingEvent $event) {
global $user; global $user;
if($user->is_admin()) { if($user->is_admin()) {
$event->add_link("Blotter Editor", make_link("blotter/editor")); $event->add_link("Blotter Editor", make_link("blotter/editor"));
} }
} }
public function onPageRequest(Event $event) { public function onPageRequest(PageRequestEvent $event) {
global $page, $database, $user; global $page, $database, $user;
if($event->page_matches("blotter")) { if($event->page_matches("blotter")) {
switch($event->get_arg(0)) { switch($event->get_arg(0)) {

15
contrib/bookmarks/main.php
View File

@ -6,16 +6,15 @@
* Description: Allow users to bookmark searches * Description: Allow users to bookmark searches
*/ */
class Bookmarks implements Extension { class Bookmarks extends Extension {
var $theme; public function onInitExt(InitExtEvent $event) {
$this->install();
}
public function get_priority() {return 50;} public function onPageRequest(PageRequestEvent $event) {
global $page;
public function receive_event(Event $event) { if($event->page_matches("bookmark")) {
global $config, $database, $page, $user;
if(is_null($this->theme)) $this->theme = get_theme_object($this);
if(($event instanceof PageRequestEvent) && $event->page_matches("bookmark")) {
if($event->get_arg(0) == "add") { if($event->get_arg(0) == "add") {
if(isset($_POST['url'])) { if(isset($_POST['url'])) {
$page->set_mode("redirect"); $page->set_mode("redirect");

65
contrib/browser_search/main.php
View File

@ -13,36 +13,29 @@
* engine" notification they have * engine" notification they have
*/ */
class BrowserSearch implements Extension { class BrowserSearch extends Extension {
public function onInitExt(InitExtEvent $event) {
global $config;
$config->set_default_string("search_suggestions_results_order", 'a');
}
public function get_priority() {return 50;} public function onPageRequest(PageRequestEvent $event) {
public function receive_event(Event $event) { global $config, $database, $page;
global $page;
global $config;
if($event instanceof InitExtEvent) {
$config->set_default_string("search_suggestions_results_order", 'a');
}
// Add in header code to let the browser know that the search plugin exists // Add in header code to let the browser know that the search plugin exists
if($event instanceof PageRequestEvent) { // We need to build the data for the header
// We need to build the data for the header $search_title = $config->get_string('title');
global $config; $search_file_url = make_link('browser_search/please_dont_use_this_tag_as_it_would_break_stuff__search.xml');
$search_title = $config->get_string('title'); $page->add_html_header("<link rel='search' type='application/opensearchdescription+xml' title='$search_title' href='$search_file_url'>");
$search_file_url = make_link('browser_search/please_dont_use_this_tag_as_it_would_break_stuff__search.xml');
$page->add_html_header("<link rel='search' type='application/opensearchdescription+xml' title='$search_title' href='$search_file_url'>");
}
// The search.xml file that is generated on the fly // The search.xml file that is generated on the fly
if(($event instanceof PageRequestEvent) && $event->page_matches("browser_search/please_dont_use_this_tag_as_it_would_break_stuff__search.xml")) { if($event->page_matches("browser_search/please_dont_use_this_tag_as_it_would_break_stuff__search.xml")) {
// First, we need to build all the variables we'll need // First, we need to build all the variables we'll need
$search_title = $config->get_string('title'); $search_title = $config->get_string('title');
$search_form_url = make_link('post/list/{searchTerms}'); $search_form_url = make_link('post/list/{searchTerms}');
$suggenton_url = make_link('browser_search/')."{searchTerms}"; $suggenton_url = make_link('browser_search/')."{searchTerms}";
$icon_b64 = base64_encode(file_get_contents("favicon.ico")); $icon_b64 = base64_encode(file_get_contents("favicon.ico"));
// Now for the XML // Now for the XML
$xml = " $xml = "
<SearchPlugin xmlns='http://www.mozilla.org/2006/browser/search/' xmlns:os='http://a9.com/-/spec/opensearch/1.1/'> <SearchPlugin xmlns='http://www.mozilla.org/2006/browser/search/' xmlns:os='http://a9.com/-/spec/opensearch/1.1/'>
@ -63,12 +56,10 @@ class BrowserSearch implements Extension {
$page->set_data($xml); $page->set_data($xml);
} }
else if(($event instanceof PageRequestEvent) && ( else if(
$event->page_matches("browser_search") && $event->page_matches("browser_search") &&
!$config->get_bool("disable_search_suggestions") !$config->get_bool("disable_search_suggestions")
)) { ) {
global $database;
// We have to build some json stuff // We have to build some json stuff
$tag_search = $event->get_arg(0); $tag_search = $event->get_arg(0);
@ -89,29 +80,25 @@ class BrowserSearch implements Extension {
array_push($tags_array,$tag['tag']); array_push($tags_array,$tag['tag']);
} }
$json_tag_list .= implode("\",\"", $tags_array); $json_tag_list .= implode("\",\"", $tags_array);
// $json_tag_list = implode($tags_array,", ");
// $json_tag_list = "\"".implode($tags_array,"\", \"")."\"";
// And now for the final output // And now for the final output
$json_string = "[\"$tag_search\",[\"$json_tag_list\"],[],[]]"; $json_string = "[\"$tag_search\",[\"$json_tag_list\"],[],[]]";
$page->set_mode("data"); $page->set_mode("data");
$page->set_data($json_string); $page->set_data($json_string);
} }
}
if($event instanceof SetupBuildingEvent) { public function onSetupBuilding(SetupBuildingEvent $event) {
$sort_by = array(); $sort_by = array();
$sort_by['Alphabetical'] = 'a'; $sort_by['Alphabetical'] = 'a';
$sort_by['Tag Count'] = 't'; $sort_by['Tag Count'] = 't';
$sb = new SetupBlock("Browser Search"); $sb = new SetupBlock("Browser Search");
$sb->add_bool_option("disable_search_suggestions", "Disable search suggestions: "); $sb->add_bool_option("disable_search_suggestions", "Disable search suggestions: ");
$sb->add_label("<br>"); $sb->add_label("<br>");
$sb->add_choice_option("search_suggestions_results_order", $sort_by, "Sort the suggestions by:"); $sb->add_choice_option("search_suggestions_results_order", $sort_by, "Sort the suggestions by:");
$event->panel->add_block($sb); $event->panel->add_block($sb);
}
} }
} }
?> ?>

6
contrib/bulk_add/main.php
View File

@ -15,8 +15,8 @@
* <p><b>Note:</b> requires the "admin" extension to be enabled * <p><b>Note:</b> requires the "admin" extension to be enabled
*/ */
class BulkAdd extends SimpleExtension { class BulkAdd extends Extension {
public function onPageRequest($event) { public function onPageRequest(PageRequestEvent $event) {
global $page, $user; global $page, $user;
if($event->page_matches("bulk_add")) { if($event->page_matches("bulk_add")) {
if($user->is_admin() && $user->check_auth_token() && isset($_POST['dir'])) { if($user->is_admin() && $user->check_auth_token() && isset($_POST['dir'])) {
@ -27,7 +27,7 @@ class BulkAdd extends SimpleExtension {
} }
} }
public function onAdminBuilding($event) { public function onAdminBuilding(AdminBuildingEvent $event) {
$this->theme->display_admin_block(); $this->theme->display_admin_block();
} }

32
contrib/danbooru_api/main.php
View File

@ -47,33 +47,23 @@ Completely compatibility will probably involve a rewrite with a different URL
*/ */
class DanbooruApi implements Extension class DanbooruApi extends Extension {
{ public function onPageRequest(PageRequestEvent $event) {
if($event->page_matches("api") && ($event->get_arg(0) == 'danbooru')) {
public function get_priority() {return 50;}
// Receive the event
public function receive_event(Event $event)
{
// Check if someone is accessing /api/danbooru (us)
if(($event instanceof PageRequestEvent) && ($event->page_matches("api")) && ($event->get_arg(0) == 'danbooru'))
{
// execute the danbooru processing code
$this->api_danbooru($event); $this->api_danbooru($event);
} }
if($event instanceof SearchTermParseEvent) }
{
$matches = array(); public function onSearchTermParse(SearchTermParseEvent $event) {
if(preg_match("/^md5:([0-9a-fA-F]*)$/i", $event->term, $matches)) $matches = array();
{ if(preg_match("/^md5:([0-9a-fA-F]*)$/i", $event->term, $matches)) {
$hash = strtolower($matches[1]); $hash = strtolower($matches[1]);
$event->add_querylet(new Querylet("images.hash = '$hash'")); // :-O $event->add_querylet(new Querylet("images.hash = '$hash'")); // :-O
// $event->set_querylet(new Querylet("images.hash = '$hash'"));
}
} }
} }
// Danbooru API // Danbooru API
private function api_danbooru($event) private function api_danbooru(PageRequestEvent $event)
{ {
global $page; global $page;
global $config; global $config;

2
contrib/downtime/main.php
View File

@ -11,7 +11,7 @@
* message specified in the box. * message specified in the box.
*/ */
class Downtime extends SimpleExtension { class Downtime extends Extension {
public function get_priority() {return 10;} public function get_priority() {return 10;}
public function onSetupBuilding($event) { public function onSetupBuilding($event) {

8
contrib/emoticons/main.php
View File

@ -13,19 +13,19 @@
*/ */
class Emoticons extends FormatterExtension { class Emoticons extends FormatterExtension {
public function format($text) { public function format(/*string*/ $text) {
$data_href = get_base_href(); $data_href = get_base_href();
$text = preg_replace("/:([a-z]*?):/s", "<img src='$data_href/ext/emoticons/default/\\1.gif'>", $text); $text = preg_replace("/:([a-z]*?):/s", "<img src='$data_href/ext/emoticons/default/\\1.gif'>", $text);
return $text; return $text;
} }
public function strip($text) { public function strip(/*string*/ $text) {
return $text; return $text;
} }
} }
class EmoticonList extends SimpleExtension { class EmoticonList extends Extension {
public function onPageRequest($event) { public function onPageRequest(PageRequestEvent $event) {
if($event->page_matches("emote/list")) { if($event->page_matches("emote/list")) {
$this->theme->display_emotes(glob("ext/emoticons/default/*")); $this->theme->display_emotes(glob("ext/emoticons/default/*"));
} }

9
contrib/et/main.php
View File

@ -12,8 +12,8 @@
* versions of PHP I should test with, etc. * versions of PHP I should test with, etc.
*/ */
class ET extends SimpleExtension { class ET extends Extension {
public function onPageRequest($event) { public function onPageRequest(PageRequestEvent $event) {
global $user; global $user;
if($event->page_matches("system_info")) { if($event->page_matches("system_info")) {
if($user->is_admin()) { if($user->is_admin()) {
@ -22,7 +22,7 @@ class ET extends SimpleExtension {
} }
} }
public function onUserBlockBuilding($event) { public function onUserBlockBuilding(UserBlockBuildingEvent $event) {
global $user; global $user;
if($user->is_admin()) { if($user->is_admin()) {
$event->add_link("System Info", make_link("system_info")); $event->add_link("System Info", make_link("system_info"));
@ -49,9 +49,6 @@ class ET extends SimpleExtension {
$info['sys_disk'] = to_shorthand_int(disk_total_space("./") - disk_free_space("./")) . " / " . $info['sys_disk'] = to_shorthand_int(disk_total_space("./") - disk_free_space("./")) . " / " .
to_shorthand_int(disk_total_space("./")); to_shorthand_int(disk_total_space("./"));
$info['sys_server'] = $_SERVER["SERVER_SOFTWARE"]; $info['sys_server'] = $_SERVER["SERVER_SOFTWARE"];
$proto = preg_replace("#(.*)://.*#", "$1", DATABASE_DSN);
#$db = $database->db->ServerInfo();
#$info['sys_db'] = "$proto / {$db['version']}";
$info['stat_images'] = $database->get_one("SELECT COUNT(*) FROM images"); $info['stat_images'] = $database->get_one("SELECT COUNT(*) FROM images");
$info['stat_comments'] = $database->get_one("SELECT COUNT(*) FROM comments"); $info['stat_comments'] = $database->get_one("SELECT COUNT(*) FROM comments");

30
contrib/favorites/main.php
View File

@ -16,7 +16,7 @@
class FavoriteSetEvent extends Event { class FavoriteSetEvent extends Event {
var $image_id, $user, $do_set; var $image_id, $user, $do_set;
public function FavoriteSetEvent($image_id, User $user, $do_set) { public function FavoriteSetEvent(/*int*/ $image_id, User $user, /*boolean*/ $do_set) {
assert(is_numeric($image_id)); assert(is_numeric($image_id));
assert(is_bool($do_set)); assert(is_bool($do_set));
@ -26,15 +26,15 @@ class FavoriteSetEvent extends Event {
} }
} }
class Favorites extends SimpleExtension { class Favorites extends Extension {
public function onInitExt($event) { public function onInitExt(InitExtEvent $event) {
global $config; global $config;
if($config->get_int("ext_favorites_version", 0) < 1) { if($config->get_int("ext_favorites_version", 0) < 1) {
$this->install(); $this->install();
} }
} }
public function onImageAdminBlockBuilding($event) { public function onImageAdminBlockBuilding(ImageAdminBlockBuildingEvent $event) {
global $database, $page, $user; global $database, $page, $user;
if(!$user->is_anonymous()) { if(!$user->is_anonymous()) {
$user_id = $user->id; $user_id = $user->id;
@ -48,14 +48,14 @@ class Favorites extends SimpleExtension {
} }
} }
public function onDisplayingImage($event) { public function onDisplayingImage(DisplayingImageEvent $event) {
$people = $this->list_persons_who_have_favorited($event->image); $people = $this->list_persons_who_have_favorited($event->image);
if(count($people) > 0) { if(count($people) > 0) {
$html = $this->theme->display_people($people); $html = $this->theme->display_people($people);
} }
} }
public function onPageRequest($event) { public function onPageRequest(PageRequestEvent $event) {
global $page, $user; global $page, $user;
if($event->page_matches("change_favorite") && !$user->is_anonymous() && $user->check_auth_token()) { if($event->page_matches("change_favorite") && !$user->is_anonymous() && $user->check_auth_token()) {
$image_id = int_escape($_POST['image_id']); $image_id = int_escape($_POST['image_id']);
@ -67,7 +67,7 @@ class Favorites extends SimpleExtension {
} }
} }
public function onUserPageBuilding($event) { public function onUserPageBuilding(UserPageBuildingEvent $event) {
$i_favorites_count = Image::count_images(array("favorited_by={$event->display_user->name}")); $i_favorites_count = Image::count_images(array("favorited_by={$event->display_user->name}"));
$i_days_old = ((time() - strtotime($event->display_user->join_date)) / 86400) + 1; $i_days_old = ((time() - strtotime($event->display_user->join_date)) / 86400) + 1;
$h_favorites_rate = sprintf("%.1f", ($i_favorites_count / $i_days_old)); $h_favorites_rate = sprintf("%.1f", ($i_favorites_count / $i_days_old));
@ -75,7 +75,7 @@ class Favorites extends SimpleExtension {
$event->add_stats("<a href='$favorites_link'>Images favorited</a>: $i_favorites_count, $h_favorites_rate per day"); $event->add_stats("<a href='$favorites_link'>Images favorited</a>: $i_favorites_count, $h_favorites_rate per day");
} }
public function onImageInfoSet($event) { public function onImageInfoSet(ImageInfoSetEvent $event) {
global $user; global $user;
if( if(
in_array('favorite_action', $_POST) && in_array('favorite_action', $_POST) &&
@ -85,28 +85,30 @@ class Favorites extends SimpleExtension {
} }
} }
public function onFavoriteSet($event) { public function onFavoriteSet(FavoriteSetEvent $event) {
global $user; global $user;
$this->add_vote($event->image_id, $user->id, $event->do_set); $this->add_vote($event->image_id, $user->id, $event->do_set);
} }
public function onImageDeletion($event) { // FIXME: this should be handled by the foreign key. Check that it
// is, and then remove this
public function onImageDeletion(ImageDeletionEvent $event) {
global $database; global $database;
$database->execute("DELETE FROM user_favorites WHERE image_id=:image_id", array("image_id"=>$event->image->id)); $database->execute("DELETE FROM user_favorites WHERE image_id=:image_id", array("image_id"=>$event->image->id));
} }
public function onParseLinkTemplate($event) { public function onParseLinkTemplate(ParseLinkTemplateEvent $event) {
$event->replace('$favorites', $event->image->favorites); $event->replace('$favorites', $event->image->favorites);
} }
public function onUserBlockBuilding($event) { public function onUserBlockBuilding(UserBlockBuildingEvent $event) {
global $user; global $user;
$username = url_escape($user->name); $username = url_escape($user->name);
$event->add_link("My Favorites", make_link("post/list/favorited_by=$username/1"), 20); $event->add_link("My Favorites", make_link("post/list/favorited_by=$username/1"), 20);
} }
public function onSearchTermParse($event) { public function onSearchTermParse(SearchTermParseEvent $event) {
$matches = array(); $matches = array();
if(preg_match("/favorites(<|>|<=|>=|=)(\d+)/", $event->term, $matches)) { if(preg_match("/favorites(<|>|<=|>=|=)(\d+)/", $event->term, $matches)) {
$cmp = $matches[1]; $cmp = $matches[1];
@ -181,7 +183,7 @@ class Favorites extends SimpleExtension {
array("image_id"=>$image_id, "user_id"=>$user_id)); array("image_id"=>$image_id, "user_id"=>$user_id));
} }
private function list_persons_who_have_favorited($image) { private function list_persons_who_have_favorited(Image $image) {
global $database; global $database;
return $database->get_col( return $database->get_col(

2
contrib/favorites/theme.php
View File

@ -24,6 +24,8 @@ class FavoritesTheme extends Themelet {
$i_favorites = count($username_array); $i_favorites = count($username_array);
$html = "$i_favorites people:"; $html = "$i_favorites people:";
reset($username_array); // rewind to first element in array.
foreach($username_array as $row) { foreach($username_array as $row) {
$username = html_escape($row); $username = html_escape($row);
$html .= "<br><a href='".make_link("user/$username")."'>$username</a>"; $html .= "<br><a href='".make_link("user/$username")."'>$username</a>";

10
contrib/featured/main.php
View File

@ -19,13 +19,13 @@
* every couple of hours. * every couple of hours.
*/ */
class Featured extends SimpleExtension { class Featured extends Extension {
public function onInitExt($event) { public function onInitExt(InitExtEvent $event) {
global $config; global $config;
$config->set_default_int('featured_id', 0); $config->set_default_int('featured_id', 0);
} }
public function onPageRequest($event) { public function onPageRequest(PageRequestEvent $event) {
global $config, $page, $user; global $config, $page, $user;
if($event->page_matches("featured_image")) { if($event->page_matches("featured_image")) {
if($event->get_arg(0) == "set" && $user->check_auth_token()) { if($event->get_arg(0) == "set" && $user->check_auth_token()) {
@ -55,7 +55,7 @@ class Featured extends SimpleExtension {
} }
} }
public function onPostListBuilding($event) { public function onPostListBuilding(PostListBuildingEvent $event) {
global $config, $database, $page, $user; global $config, $database, $page, $user;
$fid = $config->get_int("featured_id"); $fid = $config->get_int("featured_id");
if($fid > 0) { if($fid > 0) {
@ -75,7 +75,7 @@ class Featured extends SimpleExtension {
} }
} }
public function onImageAdminBlockBuilding($event) { public function onImageAdminBlockBuilding(ImageAdminBlockBuildingEvent $event) {
global $user; global $user;
if($user->is_admin()) { if($user->is_admin()) {
$event->add_part($this->theme->get_buttons_html($event->image->id)); $event->add_part($this->theme->get_buttons_html($event->image->id));

8
contrib/forum/main.php
View File

@ -8,8 +8,8 @@
* Documentation: * Documentation:
*/ */
class Forum extends SimpleExtension { class Forum extends Extension {
public function onInitExt($event) { public function onInitExt(InitExtEvent $event) {
global $config, $database; global $config, $database;
// shortcut to latest // shortcut to latest
@ -57,7 +57,7 @@ class Forum extends SimpleExtension {
$event->panel->add_block($sb); $event->panel->add_block($sb);
} }
public function onUserPageBuilding($event) { public function onUserPageBuilding(UserPageBuildingEvent $event) {
global $page, $user, $database; global $page, $user, $database;
$threads_count = $database->get_one("SELECT COUNT(*) FROM forum_threads WHERE user_id=?", array($event->display_user->id)); $threads_count = $database->get_one("SELECT COUNT(*) FROM forum_threads WHERE user_id=?", array($event->display_user->id));
@ -73,7 +73,7 @@ class Forum extends SimpleExtension {
} }
public function onPageRequest($event) { public function onPageRequest(PageRequestEvent $event) {
global $page, $user; global $page, $user;
if($event->page_matches("forum")) { if($event->page_matches("forum")) {

8
contrib/handle_archive/main.php
View File

@ -10,13 +10,13 @@
* <br>7-zip: <code>7zr x -o"%d" "%f"</code> * <br>7-zip: <code>7zr x -o"%d" "%f"</code>
*/ */
class ArchiveFileHandler extends SimpleExtension { class ArchiveFileHandler extends Extension {
public function onInitExt($event) { public function onInitExt(InitExtEvent $event) {
global $config; global $config;
$config->set_default_string('archive_extract_command', 'unzip -d "%d" "%f"'); $config->set_default_string('archive_extract_command', 'unzip -d "%d" "%f"');
} }
public function onSetupBuilding($event) { public function onSetupBuilding(SetupBuildingEvent $event) {
$sb = new SetupBlock("Archive Handler Options"); $sb = new SetupBlock("Archive Handler Options");
$sb->add_text_option("archive_tmp_dir", "Temporary folder: "); $sb->add_text_option("archive_tmp_dir", "Temporary folder: ");
$sb->add_text_option("archive_extract_command", "<br>Extraction command: "); $sb->add_text_option("archive_extract_command", "<br>Extraction command: ");
@ -24,7 +24,7 @@ class ArchiveFileHandler extends SimpleExtension {
$event->panel->add_block($sb); $event->panel->add_block($sb);
} }
public function onDataUpload($event) { public function onDataUpload(DataUploadEvent $event) {
if($this->supported_ext($event->type)) { if($this->supported_ext($event->type)) {
global $config; global $config;
$tmp = sys_get_temp_dir(); $tmp = sys_get_temp_dir();

10
contrib/handle_ico/main.php
View File

@ -5,8 +5,8 @@
* Description: Handle windows icons * Description: Handle windows icons
*/ */
class IcoFileHandler extends SimpleExtension { class IcoFileHandler extends Extension {
public function onDataUpload($event) { public function onDataUpload(DataUploadEvent $event) {
if($this->supported_ext($event->type) && $this->check_contents($event->tmpname)) { if($this->supported_ext($event->type) && $this->check_contents($event->tmpname)) {
$hash = $event->hash; $hash = $event->hash;
$ha = substr($hash, 0, 2); $ha = substr($hash, 0, 2);
@ -22,20 +22,20 @@ class IcoFileHandler extends SimpleExtension {
} }
} }
public function onThumbnailGeneration($event) { public function onThumbnailGeneration(ThumbnailGenerationEvent $event) {
if($this->supported_ext($event->type)) { if($this->supported_ext($event->type)) {
$this->create_thumb($event->hash); $this->create_thumb($event->hash);
} }
} }
public function onDisplayingImage($event) { public function onDisplayingImage(DisplayingImageEvent $event) {
global $page; global $page;
if($this->supported_ext($event->image->ext)) { if($this->supported_ext($event->image->ext)) {
$this->theme->display_image($page, $event->image); $this->theme->display_image($page, $event->image);
} }
} }
public function onPageRequest($event) { public function onPageRequest(PageRequestEvent $event) {
global $config, $database, $page; global $config, $database, $page;
if($event->page_matches("get_ico")) { if($event->page_matches("get_ico")) {
$id = int_escape($event->get_arg(0)); $id = int_escape($event->get_arg(0));

43
contrib/handle_svg/main.php
View File

@ -6,15 +6,9 @@
* Description: Handle SVG files. (No thumbnail is generated for SVG files) * Description: Handle SVG files. (No thumbnail is generated for SVG files)
*/ */
class SVGFileHandler implements Extension { class SVGFileHandler extends Extension {
var $theme; public function onDataUpload(DataUploadEvent $event) {
if($this->supported_ext($event->type) && $this->check_contents($event->tmpname)) {
public function get_priority() {return 50;}
public function receive_event(Event $event) {
if(is_null($this->theme)) $this->theme = get_theme_object($this);
if(($event instanceof DataUploadEvent) && $this->supported_ext($event->type) && $this->check_contents($event->tmpname)) {
$hash = $event->hash; $hash = $event->hash;
$ha = substr($hash, 0, 2); $ha = substr($hash, 0, 2);
if(!move_upload_to_archive($event)) return; if(!move_upload_to_archive($event)) return;
@ -27,33 +21,28 @@ class SVGFileHandler implements Extension {
send_event($iae); send_event($iae);
$event->image_id = $iae->image->id; $event->image_id = $iae->image->id;
} }
}
if(($event instanceof ThumbnailGenerationEvent) && $this->supported_ext($event->type)) { public function onThumbnailGeneration(ThumbnailGenerationEvent $event) {
global $config;
if($this->supported_ext($event->type)) {
$hash = $event->hash; $hash = $event->hash;
$ha = substr($hash, 0, 2); $ha = substr($hash, 0, 2);
global $config; copy("ext/handle_svg/thumb.jpg", warehouse_path("thumbs", $hash));
// if($config->get_string("thumb_engine") == "convert") {
// $w = $config->get_int("thumb_width");
// $h = $config->get_int("thumb_height");
// $q = $config->get_int("thumb_quality");
// $mem = $config->get_int("thumb_max_memory") / 1024 / 1024; // IM takes memory in MB
//
// exec("convert images/{$ha}/{$hash}[0] -geometry {$w}x{$h} -quality {$q} jpg:thumbs/{$ha}/{$hash}");
// }
// else {
copy("ext/handle_svg/thumb.jpg", warehouse_path("thumbs", $hash));
// }
} }
}
if(($event instanceof DisplayingImageEvent) && $this->supported_ext($event->image->ext)) { public function onDisplayingImage(DisplayingImageEvent $event) {
global $page; global $page;
if($this->supported_ext($event->image->ext)) {
$this->theme->display_image($page, $event->image); $this->theme->display_image($page, $event->image);
} }
}
if(($event instanceof PageRequestEvent) && $event->page_matches("get_svg")) { public function onPageRequest(PageRequestEvent $event) {
global $config, $database, $page; global $config, $database, $page;
if($event->page_matches("get_svg")) {
$id = int_escape($event->get_arg(0)); $id = int_escape($event->get_arg(0));
$image = Image::by_id($id); $image = Image::by_id($id);
$hash = $image->hash; $hash = $image->hash;

8
contrib/holiday/main.php
View File

@ -6,20 +6,20 @@
* License: GPLv2 * License: GPLv2
* Description: Use an additional stylesheet on certain holidays. * Description: Use an additional stylesheet on certain holidays.
*/ */
class Holiday extends SimpleExtension { class Holiday extends Extension {
public function onInitExt(Event $event) { public function onInitExt(InitExtEvent $event) {
global $config; global $config;
$config->set_default_bool("holiday_aprilfools", false); $config->set_default_bool("holiday_aprilfools", false);
} }
public function onSetupBuilding(Event $event) { public function onSetupBuilding(SetupBuildingEvent $event) {
global $config; global $config;
$sb = new SetupBlock("Holiday Theme"); $sb = new SetupBlock("Holiday Theme");
$sb->add_bool_option("holiday_aprilfools", "Enable April Fools"); $sb->add_bool_option("holiday_aprilfools", "Enable April Fools");
$event->panel->add_block($sb); $event->panel->add_block($sb);
} }
public function onPageRequest(Event $event) { public function onPageRequest(PageRequestEvent $event) {
global $config; global $config;
$date = /*date('d/m') == '01/01' ||date('d/m') == '14/02' || */date('d/m') == '01/04'/* || date('d/m') == '24/12' || date('d/m') == '25/12' || date('d/m') == '31/12'*/; $date = /*date('d/m') == '01/01' ||date('d/m') == '14/02' || */date('d/m') == '01/04'/* || date('d/m') == '24/12' || date('d/m') == '25/12' || date('d/m') == '31/12'*/;
if($date){ if($date){

2
contrib/home/main.php
View File

@ -15,7 +15,7 @@
* alongside the default choices. * alongside the default choices.
*/ */
class Home extends SimpleExtension { class Home extends Extension {
public function onInitExt(InitExtEvent $event) { public function onInitExt(InitExtEvent $event) {
global $config; global $config;
$config->set_default_string("home_links", '[$base/post/list|Posts] $config->set_default_string("home_links", '[$base/post/list|Posts]

2
contrib/image_hash_ban/main.php
View File

@ -29,7 +29,7 @@ class AddImageHashBanEvent extends Event {
} }
} }
// }}} // }}}
class ImageBan extends SimpleExtension { class ImageBan extends Extension {
public function onInitExt(InitExtEvent $event) { public function onInitExt(InitExtEvent $event) {
global $config, $database; global $config, $database;
if($config->get_int("ext_imageban_version") < 1) { if($config->get_int("ext_imageban_version") < 1) {

14
contrib/ipban/main.php
View File

@ -35,10 +35,10 @@ class AddIPBanEvent extends Event {
} }
// }}} // }}}
class IPBan extends SimpleExtension { class IPBan extends Extension {
public function get_priority() {return 10;} public function get_priority() {return 10;}
public function onInitExt($event) { public function onInitExt(InitExtEvent $event) {
global $config; global $config;
if($config->get_int("ext_ipban_version") < 5) { if($config->get_int("ext_ipban_version") < 5) {
$this->install(); $this->install();
@ -46,7 +46,7 @@ class IPBan extends SimpleExtension {
$this->check_ip_ban(); $this->check_ip_ban();
} }
public function onPageRequest($event) { public function onPageRequest(PageRequestEvent $event) {
if($event->page_matches("ip_ban")) { if($event->page_matches("ip_ban")) {
global $config, $database, $page, $user; global $config, $database, $page, $user;
if($user->is_admin()) { if($user->is_admin()) {
@ -78,19 +78,19 @@ class IPBan extends SimpleExtension {
} }
} }
public function onUserBlockBuilding($event) { public function onUserBlockBuilding(UserBlockBuildingEvent $event) {
global $user; global $user;
if($user->is_admin()) { if($user->is_admin()) {
$event->add_link("IP Bans", make_link("ip_ban/list")); $event->add_link("IP Bans", make_link("ip_ban/list"));
} }
} }
public function onAddIPBan($event) { public function onAddIPBan(AddIPBanEvent $event) {
global $user; global $user;
$this->add_ip_ban($event->ip, $event->reason, $event->end, $user); $this->add_ip_ban($event->ip, $event->reason, $event->end, $user);
} }
public function onRemoveIPBan($event) { public function onRemoveIPBan(RemoveIPBanEvent $event) {
global $database; global $database;
$database->Execute("DELETE FROM bans WHERE id = :id", array("id"=>$event->id)); $database->Execute("DELETE FROM bans WHERE id = :id", array("id"=>$event->id));
$database->cache->delete("ip_bans_sorted"); $database->cache->delete("ip_bans_sorted");
@ -179,7 +179,7 @@ class IPBan extends SimpleExtension {
} }
} }
private function block($remote) { private function block(/*string*/ $remote) {
global $config, $database; global $config, $database;
$prefix = ($database->engine->name == "sqlite" ? "bans." : ""); $prefix = ($database->engine->name == "sqlite" ? "bans." : "");

38
contrib/link_image/main.php
View File

@ -4,29 +4,22 @@
* Author: Artanis <artanis.00@gmail.com> * Author: Artanis <artanis.00@gmail.com>
* Description: Show various forms of link to each image, for copy & paste * Description: Show various forms of link to each image, for copy & paste
*/ */
class LinkImage implements Extension { class LinkImage extends Extension {
var $theme; public function onDisplayingImage(DisplayingImageEvent $event) {
global $page;
$this->theme->links_block($page, $this->data($event->image));
}
public function get_priority() {return 50;} public function onSetupBuildingEvent(SetupBuildingEvent $event) {
$sb = new SetupBlock("Link to Image");
$sb->add_text_option("ext_link-img_text-link_format", "Text Link Format: ");
$event->panel->add_block($sb);
}
public function receive_event(Event $event) { public function onInitExtEvent(InitExtEvent $event) {
global $config, $database, $page, $user; global $config;
if(is_null($this->theme)) $this->theme = get_theme_object($this); $config->set_default_string("ext_link-img_text-link_format", '$title - $id ($ext $size $filesize)');
}
if(($event instanceof DisplayingImageEvent)) {
$this->theme->links_block($page, $this->data($event->image));
}
if($event instanceof SetupBuildingEvent) {
$sb = new SetupBlock("Link to Image");
$sb->add_text_option("ext_link-img_text-link_format", "Text Link Format: ");
$event->panel->add_block($sb);
}
if($event instanceof InitExtEvent) {
//just set default if empty.
$config->set_default_string("ext_link-img_text-link_format",
'$title - $id ($ext $size $filesize)');
}
}
private function hostify($str) { private function hostify($str) {
$str = str_replace(" ", "%20", $str); $str = str_replace(" ", "%20", $str);
@ -37,7 +30,8 @@ class LinkImage implements Extension {
return "http://" . $_SERVER["HTTP_HOST"] . $str; return "http://" . $_SERVER["HTTP_HOST"] . $str;
} }
} }
private function data($image) {
private function data(Image $image) {
global $config; global $config;
$text_link = $image->parse_link_template($config->get_string("ext_link-img_text-link_format")); $text_link = $image->parse_link_template($config->get_string("ext_link-img_text-link_format"));

12
contrib/log_db/main.php
View File

@ -7,8 +7,8 @@
* Visibility: admin * Visibility: admin
*/ */
class LogDatabase extends SimpleExtension { class LogDatabase extends Extension {
public function onInitExt($event) { public function onInitExt(InitExtEvent $event) {
global $database; global $database;
global $config; global $config;
@ -29,7 +29,7 @@ class LogDatabase extends SimpleExtension {
$config->set_default_int("log_db_priority", SCORE_LOG_INFO); $config->set_default_int("log_db_priority", SCORE_LOG_INFO);
} }
public function onSetupBuilding($event) { public function onSetupBuilding(SetupBuildingEvent $event) {
$sb = new SetupBlock("Logging (Database)"); $sb = new SetupBlock("Logging (Database)");
$sb->add_choice_option("log_db_priority", array( $sb->add_choice_option("log_db_priority", array(
"Debug" => SCORE_LOG_DEBUG, "Debug" => SCORE_LOG_DEBUG,
@ -41,7 +41,7 @@ class LogDatabase extends SimpleExtension {
$event->panel->add_block($sb); $event->panel->add_block($sb);
} }
public function onPageRequest($event) { public function onPageRequest(PageRequestEvent $event) {
global $database, $user; global $database, $user;
if($event->page_matches("log/view")) { if($event->page_matches("log/view")) {
if($user->is_admin()) { if($user->is_admin()) {
@ -105,14 +105,14 @@ class LogDatabase extends SimpleExtension {
} }
} }
public function onUserBlockBuilding($event) { public function onUserBlockBuilding(UserBlockBuildingEvent $event) {
global $user; global $user;
if($user->is_admin()) { if($user->is_admin()) {
$event->add_link("Event Log", make_link("log/view")); $event->add_link("Event Log", make_link("log/view"));
} }
} }
public function onLog($event) { public function onLog(LogEvent $event) {
global $config, $database, $user; global $config, $database, $user;
$username = ($user && $user->name) ? $user->name : "null"; $username = ($user && $user->name) ? $user->name : "null";

2
contrib/log_db/theme.php
View File

@ -41,6 +41,8 @@ class LogDatabaseTheme extends Themelet {
</thead> </thead>
<tbody>\n"; <tbody>\n";
$n = 0; $n = 0;
reset($events); // rewind to first element in array.
foreach($events as $event) { foreach($events as $event) {
$oe = ($n++ % 2 == 0) ? "even" : "odd"; $oe = ($n++ % 2 == 0) ? "even" : "odd";
$c = $this->pri_to_col($event['priority']); $c = $this->pri_to_col($event['priority']);

6
contrib/mass_tagger/main.php
View File

@ -14,8 +14,8 @@
* As of now only compatible with the lite theme. * As of now only compatible with the lite theme.
*/ */
class MassTagger extends SimpleExtension { class MassTagger extends Extension {
public function onPostListBuilding($event) { public function onPostListBuilding(PostListBuildingEvent $event) {
global $config, $page, $user; global $config, $page, $user;
if( !$user->is_admin() ) return; if( !$user->is_admin() ) return;
@ -23,7 +23,7 @@ class MassTagger extends SimpleExtension {
$this->theme->display_mass_tagger( $page, $event, $config ); $this->theme->display_mass_tagger( $page, $event, $config );
} }
public function onPageRequest($event) { public function onPageRequest(PageRequestEvent $event) {
global $config, $page, $user; global $config, $page, $user;
if( !$event->page_matches("mass_tagger") ) return; if( !$event->page_matches("mass_tagger") ) return;
if( !$user->is_admin() ) return; if( !$user->is_admin() ) return;

6
contrib/news/main.php
View File

@ -9,15 +9,15 @@
* Any HTML is allowed * Any HTML is allowed
*/ */
class News extends SimpleExtension { class News extends Extension {
public function onPostListBuilding($event) { public function onPostListBuilding(PostListBuildingEvent $event) {
global $config, $page; global $config, $page;
if(strlen($config->get_string("news_text")) > 0) { if(strlen($config->get_string("news_text")) > 0) {
$this->theme->display_news($page, $config->get_string("news_text")); $this->theme->display_news($page, $config->get_string("news_text"));
} }
} }
public function onSetupBuilding($event) { public function onSetupBuilding(SetupBuildingEvent $event) {
$sb = new SetupBlock("News"); $sb = new SetupBlock("News");
$sb->add_longtext_option("news_text"); $sb->add_longtext_option("news_text");
$event->panel->add_block($sb); $event->panel->add_block($sb);

14
contrib/notes/main.php
View File

@ -7,8 +7,8 @@
* Documentation: * Documentation:
*/ */
class Notes extends SimpleExtension { class Notes extends Extension {
public function onInitExt($event) { public function onInitExt(InitExtEvent $event) {
global $config, $database; global $config, $database;
// shortcut to latest // shortcut to latest
@ -66,9 +66,7 @@ class Notes extends SimpleExtension {
} }
} }
public function onPageRequest(PageRequestEvent $event) {
public function onPageRequest($event) {
global $page, $user; global $page, $user;
if($event->page_matches("note")) { if($event->page_matches("note")) {
@ -179,7 +177,7 @@ class Notes extends SimpleExtension {
/* /*
* HERE WE LOAD THE NOTES IN THE IMAGE * HERE WE LOAD THE NOTES IN THE IMAGE
*/ */
public function onDisplayingImage($event) { public function onDisplayingImage(DisplayingImageEvent $event) {
global $page, $user; global $page, $user;
//display form on image event //display form on image event
@ -191,7 +189,7 @@ class Notes extends SimpleExtension {
/* /*
* HERE WE ADD THE BUTTONS ON SIDEBAR * HERE WE ADD THE BUTTONS ON SIDEBAR
*/ */
public function onImageAdminBlockBuilding($event) { public function onImageAdminBlockBuilding(ImageAdminBlockBuildingEvent $event) {
global $user; global $user;
if(!$user->is_anonymous()) { if(!$user->is_anonymous()) {
$event->add_part($this->theme->note_button($event->image->id)); $event->add_part($this->theme->note_button($event->image->id));
@ -207,7 +205,7 @@ class Notes extends SimpleExtension {
/* /*
* HERE WE ADD QUERYLETS TO ADD SEARCH SYSTEM * HERE WE ADD QUERYLETS TO ADD SEARCH SYSTEM
*/ */
public function onSearchTermParse($event) { public function onSearchTermParse(SearchTermParseEvent $event) {
$matches = array(); $matches = array();
if(preg_match("/note=(.*)/i", $event->term, $matches)) { if(preg_match("/note=(.*)/i", $event->term, $matches)) {
$notes = int_escape($matches[1]); $notes = int_escape($matches[1]);

387
contrib/numeric_score/main.php
View File

@ -13,226 +13,227 @@
class NumericScoreSetEvent extends Event { class NumericScoreSetEvent extends Event {
var $image_id, $user, $score; var $image_id, $user, $score;
public function NumericScoreSetEvent($image_id, $user, $score) { public function NumericScoreSetEvent(/*int*/ $image_id, User $user, /*int*/ $score) {
$this->image_id = $image_id; $this->image_id = $image_id;
$this->user = $user; $this->user = $user;
$this->score = $score; $this->score = $score;
} }
} }
class NumericScore implements Extension { class NumericScore extends Extension {
var $theme; public function onInitExt(InitExtEvent $event) {
global $config;
public function get_priority() {return 50;} if($config->get_int("ext_numeric_score_version", 0) < 1) {
$this->install();
public function receive_event(Event $event) {
global $config, $database, $page, $user;
if(is_null($this->theme)) $this->theme = get_theme_object($this);
if($event instanceof InitExtEvent) {
if($config->get_int("ext_numeric_score_version", 0) < 1) {
$this->install();
}
} }
}
if($event instanceof DisplayingImageEvent) { public function onDisplayingImage(DisplayingImageEvent $event) {
global $user, $page;
if(!$user->is_anonymous()) {
$html = $this->theme->get_voter_html($event->image);
$page->add_block(new Block("Image Score", $html, "left", 20));
}
}
public function onUserPageBuilding(UserPageBuildingEvent $event) {
global $page;
$html = $this->theme->get_nuller_html($event->display_user);
$page->add_block(new Block("Votes", $html, "main", 60));
}
public function onPageRequest(PageRequestEvent $event) {
global $config, $database, $user, $page;
if($event->page_matches("numeric_score_votes")) {
$image_id = int_escape($event->get_arg(0));
$x = $database->get_all(
"SELECT users.name as username, user_id, score
FROM numeric_score_votes
JOIN users ON numeric_score_votes.user_id=users.id
WHERE image_id=?",
array($image_id));
$html = "<table>";
foreach($x as $vote) {
$html .= "<tr><td>";
$html .= "<a href='/user/{$vote['username']}'>{$vote['username']}</a>";
$html .= "</td><td>";
$html .= $vote['score'];
$html .= "</td></tr>";
}
die($html);
}
if($event->page_matches("numeric_score_vote") && $user->check_auth_token()) {
if(!$user->is_anonymous()) { if(!$user->is_anonymous()) {
$html = $this->theme->get_voter_html($event->image); $image_id = int_escape($_POST['image_id']);
$page->add_block(new Block("Image Score", $html, "left", 20)); $char = $_POST['vote'];
$score = null;
if($char == "up") $score = 1;
else if($char == "null") $score = 0;
else if($char == "down") $score = -1;
if(!is_null($score) && $image_id>0) send_event(new NumericScoreSetEvent($image_id, $user, $score));
$page->set_mode("redirect");
$page->set_redirect(make_link("post/view/$image_id"));
} }
} }
if($event->page_matches("numeric_score/remove_votes_on") && $user->check_auth_token()) {
if($event instanceof UserPageBuildingEvent) { if($user->is_admin()) {
$html = $this->theme->get_nuller_html($event->display_user); $image_id = int_escape($_POST['image_id']);
$page->add_block(new Block("Votes", $html, "main", 60)); $database->execute(
"DELETE FROM numeric_score_votes WHERE image_id=?",
array($image_id));
$database->execute(
"UPDATE images SET numeric_score=0 WHERE id=?",
array($image_id));
$page->set_mode("redirect");
$page->set_redirect(make_link("post/view/$image_id"));
}
} }
if($event->page_matches("numeric_score/remove_votes_by") && $user->check_auth_token()) {
if($user->is_admin()) {
$user_id = int_escape($_POST['user_id']);
$image_ids = $database->get_col("SELECT image_id FROM numeric_score_votes WHERE user_id=?", array($user_id));
if($event instanceof PageRequestEvent) { $database->execute(
if($event->page_matches("numeric_score_votes")) { "DELETE FROM numeric_score_votes WHERE user_id=? AND image_id IN ?",
$image_id = int_escape($event->get_arg(0)); array($user_id, $image_ids));
$x = $database->get_all( $database->execute(
"SELECT users.name as username, user_id, score "UPDATE images SET numeric_score=(SELECT SUM(score) FROM numeric_score_votes WHERE image_id=images.id) WHERE images.id IN ?",
FROM numeric_score_votes array($image_ids));
JOIN users ON numeric_score_votes.user_id=users.id $page->set_mode("redirect");
WHERE image_id=?", $page->set_redirect(make_link());
array($image_id));
$html = "<table>";
foreach($x as $vote) {
$html .= "<tr><td>";
$html .= "<a href='/user/{$vote['username']}'>{$vote['username']}</a>";
$html .= "</td><td>";
$html .= $vote['score'];
$html .= "</td></tr>";
}
die($html);
} }
if($event->page_matches("numeric_score_vote") && $user->check_auth_token()) { }
if(!$user->is_anonymous()) { if($event->page_matches("popular_by_day") || $event->page_matches("popular_by_month") || $event->page_matches("popular_by_year")) {
$image_id = int_escape($_POST['image_id']); $t_images = $config->get_int("index_height") * $config->get_int("index_width");
$char = $_POST['vote'];
$score = null; //TODO: Add Popular_by_week.
if($char == "up") $score = 1;
else if($char == "null") $score = 0; //year
else if($char == "down") $score = -1; if(empty($_GET['year'])){
if(!is_null($score) && $image_id>0) send_event(new NumericScoreSetEvent($image_id, $user, $score)); $year = date("Y");
$page->set_mode("redirect"); }else{
$page->set_redirect(make_link("post/view/$image_id")); $year = $_GET['year'];
}
} }
if($event->page_matches("numeric_score/remove_votes_on") && $user->check_auth_token()) { //month
if($user->is_admin()) { if(empty($_GET['month']) || int_escape($_GET['month']) > 12){
$image_id = int_escape($_POST['image_id']); $month = date("m");
$database->execute( }else{
"DELETE FROM numeric_score_votes WHERE image_id=?", $month = $_GET['month'];
array($image_id));
$database->execute(
"UPDATE images SET numeric_score=0 WHERE id=?",
array($image_id));
$page->set_mode("redirect");
$page->set_redirect(make_link("post/view/$image_id"));
}
} }
if($event->page_matches("numeric_score/remove_votes_by") && $user->check_auth_token()) { //day
if($user->is_admin()) { if(empty($_GET['day']) || int_escape($_GET['day']) > 31){
$user_id = int_escape($_POST['user_id']); $day = date("d");
$image_ids = $database->get_col("SELECT image_id FROM numeric_score_votes WHERE user_id=?", array($user_id)); }else{
$day = $_GET['day'];
$database->execute(
"DELETE FROM numeric_score_votes WHERE user_id=? AND image_id IN ?",
array($user_id, $image_ids));
$database->execute(
"UPDATE images SET numeric_score=(SELECT SUM(score) FROM numeric_score_votes WHERE image_id=images.id) WHERE images.id IN ?",
array($image_ids));
$page->set_mode("redirect");
$page->set_redirect(make_link());
}
} }
if($event->page_matches("popular_by_day") || $event->page_matches("popular_by_month") || $event->page_matches("popular_by_year")) { $totaldate = $year."/".$month."/".$day;
$t_images = $config->get_int("index_height") * $config->get_int("index_width");
//TODO: Add Popular_by_week. $sql =
"SELECT * FROM images
WHERE EXTRACT(YEAR FROM posted) = :year
";
//year $agrs = array("limit" => $t_images, "year" => $year);
if(empty($_GET['year'])){
$year = date("Y");
}else{
$year = $_GET['year'];
}
//month
if(empty($_GET['month']) || int_escape($_GET['month']) > 12){
$month = date("m");
}else{
$month = $_GET['month'];
}
//day
if(empty($_GET['day']) || int_escape($_GET['day']) > 31){
$day = date("d");
}else{
$day = $_GET['day'];
}
$totaldate = $year."/".$month."/".$day;
$sql = if($event->page_matches("popular_by_day")){
"SELECT * FROM images $sql .=
WHERE EXTRACT(YEAR FROM posted) = :year "AND EXTRACT(MONTH FROM posted) = :month
AND EXTRACT(DAY FROM posted) = :day
AND NOT numeric_score=0
"; ";
//array_push doesn't seem to like using double arrows
//this requires us to instead create two arrays and merge
$sgra = array("month" => $month, "day" => $day);
$args = array_merge($agrs, $sgra);
$agrs = array("limit" => $t_images, "year" => $year); $dte = array($totaldate, date("F jS, Y", (strtotime($totaldate))), "\\y\\e\\a\\r\\=Y\\&\\m\\o\\n\\t\\h\\=m\\&\\d\\a\\y\\=d", "day");
if($event->page_matches("popular_by_day")){
$sql .=
"AND EXTRACT(MONTH FROM posted) = :month
AND EXTRACT(DAY FROM posted) = :day
AND NOT numeric_score=0
";
//array_push doesn't seem to like using double arrows
//this requires us to instead create two arrays and merge
$sgra = array("month" => $month, "day" => $day);
$args = array_merge($agrs, $sgra);
$dte = array($totaldate, date("F jS, Y", (strtotime($totaldate))), "\\y\\e\\a\\r\\=Y\\&\\m\\o\\n\\t\\h\\=m\\&\\d\\a\\y\\=d", "day");
}
if($event->page_matches("popular_by_month")){
$sql .=
"AND EXTRACT(MONTH FROM posted) = :month
AND NOT numeric_score=0
";
$sgra = array("month" => $month);
$args = array_merge($agrs, $sgra);
$title = date("F Y", (strtotime($totaldate)));
$dte = array($totaldate, $title, "\\y\\e\\a\\r\\=Y\\&\\m\\o\\n\\t\\h\\=m", "month");
}
if($event->page_matches("popular_by_year")){
$sql .= "AND NOT numeric_score=0";
$dte = array($totaldate, $year, "\y\e\a\\r\=Y", "year");
$args = $agrs;
}
$sql .= " ORDER BY numeric_score DESC LIMIT :limit OFFSET 0";
//filter images by year/score != 0 > limit to max images on one page > order from highest to lowest score
$result = $database->get_all($sql, $args);
$images = array();
foreach($result as $singleResult) {
$images[] = Image::by_id($singleResult["id"]);
}
$this->theme->view_popular($images, $dte);
} }
if($event->page_matches("popular_by_month")){
$sql .=
"AND EXTRACT(MONTH FROM posted) = :month
AND NOT numeric_score=0
";
$sgra = array("month" => $month);
$args = array_merge($agrs, $sgra);
$title = date("F Y", (strtotime($totaldate)));
$dte = array($totaldate, $title, "\\y\\e\\a\\r\\=Y\\&\\m\\o\\n\\t\\h\\=m", "month");
}
if($event->page_matches("popular_by_year")){
$sql .= "AND NOT numeric_score=0";
$dte = array($totaldate, $year, "\y\e\a\\r\=Y", "year");
$args = $agrs;
}
$sql .= " ORDER BY numeric_score DESC LIMIT :limit OFFSET 0";
//filter images by year/score != 0 > limit to max images on one page > order from highest to lowest score
$result = $database->get_all($sql, $args);
$images = array();
foreach($result as $singleResult) {
$images[] = Image::by_id($singleResult["id"]);
}
$this->theme->view_popular($images, $dte);
} }
}
if($event instanceof NumericScoreSetEvent) { public function onNumericScoreSet(NumericScoreSetEvent $event) {
log_info("numeric_score", "Rated Image #{$event->image_id} as {$event->score}"); global $user;
$this->add_vote($event->image_id, $user->id, $event->score); log_info("numeric_score", "Rated Image #{$event->image_id} as {$event->score}");
$this->add_vote($event->image_id, $user->id, $event->score);
}
public function onImageDeletion(ImageDeletionEvent $event) {
global $database;
$database->execute("DELETE FROM numeric_score_votes WHERE image_id=:id", array("id" => $event->image->id));
}
// FIXME: on user deletion
// FIXME: on user vote nuke
public function onParseLinkTemplate(ParseLinkTemplateEvent $event) {
$event->replace('$score', $event->image->numeric_score);
}
public function onSearchTermParse(SearchTermParseEvent $event) {
$matches = array();
if(preg_match("/^score(<|<=|=|>=|>)(\d+)$/", $event->term, $matches)) {
$cmp = $matches[1];
$score = $matches[2];
$event->add_querylet(new Querylet("numeric_score $cmp $score"));
} }
if(preg_match("/^upvoted_by=(.*)$/", $event->term, $matches)) {
if($event instanceof ImageDeletionEvent) { $duser = User::by_name($matches[1]);
$database->execute("DELETE FROM numeric_score_votes WHERE image_id=:id", array("id" => $event->image->id)); if(is_null($duser)) {
throw new SearchTermParseException(
"Can't find the user named ".html_escape($matches[1]));
}
$event->add_querylet(new Querylet(
"images.id in (SELECT image_id FROM numeric_score_votes WHERE user_id=:ns_user_id AND score=1)",
array("ns_user_id"=>$duser->id)));
} }
if(preg_match("/^downvoted_by=(.*)$/", $event->term, $matches)) {
if($event instanceof ParseLinkTemplateEvent) { $duser = User::by_name($matches[1]);
$event->replace('$score', $event->image->numeric_score); if(is_null($duser)) {
throw new SearchTermParseException(
"Can't find the user named ".html_escape($matches[1]));
}
$event->add_querylet(new Querylet(
"images.id in (SELECT image_id FROM numeric_score_votes WHERE user_id=:ns_user_id AND score=-1)",
array("ns_user_id"=>$duser->id)));
} }
if(preg_match("/^upvoted_by_id=(\d+)$/", $event->term, $matches)) {
if($event instanceof SearchTermParseEvent) { $iid = int_escape($matches[1]);
$matches = array(); $event->add_querylet(new Querylet(
if(preg_match("/^score(<|<=|=|>=|>)(\d+)$/", $event->term, $matches)) { "images.id in (SELECT image_id FROM numeric_score_votes WHERE user_id=:ns_user_id AND score=1)",
$cmp = $matches[1]; array("ns_user_id"=>$iid)));
$score = $matches[2]; }
$event->add_querylet(new Querylet("numeric_score $cmp $score")); if(preg_match("/^downvoted_by_id=(\d+)$/", $event->term, $matches)) {
} $iid = int_escape($matches[1]);
if(preg_match("/^upvoted_by=(.*)$/", $event->term, $matches)) { $event->add_querylet(new Querylet(
$duser = User::by_name($matches[1]); "images.id in (SELECT image_id FROM numeric_score_votes WHERE user_id=:ns_user_id AND score=-1)",
if(is_null($duser)) { array("ns_user_id"=>$iid)));
throw new SearchTermParseException(
"Can't find the user named ".html_escape($matches[1]));
}
$event->add_querylet(new Querylet(
"images.id in (SELECT image_id FROM numeric_score_votes WHERE user_id=:ns_user_id AND score=1)",
array("ns_user_id"=>$duser->id)));
}
if(preg_match("/^downvoted_by=(.*)$/", $event->term, $matches)) {
$duser = User::by_name($matches[1]);
if(is_null($duser)) {
throw new SearchTermParseException(
"Can't find the user named ".html_escape($matches[1]));
}
$event->add_querylet(new Querylet(
"images.id in (SELECT image_id FROM numeric_score_votes WHERE user_id=:ns_user_id AND score=-1)",
array("ns_user_id"=>$duser->id)));
}
if(preg_match("/^upvoted_by_id=(\d+)$/", $event->term, $matches)) {
$iid = int_escape($matches[1]);
$event->add_querylet(new Querylet(
"images.id in (SELECT image_id FROM numeric_score_votes WHERE user_id=:ns_user_id AND score=1)",
array("ns_user_id"=>$iid)));
}
if(preg_match("/^downvoted_by_id=(\d+)$/", $event->term, $matches)) {
$iid = int_escape($matches[1]);
$event->add_querylet(new Querylet(
"images.id in (SELECT image_id FROM numeric_score_votes WHERE user_id=:ns_user_id AND score=-1)",
array("ns_user_id"=>$iid)));
}
} }
} }
@ -260,7 +261,7 @@ class NumericScore implements Extension {
} }
} }
private function add_vote($image_id, $user_id, $score) { private function add_vote(/*int*/ $image_id, /*int*/ $user_id, /*int*/ $score) {
global $database; global $database;
$database->execute( $database->execute(
"DELETE FROM numeric_score_votes WHERE image_id=:imageid AND user_id=:userid", "DELETE FROM numeric_score_votes WHERE image_id=:imageid AND user_id=:userid",

6
contrib/oekaki/main.php
View File

@ -5,8 +5,8 @@
* Description: ChibiPaint-based Oekaki uploader * Description: ChibiPaint-based Oekaki uploader
*/ */
class Oekaki extends SimpleExtension { class Oekaki extends Extension {
public function onPageRequest($event) { public function onPageRequest(PageRequestEvent $event) {
global $user, $page; global $user, $page;
if($event->page_matches("oekaki")) { if($event->page_matches("oekaki")) {
@ -82,7 +82,7 @@ class Oekaki extends SimpleExtension {
} }
// FIXME: "edit this image" button on existing images? // FIXME: "edit this image" button on existing images?
function onPostListBuilding($event) { function onPostListBuilding(PostListBuildingEvent $event) {
global $user, $page; global $user, $page;
if($this->can_upload($user)) { if($this->can_upload($user)) {
$this->theme->display_block($page); $this->theme->display_block($page);

14
contrib/pm/main.php
View File

@ -11,7 +11,7 @@
*/ */
class SendPMEvent extends Event { class SendPMEvent extends Event {
public function __construct($pm) { public function __construct(PM $pm) {
$this->pm = $pm; $this->pm = $pm;
} }
} }
@ -42,8 +42,8 @@ class PM {
} }
} }
class PrivMsg extends SimpleExtension { class PrivMsg extends Extension {
public function onInitExt($event) { public function onInitExt(InitExtEvent $event) {
global $config, $database; global $config, $database;
// shortcut to latest // shortcut to latest
@ -78,7 +78,7 @@ class PrivMsg extends SimpleExtension {
} }
/* /*
public function onUserBlockBuilding($event) { public function onUserBlockBuilding(UserBlockBuilding $event) {
global $user; global $user;
if(!$user->is_anonymous()) { if(!$user->is_anonymous()) {
$event->add_link("Private Messages", make_link("pm")); $event->add_link("Private Messages", make_link("pm"));
@ -86,7 +86,7 @@ class PrivMsg extends SimpleExtension {
} }
*/ */
public function onUserPageBuilding($event) { public function onUserPageBuilding(UserPageBuilding $event) {
global $page, $user; global $page, $user;
$duser = $event->display_user; $duser = $event->display_user;
if(!$user->is_anonymous() && !$duser->is_anonymous()) { if(!$user->is_anonymous() && !$duser->is_anonymous()) {
@ -99,7 +99,7 @@ class PrivMsg extends SimpleExtension {
} }
} }
public function onPageRequest($event) { public function onPageRequest(PageRequestEvent $event) {
global $database, $page, $user; global $database, $page, $user;
if($event->page_matches("pm")) { if($event->page_matches("pm")) {
if(!$user->is_anonymous()) { if(!$user->is_anonymous()) {
@ -153,7 +153,7 @@ class PrivMsg extends SimpleExtension {
} }
} }
public function onSendPM($event) { public function onSendPM(SendPMEvent $event) {
global $database; global $database;
$database->execute(" $database->execute("
INSERT INTO private_message( INSERT INTO private_message(

13
contrib/pools/main.php
View File

@ -20,10 +20,9 @@ class PoolCreationException extends SCoreException {
} }
} }
class Pools extends Extension {
class Pools extends SimpleExtension { public function onInitExt(InitExtEvent $event) {
public function onInitExt($event) {
global $config, $database; global $config, $database;
// Create the database tables // Create the database tables
@ -82,7 +81,7 @@ class Pools extends SimpleExtension {
$event->panel->add_block($sb); $event->panel->add_block($sb);
} }
public function onPageRequest($event) { public function onPageRequest(PageRequestEvent $event) {
global $config, $page, $user; global $config, $page, $user;
if ($event->page_matches("pool")) { if ($event->page_matches("pool")) {
@ -218,7 +217,7 @@ class Pools extends SimpleExtension {
} }
} }
public function onUserBlockBuilding($event) { public function onUserBlockBuilding(UserBlockBuildingEvent $event) {
$event->add_link("Pools", make_link("pool/list")); $event->add_link("Pools", make_link("pool/list"));
} }
@ -228,7 +227,7 @@ class Pools extends SimpleExtension {
* image is currently a member of on a side panel, as well as a link * image is currently a member of on a side panel, as well as a link
* to the Next image in the pool. * to the Next image in the pool.
*/ */
public function onDisplayingImage($event) { public function onDisplayingImage(DisplayingImageEvent $event) {
global $config, $database, $page; global $config, $database, $page;
if($config->get_bool("poolsInfoOnViewImage")) { if($config->get_bool("poolsInfoOnViewImage")) {
@ -256,7 +255,7 @@ class Pools extends SimpleExtension {
} }
} }
public function onImageAdminBlockBuilding($event) { public function onImageAdminBlockBuilding(ImageAdminBlockBuildingEvent $event) {
global $config, $database, $user; global $config, $database, $user;
if($config->get_bool("poolsAdderOnViewImage") && !$user->is_anonymous()) { if($config->get_bool("poolsAdderOnViewImage") && !$user->is_anonymous()) {
if($user->is_admin()) { if($user->is_admin()) {

4
contrib/qr_code/main.php
View File

@ -7,8 +7,8 @@
* Further modified by Shish to remove the 7MB local QR generator * Further modified by Shish to remove the 7MB local QR generator
* and replace it with a link to google chart APIs * and replace it with a link to google chart APIs
*/ */
class QRImage extends SimpleExtension { class QRImage extends Extension {
public function onDisplayingImage($event) { public function onDisplayingImage(DisplayingImageEvent $event) {
$this->theme->links_block(make_http(make_link('image/'.$event->image->id.'.jpg'))); $this->theme->links_block(make_http(make_link('image/'.$event->image->id.'.jpg')));
} }
} }

8
contrib/random_image/main.php
View File

@ -20,8 +20,8 @@
* <code>/random_image/download/size=1024x768+cute</code> * <code>/random_image/download/size=1024x768+cute</code>
*/ */
class RandomImage extends SimpleExtension { class RandomImage extends Extension {
public function onPageRequest($event) { public function onPageRequest(PageRequestEvent $event) {
global $config, $database, $page, $user; global $config, $database, $page, $user;
if($event->page_matches("random_image")) { if($event->page_matches("random_image")) {
if($event->count_args() == 1) { if($event->count_args() == 1) {
@ -52,13 +52,13 @@ class RandomImage extends SimpleExtension {
} }
} }
public function onSetupBuilding($event) { public function onSetupBuilding(SetupBuildingEvent $event) {
$sb = new SetupBlock("Random Image"); $sb = new SetupBlock("Random Image");
$sb->add_bool_option("show_random_block", "Show Random Block: "); $sb->add_bool_option("show_random_block", "Show Random Block: ");
$event->panel->add_block($sb); $event->panel->add_block($sb);
} }
public function onPostListBuilding($event) { public function onPostListBuilding(PostListBuildingEvent $event) {
global $config, $page; global $config, $page;
if($config->get_bool("show_random_block")) { if($config->get_bool("show_random_block")) {
$image = Image::by_random($event->search_terms); $image = Image::by_random($event->search_terms);

183
contrib/rating/main.php
View File

@ -18,20 +18,13 @@ class RatingSetEvent extends Event {
} }
} }
class Ratings implements Extension { class Ratings extends Extension {
var $theme; public function onAdminBuilding(AdminBuildingEvent $event) {
$this->theme->display_bulk_rater();
}
public function get_priority() {return 50;} public function onPageRequest(PageRequestEvent $event) {
if($event->page_matches("admin/bulk_rate")) {
public function receive_event(Event $event) {
global $config, $database, $page, $user;
if(is_null($this->theme)) $this->theme = get_theme_object($this);
if($event instanceof AdminBuildingEvent) {
$this->theme->display_bulk_rater();
}
if(($event instanceof PageRequestEvent) && $event->page_matches("admin/bulk_rate")) {
global $database, $user, $page; global $database, $user, $page;
if(!$user->is_admin()) { if(!$user->is_admin()) {
throw PermissionDeniedException(); throw PermissionDeniedException();
@ -41,6 +34,9 @@ class Ratings implements Extension {
while(true) { while(true) {
$images = Image::find_images($n, 100, Tag::explode($_POST["query"])); $images = Image::find_images($n, 100, Tag::explode($_POST["query"]));
if(count($images) == 0) break; if(count($images) == 0) break;
reset($images); // rewind to first element in array.
foreach($images as $image) { foreach($images as $image) {
send_event(new RatingSetEvent($image, $user, $_POST['rating'])); send_event(new RatingSetEvent($image, $user, $_POST['rating']));
} }
@ -55,95 +51,98 @@ class Ratings implements Extension {
$page->set_redirect(make_link("admin")); $page->set_redirect(make_link("admin"));
} }
} }
}
if($event instanceof InitExtEvent) { public function onInitExt(InitExtEvent $event) {
if($config->get_int("ext_ratings2_version") < 2) { global $config;
$this->install();
}
$config->set_default_string("ext_rating_anon_privs", 'squ'); if($config->get_int("ext_ratings2_version") < 2) {
$config->set_default_string("ext_rating_user_privs", 'sqeu'); $this->install();
$config->set_default_string("ext_rating_admin_privs", 'sqeu');
} }
if($event instanceof RatingSetEvent) { $config->set_default_string("ext_rating_anon_privs", 'squ');
if(empty($event->image->rating)){ $config->set_default_string("ext_rating_user_privs", 'sqeu');
$old_rating = ""; $config->set_default_string("ext_rating_admin_privs", 'sqeu');
}else{ }
$old_rating = $event->image->rating;
}
$this->set_rating($event->image->id, $event->rating, $old_rating);
}
if($event instanceof ImageInfoBoxBuildingEvent) { public function onRatingSet(RatingSetEvent $event) {
if($this->can_rate()) { if(empty($event->image->rating)){
$event->add_part($this->theme->get_rater_html($event->image->id, $event->image->rating), 80); $old_rating = "";
} }else{
$old_rating = $event->image->rating;
} }
$this->set_rating($event->image->id, $event->rating, $old_rating);
}
if($event instanceof ImageInfoSetEvent) { public function onImageInfoBoxBuilding(ImageInfoBoxBuildingEvent $event) {
if($this->can_rate() && isset($_POST["rating"])) { if($this->can_rate()) {
send_event(new RatingSetEvent($event->image, $user, $_POST['rating'])); $event->add_part($this->theme->get_rater_html($event->image->id, $event->image->rating), 80);
}
}
if($event instanceof SetupBuildingEvent) {
$privs = array();
$privs['Safe Only'] = 's';
$privs['Safe and Unknown'] = 'su';
$privs['Safe and Questionable'] = 'sq';
$privs['Safe, Questionable, Unknown'] = 'squ';
$privs['All'] = 'sqeu';
$sb = new SetupBlock("Image Ratings");
$sb->add_choice_option("ext_rating_anon_privs", $privs, "Anonymous: ");
$sb->add_choice_option("ext_rating_user_privs", $privs, "<br>Users: ");
$sb->add_choice_option("ext_rating_admin_privs", $privs, "<br>Admins: ");
$event->panel->add_block($sb);
}
if($event instanceof ParseLinkTemplateEvent) {
$event->replace('$rating', $this->theme->rating_to_name($event->image->rating));
}
if($event instanceof SearchTermParseEvent) {
$matches = array();
if(is_null($event->term) && $this->no_rating_query($event->context)) {
$set = Ratings::privs_to_sql(Ratings::get_user_privs($user));
$event->add_querylet(new Querylet("rating IN ($set)"));
}
if(preg_match("/^rating=([sqeu]+)$/", $event->term, $matches)) {
$sqes = $matches[1];
$arr = array();
$length = strlen($sqes);
for($i=0; $i<$length; $i++) {
$arr[] = "'" . $sqes[$i] . "'";
}
$set = join(', ', $arr);
$event->add_querylet(new Querylet("rating IN ($set)"));
}
if(preg_match("/^rating=(safe|questionable|explicit|unknown)$/", strtolower($event->term), $matches)) {
$text = $matches[1];
$char = $text[0];
$event->add_querylet(new Querylet("rating = :img_rating", array("img_rating"=>$char)));
}
}
if($event instanceof DisplayingImageEvent) {
/**
* Deny images upon insufficient permissions.
**/
global $user, $database, $page;
$user_view_level = Ratings::get_user_privs($user);
$user_view_level = preg_split('//', $user_view_level, -1);
if(!in_array($event->image->rating, $user_view_level)) {
$page->set_mode("redirect");
$page->set_redirect(make_link("post/list"));
}
} }
} }
public static function get_user_privs($user) { public function onImageInfoSet(ImageInfoSetEvent $event) {
global $user;
if($this->can_rate() && isset($_POST["rating"])) {
send_event(new RatingSetEvent($event->image, $user, $_POST['rating']));
}
}
public function onSetupBuilding(SetupBuildingEvent $event) {
$privs = array();
$privs['Safe Only'] = 's';
$privs['Safe and Unknown'] = 'su';
$privs['Safe and Questionable'] = 'sq';
$privs['Safe, Questionable, Unknown'] = 'squ';
$privs['All'] = 'sqeu';
$sb = new SetupBlock("Image Ratings");
$sb->add_choice_option("ext_rating_anon_privs", $privs, "Anonymous: ");
$sb->add_choice_option("ext_rating_user_privs", $privs, "<br>Users: ");
$sb->add_choice_option("ext_rating_admin_privs", $privs, "<br>Admins: ");
$event->panel->add_block($sb);
}
public function onParseLinkTemplate(ParseLinkTemplateEvent $event) {
$event->replace('$rating', $this->theme->rating_to_name($event->image->rating));
}
public function onSearchTermParse(SearchTermParseEvent $event) {
$matches = array();
if(is_null($event->term) && $this->no_rating_query($event->context)) {
$set = Ratings::privs_to_sql(Ratings::get_user_privs($user));
$event->add_querylet(new Querylet("rating IN ($set)"));
}
if(preg_match("/^rating=([sqeu]+)$/", $event->term, $matches)) {
$sqes = $matches[1];
$arr = array();
$length = strlen($sqes);
for($i=0; $i<$length; $i++) {
$arr[] = "'" . $sqes[$i] . "'";
}
$set = join(', ', $arr);
$event->add_querylet(new Querylet("rating IN ($set)"));
}
if(preg_match("/^rating=(safe|questionable|explicit|unknown)$/", strtolower($event->term), $matches)) {
$text = $matches[1];
$char = $text[0];
$event->add_querylet(new Querylet("rating = :img_rating", array("img_rating"=>$char)));
}
}
public function onDisplayingImage(DisplayingImageEvent $event) {
/**
* Deny images upon insufficient permissions.
**/
global $user, $page;
$user_view_level = Ratings::get_user_privs($user);
$user_view_level = preg_split('//', $user_view_level, -1);
if(!in_array($event->image->rating, $user_view_level)) {
$page->set_mode("redirect");
$page->set_redirect(make_link("post/list"));
}
}
public static function get_user_privs(User $user) {
global $config; global $config;
if($user->is_anonymous()) { if($user->is_anonymous()) {
$sqes = $config->get_string("ext_rating_anon_privs"); $sqes = $config->get_string("ext_rating_anon_privs");

6
contrib/regen_thumb/main.php
View File

@ -13,8 +13,8 @@
* since been increased. * since been increased.
*/ */
class RegenThumb extends SimpleExtension { class RegenThumb extends Extension {
public function onPageRequest($event) { public function onPageRequest(PageRequestEvent $event) {
global $config, $database, $page, $user; global $config, $database, $page, $user;
if($event->page_matches("regen_thumb") && $user->is_admin() && isset($_POST['image_id'])) { if($event->page_matches("regen_thumb") && $user->is_admin() && isset($_POST['image_id'])) {
@ -24,7 +24,7 @@ class RegenThumb extends SimpleExtension {
} }
} }
public function onImageAdminBlockBuilding($event) { public function onImageAdminBlockBuilding(ImageAdminBlockBuildingEvent $event) {
global $user; global $user;
if($user->is_admin()) { if($user->is_admin()) {
$event->add_part($this->theme->get_buttons_html($event->image->id)); $event->add_part($this->theme->get_buttons_html($event->image->id));

82
contrib/report_image/main.php
View File

@ -29,24 +29,19 @@ class AddReportedImageEvent extends Event {
} }
} }
class ReportImage implements Extension { class ReportImage extends Extension {
var $theme; public function onInitExt(InitExtEvent $event) {
global $config;
$config->set_default_bool('report_image_show_thumbs', true);
public function get_priority() {return 50;} if($config->get_int("ext_report_image_version") < 1) {
$this->install();
public function receive_event(Event $event) {
global $config, $database, $page, $user;
if(is_null($this->theme)) $this->theme = get_theme_object($this);
if($event instanceof InitExtEvent) {
$config->set_default_bool('report_image_show_thumbs', true);
if($config->get_int("ext_report_image_version") < 1) {
$this->install();
}
} }
}
if(($event instanceof PageRequestEvent) && $event->page_matches("image_report")) { public function onPageRequest(PageRequestEvent $event) {
global $page, $user;
if($event->page_matches("image_report")) {
if($event->get_arg(0) == "add") { if($event->get_arg(0) == "add") {
if(isset($_POST['image_id']) && isset($_POST['reason'])) { if(isset($_POST['image_id']) && isset($_POST['reason'])) {
$image_id = int_escape($_POST['image_id']); $image_id = int_escape($_POST['image_id']);
@ -70,40 +65,45 @@ class ReportImage implements Extension {
} }
} }
} }
}
if($event instanceof AddReportedImageEvent) { public function onAddReportedImage(AddReportedImageEvent $event) {
$database->Execute( global $database;
"INSERT INTO image_reports(image_id, reporter_id, reason) $database->Execute(
VALUES (?, ?, ?)", "INSERT INTO image_reports(image_id, reporter_id, reason)
array($event->image_id, $event->reporter_id, $event->reason)); VALUES (?, ?, ?)",
} array($event->image_id, $event->reporter_id, $event->reason));
}
if($event instanceof RemoveReportedImageEvent) { public function onRemoveReportedImage(RemoveReportedImageEvent $event) {
$database->Execute("DELETE FROM image_reports WHERE id = ?", array($event->id)); global $database;
} $database->Execute("DELETE FROM image_reports WHERE id = ?", array($event->id));
}
if($event instanceof DisplayingImageEvent) { public function onDisplayingImage(DisplayingImageEvent $event) {
if($config->get_bool('report_image_anon') || !$user->is_anonymous()) { global $config, $user, $page;
$this->theme->display_image_banner($page, $event->image); if($config->get_bool('report_image_anon') || !$user->is_anonymous()) {
} $this->theme->display_image_banner($page, $event->image);
} }
}
if($event instanceof SetupBuildingEvent) { public function onSetupBuilding(SetupBuildingEvent $event) {
$sb = new SetupBlock("Report Image Options"); $sb = new SetupBlock("Report Image Options");
$sb->add_bool_option("report_image_anon", "Allow anonymous image reporting: "); $sb->add_bool_option("report_image_anon", "Allow anonymous image reporting: ");
$sb->add_bool_option("report_image_show_thumbs", "<br>Show thumbnails in admin panel: "); $sb->add_bool_option("report_image_show_thumbs", "<br>Show thumbnails in admin panel: ");
$event->panel->add_block($sb); $event->panel->add_block($sb);
} }
if($event instanceof UserBlockBuildingEvent) { public function onUserBlockBuilding(UserBlockBuildingEvent $event) {
if($user->is_admin()) { global $user;
$event->add_link("Reported Images", make_link("image_report/list")); if($user->is_admin()) {
} $event->add_link("Reported Images", make_link("image_report/list"));
} }
}
if($event instanceof ImageDeletionEvent) { public function onImageDeletion(ImageDeletionEvent $event) {
$database->Execute("DELETE FROM image_reports WHERE image_id = ?", array($event->image->id)); global $database;
} $database->Execute("DELETE FROM image_reports WHERE image_id = ?", array($event->image->id));
} }
protected function install() { protected function install() {

99
contrib/res_limit/main.php
View File

@ -5,69 +5,68 @@
* License: GPLv2 * License: GPLv2
* Description: Allows the admin to set min / max image dimentions * Description: Allows the admin to set min / max image dimentions
*/ */
class ResolutionLimit implements Extension { class ResolutionLimit extends Extension {
public function get_priority() {return 40;} // early, to veto ImageUploadEvent public function get_priority() {return 40;} // early, to veto ImageUploadEvent
public function receive_event(Event $event) { public function onImageAddition(ImageAdditionEvent $event) {
if($event instanceof ImageAdditionEvent) { global $config;
global $config; $min_w = $config->get_int("upload_min_width", -1);
$min_w = $config->get_int("upload_min_width", -1); $min_h = $config->get_int("upload_min_height", -1);
$min_h = $config->get_int("upload_min_height", -1); $max_w = $config->get_int("upload_max_width", -1);
$max_w = $config->get_int("upload_max_width", -1); $max_h = $config->get_int("upload_max_height", -1);
$max_h = $config->get_int("upload_max_height", -1); $ratios = explode(" ", $config->get_string("upload_ratios", ""));
$ratios = explode(" ", $config->get_string("upload_ratios", ""));
$image = $event->image; $image = $event->image;
if($min_w > 0 && $image->width < $min_w) throw new UploadException("Image too small"); if($min_w > 0 && $image->width < $min_w) throw new UploadException("Image too small");
if($min_h > 0 && $image->height < $min_h) throw new UploadException("Image too small"); if($min_h > 0 && $image->height < $min_h) throw new UploadException("Image too small");
if($max_w > 0 && $image->width > $max_w) throw new UploadException("Image too large"); if($max_w > 0 && $image->width > $max_w) throw new UploadException("Image too large");
if($max_h > 0 && $image->height > $max_h) throw new UploadException("Image too large"); if($max_h > 0 && $image->height > $max_h) throw new UploadException("Image too large");
if(count($ratios) > 0) { if(count($ratios) > 0) {
$ok = false; $ok = false;
$valids = 0; $valids = 0;
foreach($ratios as $ratio) { foreach($ratios as $ratio) {
$parts = explode(":", $ratio); $parts = explode(":", $ratio);
if(count($parts) < 2) continue; if(count($parts) < 2) continue;
$valids++; $valids++;
$width = $parts[0]; $width = $parts[0];
$height = $parts[1]; $height = $parts[1];
if($image->width / $width == $image->height / $height) { if($image->width / $width == $image->height / $height) {
$ok = true; $ok = true;
break; break;
}
}
if($valids > 0 && !$ok) {
throw new UploadException(
"Image needs to be in one of these ratios: ".
html_escape($config->get_string("upload_ratios", "")));
} }
} }
if($valids > 0 && !$ok) {
throw new UploadException(
"Image needs to be in one of these ratios: ".
html_escape($config->get_string("upload_ratios", "")));
}
} }
if($event instanceof SetupBuildingEvent) { }
$sb = new SetupBlock("Resolution Limits");
$sb->add_label("Min "); public function onSetupBuilding(SetupBuildingEvent $event) {
$sb->add_int_option("upload_min_width"); $sb = new SetupBlock("Resolution Limits");
$sb->add_label(" x ");
$sb->add_int_option("upload_min_height");
$sb->add_label(" px");
$sb->add_label("<br>Max "); $sb->add_label("Min ");
$sb->add_int_option("upload_max_width"); $sb->add_int_option("upload_min_width");
$sb->add_label(" x "); $sb->add_label(" x ");
$sb->add_int_option("upload_max_height"); $sb->add_int_option("upload_min_height");
$sb->add_label(" px"); $sb->add_label(" px");
$sb->add_label("<br>(-1 for no limit)"); $sb->add_label("<br>Max ");
$sb->add_int_option("upload_max_width");
$sb->add_label(" x ");
$sb->add_int_option("upload_max_height");
$sb->add_label(" px");
$sb->add_label("<br>Ratios "); $sb->add_label("<br>(-1 for no limit)");
$sb->add_text_option("upload_ratios");
$sb->add_label("<br>(eg. '4:3 16:9', blank for no limit)");
$event->panel->add_block($sb); $sb->add_label("<br>Ratios ");
} $sb->add_text_option("upload_ratios");
$sb->add_label("<br>(eg. '4:3 16:9', blank for no limit)");
$event->panel->add_block($sb);
} }
} }
?> ?>

10
contrib/resize/main.php
View File

@ -26,9 +26,9 @@ class ImageResizeException extends SCoreException {
/** /**
* This class handles image resize requests. * This class handles image resize requests.
*/ */
class ResizeImage extends SimpleExtension { class ResizeImage extends Extension {
public function onInitExt($event) { public function onInitExt(InitExtEvent $event) {
global $config; global $config;
$config->set_default_bool('resize_enabled', true); $config->set_default_bool('resize_enabled', true);
$config->set_default_bool('resize_upload', false); $config->set_default_bool('resize_upload', false);
@ -36,7 +36,7 @@ class ResizeImage extends SimpleExtension {
$config->set_default_int('resize_default_height', 0); $config->set_default_int('resize_default_height', 0);
} }
public function onImageAdminBlockBuilding($event) { public function onImageAdminBlockBuilding(ImageAdminBlockBuildingEvent $event) {
global $user, $config; global $user, $config;
if($user->is_admin() && $config->get_bool("resize_enabled")) { if($user->is_admin() && $config->get_bool("resize_enabled")) {
/* Add a link to resize the image */ /* Add a link to resize the image */
@ -44,7 +44,7 @@ class ResizeImage extends SimpleExtension {
} }
} }
public function onSetupBuilding($event) { public function onSetupBuilding(SetupBuildingEvent $event) {
$sb = new SetupBlock("Image Resize"); $sb = new SetupBlock("Image Resize");
$sb->add_bool_option("resize_enabled", "Allow resizing images: "); $sb->add_bool_option("resize_enabled", "Allow resizing images: ");
$sb->add_bool_option("resize_upload", "<br>Resize on upload: "); $sb->add_bool_option("resize_upload", "<br>Resize on upload: ");
@ -89,7 +89,7 @@ class ResizeImage extends SimpleExtension {
} }
} }
public function onPageRequest($event) { public function onPageRequest(PageRequestEvent $event) {
global $page, $user; global $page, $user;
if ( $event->page_matches("resize") && $user->is_admin() ) { if ( $event->page_matches("resize") && $user->is_admin() ) {

6
contrib/rss_comments/main.php
View File

@ -6,8 +6,8 @@
* Description: Self explanatory * Description: Self explanatory
*/ */
class RSS_Comments extends SimpleExtension { class RSS_Comments extends Extension {
public function onPostListBuilding($event) { public function onPostListBuilding(PostListBuildingEvent $event) {
global $config, $page; global $config, $page;
$title = $config->get_string('title'); $title = $config->get_string('title');
@ -15,7 +15,7 @@ class RSS_Comments extends SimpleExtension {
"title=\"$title - Comments\" href=\"".make_link("rss/comments")."\" />"); "title=\"$title - Comments\" href=\"".make_link("rss/comments")."\" />");
} }
public function onPageRequest($event) { public function onPageRequest(PageRequestEvent $event) {
global $config, $database, $page; global $config, $database, $page;
if($event->page_matches("rss/comments")) { if($event->page_matches("rss/comments")) {
$page->set_mode("data"); $page->set_mode("data");

6
contrib/rss_images/main.php
View File

@ -6,8 +6,8 @@
* Description: Self explanatory * Description: Self explanatory
*/ */
class RSS_Images extends SimpleExtension { class RSS_Images extends Extension {
public function onPostListBuilding($event) { public function onPostListBuilding(PostListBuildingEvent $event) {
global $config, $page; global $config, $page;
$title = $config->get_string('title'); $title = $config->get_string('title');
@ -22,7 +22,7 @@ class RSS_Images extends SimpleExtension {
} }
} }
public function onPageRequest($event) { public function onPageRequest(PageRequestEvent $event) {
if($event->page_matches("rss/images")) { if($event->page_matches("rss/images")) {
$search_terms = $event->get_search_terms(); $search_terms = $event->get_search_terms();
$page_number = $event->get_page_number(); $page_number = $event->get_page_number();

2
contrib/shimmie_api/main.php
View File

@ -26,7 +26,7 @@ class _SafeImage {
} }
} }
class ShimmieApi extends SimpleExtension { class ShimmieApi extends Extension {
public function onPageRequest(PageRequestEvent $event) { public function onPageRequest(PageRequestEvent $event) {
global $database, $page; global $database, $page;

6
contrib/simpletest/main.php
View File

@ -205,8 +205,8 @@ class TestFinder extends TestSuite {
} }
} }
class SimpleSCoreTest extends SimpleExtension { class SimpleSCoreTest extends Extension {
public function onPageRequest($event) { public function onPageRequest(PageRequestEvent $event) {
global $page; global $page;
if($event->page_matches("test")) { if($event->page_matches("test")) {
set_time_limit(0); set_time_limit(0);
@ -220,7 +220,7 @@ class SimpleSCoreTest extends SimpleExtension {
} }
} }
public function onUserBlockBuilding($event) { public function onUserBlockBuilding(UserBlockBuildingEvent $event) {
global $user; global $user;
if($user->is_admin()) { if($user->is_admin()) {
$event->add_link("Run Tests", make_link("test/all")); $event->add_link("Run Tests", make_link("test/all"));

2
contrib/site_description/main.php
View File

@ -10,7 +10,7 @@
* This extension sets the "description" meta tag in the header * This extension sets the "description" meta tag in the header
* of pages so that search engines can pick it up * of pages so that search engines can pick it up
*/ */
class SiteDescription extends SimpleExtension { class SiteDescription extends Extension {
public function onPageRequest(PageRequestEvent $event) { public function onPageRequest(PageRequestEvent $event) {
global $config, $page; global $config, $page;
if(strlen($config->get_string("site_description")) > 0) { if(strlen($config->get_string("site_description")) > 0) {

6
contrib/sitemap/main.php
View File

@ -7,15 +7,15 @@
* Documentation: * Documentation:
*/ */
class XMLSitemap extends SimpleExtension { class XMLSitemap extends Extension {
public function onPageRequest($event) { public function onPageRequest(PageRequestEvent $event) {
if($event->page_matches("sitemap.xml")) { if($event->page_matches("sitemap.xml")) {
$images = Image::find_images(0, 50, array()); $images = Image::find_images(0, 50, array());
$this->do_xml($images); $this->do_xml($images);
} }
} }
private function do_xml($images) { private function do_xml(/*array(Image)*/ $images) {
global $page; global $page;
$page->set_mode("data"); $page->set_mode("data");
$page->set_type("application/xml"); $page->set_type("application/xml");

78
contrib/tag_editcloud/main.php
View File

@ -12,56 +12,50 @@
* colorize used tags in cloud || always show used tags in front of cloud * colorize used tags in cloud || always show used tags in front of cloud
* theme junk * theme junk
*/ */
class TagEditCloud implements Extension { class TagEditCloud extends Extension {
var $theme; public function onImageInfoBoxBuilding(ImageInfoBoxBuildingEvent $event) {
global $config;
public function get_priority() {return 50;} if(!$config->get_bool("tageditcloud_disable")) {
if($this->can_tag($event->image)) {
public function receive_event(Event $event) { if(!$cfg_minusage=$config->get_int("tageditcloud_minusage")) $cfg_minusage=2;
global $config, $database, $page, $user; if(!$cfg_defcount=$config->get_int("tageditcloud_defcount")) $cfg_defcount=40;
//if(is_null($this->theme)) $this->theme = get_theme_object($this); if(!$cfg_maxcount=$config->get_int("tageditcloud_maxcount")) $cfg_maxcount=4096;
if($config->get_string("tageditcloud_sort") != "p") {
if($event instanceof ImageInfoBoxBuildingEvent) { $event->add_part($this->build_tag_map($event->image,$cfg_minusage,false),40);
if(!$config->get_bool("tageditcloud_disable")) { } else {
if($this->can_tag($event->image)) { $event->add_part($this->build_tag_map($event->image,$cfg_defcount,$cfg_maxcount),40);
if(!$cfg_minusage=$config->get_int("tageditcloud_minusage")) $cfg_minusage=2;
if(!$cfg_defcount=$config->get_int("tageditcloud_defcount")) $cfg_defcount=40;
if(!$cfg_maxcount=$config->get_int("tageditcloud_maxcount")) $cfg_maxcount=4096;
if($config->get_string("tageditcloud_sort") != "p") {
$event->add_part($this->build_tag_map($event->image,$cfg_minusage,false),40);
} else {
$event->add_part($this->build_tag_map($event->image,$cfg_defcount,$cfg_maxcount),40);
}
} }
} }
} }
}
if($event instanceof InitExtEvent) { public function onInitExt(InitExtEvent $event) {
$config->set_default_bool("tageditcloud_disable",false); global $config;
$config->set_default_bool("tageditcloud_usedfirst",true); $config->set_default_bool("tageditcloud_disable",false);
$config->set_default_string("tageditcloud_sort",'a'); $config->set_default_bool("tageditcloud_usedfirst",true);
$config->set_default_int("tageditcloud_minusage",2); $config->set_default_string("tageditcloud_sort",'a');
$config->set_default_int("tageditcloud_defcount",40); $config->set_default_int("tageditcloud_minusage",2);
$config->set_default_int("tageditcloud_maxcount",4096); $config->set_default_int("tageditcloud_defcount",40);
} $config->set_default_int("tageditcloud_maxcount",4096);
}
if($event instanceof SetupBuildingEvent) { public function onSetupBuilding(SetupBuildingEvent $event) {
$sort_by = array('Alphabetical'=>'a','Popularity'=>'p'); $sort_by = array('Alphabetical'=>'a','Popularity'=>'p');
$sb = new SetupBlock("Tag Edit Cloud"); $sb = new SetupBlock("Tag Edit Cloud");
$sb->add_bool_option("tageditcloud_disable", "Disable Tag Selection Cloud: "); $sb->add_bool_option("tageditcloud_disable", "Disable Tag Selection Cloud: ");
$sb->add_choice_option("tageditcloud_sort", $sort_by, "<br>Sort the tags by:"); $sb->add_choice_option("tageditcloud_sort", $sort_by, "<br>Sort the tags by:");
$sb->add_bool_option("tageditcloud_usedfirst","<br>Always show used tags first: "); $sb->add_bool_option("tageditcloud_usedfirst","<br>Always show used tags first: ");
$sb->add_label("<br><b>Alpha sort</b>:<br>Only show tags used at least "); $sb->add_label("<br><b>Alpha sort</b>:<br>Only show tags used at least ");
$sb->add_int_option("tageditcloud_minusage"); $sb->add_int_option("tageditcloud_minusage");
$sb->add_label(" times.<br><b>Popularity sort</b>:<br>Show "); $sb->add_label(" times.<br><b>Popularity sort</b>:<br>Show ");
$sb->add_int_option("tageditcloud_defcount"); $sb->add_int_option("tageditcloud_defcount");
$sb->add_label(" tags by default.<br>Show a maximum of "); $sb->add_label(" tags by default.<br>Show a maximum of ");
$sb->add_int_option("tageditcloud_maxcount"); $sb->add_int_option("tageditcloud_maxcount");
$sb->add_label(" tags."); $sb->add_label(" tags.");
$event->panel->add_block($sb); $event->panel->add_block($sb);
}
} }
private function tag_link($tag) { private function tag_link($tag) {

21
contrib/tag_history/main.php
View File

@ -5,11 +5,11 @@
* Description: Keep a record of tag changes, and allows you to revert changes. * Description: Keep a record of tag changes, and allows you to revert changes.
*/ */
class Tag_History extends SimpleExtension { class Tag_History extends Extension {
// in before tags are actually set, so that "get current tags" works // in before tags are actually set, so that "get current tags" works
public function get_priority() {return 40;} public function get_priority() {return 40;}
public function onInitExtEvent($event) { public function onInitExtEvent(InitExtEvent $event) {
global $config; global $config;
$config->set_default_int("history_limit", -1); $config->set_default_int("history_limit", -1);
@ -19,7 +19,7 @@ class Tag_History extends SimpleExtension {
} }
} }
public function onAdminBuildingEvent($event) { public function onAdminBuildingEvent(AdminBuildingEvent $event) {
global $user; global $user;
if(isset($_POST['revert_ip']) && $user->is_admin() && $user->check_auth_token()) { if(isset($_POST['revert_ip']) && $user->is_admin() && $user->check_auth_token()) {
@ -55,7 +55,7 @@ class Tag_History extends SimpleExtension {
} }
} }
public function onPageRequest($event) { public function onPageRequest(PageRequestEvent $event) {
global $config, $page, $user; global $config, $page, $user;
if ($event->page_matches("tag_history")) { if ($event->page_matches("tag_history")) {
@ -78,18 +78,18 @@ class Tag_History extends SimpleExtension {
} }
} }
public function onDisplayingImage($event) { public function onDisplayingImage(DisplayingImageEvent $event) {
global $page; global $page;
// handle displaying a link on the view page // handle displaying a link on the view page
$this->theme->display_history_link($page, $event->image->id); $this->theme->display_history_link($page, $event->image->id);
} }
public function onImageDeletion($event) { public function onImageDeletion(ImageDeletionEvent $event) {
// handle removing of history when an image is deleted // handle removing of history when an image is deleted
$this->delete_all_tag_history($event->image->id); $this->delete_all_tag_history($event->image->id);
} }
public function onSetupBuilding($event) { public function onSetupBuilding(SetupBuildingEvent $event) {
$sb = new SetupBlock("Tag History"); $sb = new SetupBlock("Tag History");
$sb->add_label("Limit to "); $sb->add_label("Limit to ");
$sb->add_int_option("history_limit"); $sb->add_int_option("history_limit");
@ -98,19 +98,18 @@ class Tag_History extends SimpleExtension {
$event->panel->add_block($sb); $event->panel->add_block($sb);
} }
public function onTagSetEvent($event) { public function onTagSet(TagSetEvent $event) {
$this->add_tag_history($event->image, $event->tags); $this->add_tag_history($event->image, $event->tags);
} }
public function onUserBlockBuilding($event) { public function onUserBlockBuilding(UserBlockBuilding $event) {
global $user; global $user;
if($user->is_admin()) { if($user->is_admin()) {
$event->add_link("Tag Changes", make_link("tag_history")); $event->add_link("Tag Changes", make_link("tag_history"));
} }
} }
protected function install() protected function install() {
{
global $database; global $database;
global $config; global $config;

53
contrib/tagger/main.php
View File

@ -6,46 +6,37 @@
* Do not remove this notice. * Do not remove this notice.
*/ */
class Tagger implements Extension { class Tagger extends Extension {
var $theme; public function onDisplayingImage(DisplayingImageEvent $event) {
global $page, $config, $user;
public function get_priority() {return 50;} if($config->get_bool("tag_edit_anon")
|| ($user->id != $config->get_int("anon_id"))
public function receive_event(Event $event) { && $config->get_bool("ext_tagger_enabled"))
if(is_null($this->theme)) {
$this->theme = get_theme_object($this); $this->theme->build_tagger($page,$event);
if($event instanceof DisplayingImageEvent) {
global $page, $config, $user;
if($config->get_bool("tag_edit_anon")
|| ($user->id != $config->get_int("anon_id"))
&& $config->get_bool("ext_tagger_enabled"))
{
$this->theme->build_tagger($page,$event);
}
} }
}
if($event instanceof SetupBuildingEvent) { public function onSetupBuilding(SetupBuildingEvent $event) {
$sb = new SetupBlock("Tagger"); $sb = new SetupBlock("Tagger");
$sb->add_bool_option("ext_tagger_enabled","Enable Tagger"); $sb->add_bool_option("ext_tagger_enabled","Enable Tagger");
$sb->add_int_option("ext_tagger_search_delay","<br/>Delay queries by "); $sb->add_int_option("ext_tagger_search_delay","<br/>Delay queries by ");
$sb->add_label(" milliseconds."); $sb->add_label(" milliseconds.");
$sb->add_label("<br/>Limit queries returning more than "); $sb->add_label("<br/>Limit queries returning more than ");
$sb->add_int_option("ext_tagger_tag_max"); $sb->add_int_option("ext_tagger_tag_max");
$sb->add_label(" tags to "); $sb->add_label(" tags to ");
$sb->add_int_option("ext_tagger_limit"); $sb->add_int_option("ext_tagger_limit");
$event->panel->add_block($sb); $event->panel->add_block($sb);
}
} }
} }
// Tagger AJAX back-end // Tagger AJAX back-end
class TaggerXML implements Extension { class TaggerXML extends Extension {
public function get_priority() {return 10;} public function get_priority() {return 10;}
public function receive_event(Event $event) { public function onPageRequest(PageRequestEvent $event) {
if(($event instanceof PageRequestEvent) && $event->page_matches("tagger/tags")) { if($event->page_matches("tagger/tags")) {
global $page; global $page;
//$match_tags = null; //$match_tags = null;

8
contrib/tips/main.php
View File

@ -8,8 +8,8 @@
* Formatting is done with HTML * Formatting is done with HTML
*/ */
class Tips extends SimpleExtension { class Tips extends Extension {
public function onInitExt($event) { public function onInitExt(InitExtEvent $event) {
global $config, $database; global $config, $database;
if ($config->get_int("ext_tips_version") < 1){ if ($config->get_int("ext_tips_version") < 1){
@ -31,7 +31,7 @@ class Tips extends SimpleExtension {
} }
} }
public function onPageRequest($event) { public function onPageRequest(PageRequestEvent $event) {
global $page, $user; global $page, $user;
$this->getTip(); $this->getTip();
@ -67,7 +67,7 @@ class Tips extends SimpleExtension {
} }
} }
public function onUserBlockBuilding($event) { public function onUserBlockBuilding(UserBlockBuildingEvent $event) {
global $user; global $user;
if($user->is_admin()) { if($user->is_admin()) {
$event->add_link("Tips Editor", make_link("tips/list")); $event->add_link("Tips Editor", make_link("tips/list"));

6
contrib/twitter_soc/main.php
View File

@ -6,15 +6,15 @@
* Description: Show a twitter feed with the Sea of Clouds script * Description: Show a twitter feed with the Sea of Clouds script
*/ */
class TwitterSoc extends SimpleExtension { class TwitterSoc extends Extension {
public function onPostListBuilding($event) { public function onPostListBuilding(PostListBuildingEvent $event) {
global $config, $page; global $config, $page;
if(strlen($config->get_string("twitter_soc_username")) > 0) { if(strlen($config->get_string("twitter_soc_username")) > 0) {
$this->theme->display_feed($page, $config->get_string("twitter_soc_username")); $this->theme->display_feed($page, $config->get_string("twitter_soc_username"));
} }
} }
public function onSetupBuilding($event) { public function onSetupBuilding(SetupBuildingEvent $event) {
$sb = new SetupBlock("Tweet!"); $sb = new SetupBlock("Tweet!");
$sb->add_text_option("twitter_soc_username", "Username "); $sb->add_text_option("twitter_soc_username", "Username ");
$event->panel->add_block($sb); $event->panel->add_block($sb);

8
contrib/update/main.php
View File

@ -6,14 +6,14 @@
* License: GPLv2 * License: GPLv2
* Description: Shimmie updater! * Description: Shimmie updater!
*/ */
class Update extends SimpleExtension { class Update extends Extension {
public function onInitExt(Event $event) { public function onInitExt(InitExtEvent $event) {
global $config; global $config;
$config->set_default_string("update_url", "http://nodeload.github.com/shish/shimmie2/zipball/master"); //best to avoid using https $config->set_default_string("update_url", "http://nodeload.github.com/shish/shimmie2/zipball/master"); //best to avoid using https
$config->set_default_string("commit_hash", ""); $config->set_default_string("commit_hash", "");
} }
public function onSetupBuilding($event) { public function onSetupBuilding(SetupBuildingEvent $event) {
global $config; global $config;
//Would prefer to use the admin panel for this. //Would prefer to use the admin panel for this.
//But since the admin panel is optional...kind of stuck to using this. //But since the admin panel is optional...kind of stuck to using this.
@ -25,7 +25,7 @@ class Update extends SimpleExtension {
$event->panel->add_block($sb); $event->panel->add_block($sb);
} }
public function onPageRequest(Event $event) { public function onPageRequest(PageRequestEvent $event) {
global $config, $user; global $config, $user;
if($event->page_matches("update") && $user->is_admin()) { if($event->page_matches("update") && $user->is_admin()) {
$ok = $this->update_shimmie(); $ok = $this->update_shimmie();

10
contrib/wiki/main.php
View File

@ -53,8 +53,8 @@ class WikiPage {
} }
} }
class Wiki extends SimpleExtension { class Wiki extends Extension {
public function onInitExt($event) { public function onInitExt(InitExtEvent $event) {
global $database; global $database;
global $config; global $config;
@ -80,7 +80,7 @@ class Wiki extends SimpleExtension {
} }
} }
public function onPageRequest($event) { public function onPageRequest(PageRequestEvent $event) {
global $config, $page, $user; global $config, $page, $user;
if($event->page_matches("wiki")) { if($event->page_matches("wiki")) {
if(is_null($event->get_arg(0)) || strlen(trim($event->get_arg(0))) == 0) { if(is_null($event->get_arg(0)) || strlen(trim($event->get_arg(0))) == 0) {
@ -153,7 +153,7 @@ class Wiki extends SimpleExtension {
} }
} }
public function onWikiUpdate($event) { public function onWikiUpdate(WikiUpdateEvent $event) {
global $database; global $database;
$wpage = $event->wikipage; $wpage = $event->wikipage;
try { try {
@ -167,7 +167,7 @@ class Wiki extends SimpleExtension {
} }
} }
public function onSetupBuilding($event) { public function onSetupBuilding(SetupBuildingEvent $event) {
$sb = new SetupBlock("Wiki"); $sb = new SetupBlock("Wiki");
$sb->add_bool_option("wiki_edit_anon", "Allow anonymous edits: "); $sb->add_bool_option("wiki_edit_anon", "Allow anonymous edits: ");
$sb->add_bool_option("wiki_edit_user", "<br>Allow user edits: "); $sb->add_bool_option("wiki_edit_user", "<br>Allow user edits: ");

6
contrib/word_filter/main.php
View File

@ -6,16 +6,16 @@
* Description: Simple search and replace * Description: Simple search and replace
*/ */
class WordFilter extends SimpleExtension { class WordFilter extends Extension {
// before emoticon filter // before emoticon filter
public function get_priority() {return 40;} public function get_priority() {return 40;}
public function onTextFormatting($event) { public function onTextFormatting(TextFormattingEvent $event) {
$event->formatted = $this->filter($event->formatted); $event->formatted = $this->filter($event->formatted);
$event->stripped = $this->filter($event->stripped); $event->stripped = $this->filter($event->stripped);
} }
public function onSetupBuilding($event) { public function onSetupBuilding(SetupBuildingEvent $event) {
$sb = new SetupBlock("Word Filter"); $sb = new SetupBlock("Word Filter");
$sb->add_longtext_option("word_filter"); $sb->add_longtext_option("word_filter");
$sb->add_label("<br>(each line should be search term and replace term, separated by a comma)"); $sb->add_label("<br>(each line should be search term and replace term, separated by a comma)");

1
core/config.class.php
View File

@ -188,6 +188,7 @@ class DatabaseConfig extends BaseConfig {
*/ */
public function save(/*string*/ $name=null) { public function save(/*string*/ $name=null) {
if(is_null($name)) { if(is_null($name)) {
reset($this->values); // rewind the array to the first element
foreach($this->values as $name => $value) { foreach($this->values as $name => $value) {
$this->save(/*string*/ $name); $this->save(/*string*/ $name);
} }

43
core/extension.class.php
View File

@ -13,20 +13,14 @@
* $formatted_text = $tfe->formatted; * $formatted_text = $tfe->formatted;
* \endcode * \endcode
* *
* An extension is something which is capable of reacting to events. They * An extension is something which is capable of reacting to events.
* register themselves using the add_event_listener() function, after which
* events will be sent to the object's recieve_event() function.
*
* SimpleExtension subclasses are slightly different -- they are registered
* automatically, and events are sent to a named method, eg PageRequestEvent
* will be sent to onPageRequest()
* *
* *
* \page hello The Hello World Extension * \page hello The Hello World Extension
* *
* \code * \code
* // ext/hello/main.php * // ext/hello/main.php
* public class Hello extends SimpleExtension { * public class Hello extends Extension {
* public void onPageRequest(PageRequestEvent $event) { * public void onPageRequest(PageRequestEvent $event) {
* global $page, $user; * global $page, $user;
* $this->theme->display_hello($page, $user); * $this->theme->display_hello($page, $user);
@ -62,33 +56,17 @@
* *
*/ */
/**
* A generic extension class, for subclassing
*/
interface Extension {
public function receive_event(Event $event);
public function get_priority();
}
/** /**
* send_event(BlahEvent()) -> onBlah($event) * send_event(BlahEvent()) -> onBlah($event)
* *
* Also loads the theme object into $this->theme if available * Also loads the theme object into $this->theme if available
* *
* index.php will load all SimpleExtension subclasses, * The original concept came from Artanis's Extension extension
* so no need for register_extension(new Foo())
*
* Automatic registration is done with priority returned by get_priority()
*
* Hopefully this removes as much copy & paste code from the extension
* files as possible~
*
* The original concept came from Artanis's SimpleExtension extension
* --> http://github.com/Artanis/simple-extension/tree/master * --> http://github.com/Artanis/simple-extension/tree/master
* Then re-implemented by Shish after he broke the forum and couldn't * Then re-implemented by Shish after he broke the forum and couldn't
* find the thread where the original was posted >_< * find the thread where the original was posted >_<
*/ */
abstract class SimpleExtension implements Extension { abstract class Extension {
var $theme; var $theme;
var $_child; var $_child;
@ -100,15 +78,6 @@ abstract class SimpleExtension implements Extension {
if(is_null($this->theme)) $this->theme = get_theme_object($child, false); if(is_null($this->theme)) $this->theme = get_theme_object($child, false);
} }
public function receive_event(Event $event) {
$name = get_class($event);
// this is rather clever..
$name = "on".str_replace("Event", "", $name);
if(method_exists($this->_child, $name)) {
$this->_child->$name($event);
}
}
public function get_priority() { public function get_priority() {
return 50; return 50;
} }
@ -117,7 +86,7 @@ abstract class SimpleExtension implements Extension {
/** /**
* Several extensions have this in common, make a common API * Several extensions have this in common, make a common API
*/ */
abstract class FormatterExtension extends SimpleExtension { abstract class FormatterExtension extends Extension {
public function onTextFormatting(TextFormattingEvent $event) { public function onTextFormatting(TextFormattingEvent $event) {
$event->formatted = $this->format($event->formatted); $event->formatted = $this->format($event->formatted);
$event->stripped = $this->strip($event->stripped); $event->stripped = $this->strip($event->stripped);
@ -131,7 +100,7 @@ abstract class FormatterExtension extends SimpleExtension {
* This too is a common class of extension with many methods in common, * This too is a common class of extension with many methods in common,
* so we have a base class to extend from * so we have a base class to extend from
*/ */
abstract class DataHandlerExtension extends SimpleExtension { abstract class DataHandlerExtension extends Extension {
public function onDataUpload(DataUploadEvent $event) { public function onDataUpload(DataUploadEvent $event) {
if($this->supported_ext($event->type) && $this->check_contents($event->tmpname)) { if($this->supported_ext($event->type) && $this->check_contents($event->tmpname)) {
if(!move_upload_to_archive($event)) return; if(!move_upload_to_archive($event)) return;

9
core/imageboard.pack.php
View File

@ -781,6 +781,8 @@ class Image {
} }
} }
reset($terms); // rewind to first element in array.
// turn each term into a specific type of querylet // turn each term into a specific type of querylet
foreach($terms as $term) { foreach($terms as $term) {
$negative = false; $negative = false;
@ -1013,8 +1015,15 @@ class Tag {
} }
} }
/**
* This function takes a list (array) of tags and changes any tags that have aliases
*
* @param $tags Array of tags
* @return Array of tags
*/
public static function resolve_list($tags) { public static function resolve_list($tags) {
$tags = Tag::explode($tags); $tags = Tag::explode($tags);
reset($tags); // rewind array to the first element.
$new = array(); $new = array();
foreach($tags as $tag) { foreach($tags as $tag) {
$new_set = explode(' ', Tag::resolve_alias($tag)); $new_set = explode(' ', Tag::resolve_alias($tag));

12
core/page.class.php
View File

@ -291,7 +291,11 @@ class Page {
{ {
global $config; global $config;
if (!$config->get_bool("autocache_css") && !$config->get_bool("autocache_js")) { // store local copy for speed.
$autocache_css = $config->get_bool("autocache_css");
$autocache_js = $config->get_bool("autocache_js");
if (!$autocache_css && !$autocache_js) {
return false; // caching disabled return false; // caching disabled
} }
@ -309,7 +313,7 @@ class Page {
$data_href = get_base_href(); $data_href = get_base_href();
/* ----- CSS Files ----- */ /* ----- CSS Files ----- */
if ($config->get_bool("autocache_css")) if ($autocache_css)
{ {
// First get all the CSS from the lib directory // First get all the CSS from the lib directory
$contents_from_lib = ''; $contents_from_lib = '';
@ -376,7 +380,7 @@ class Page {
/* ----- JavaScript Files ----- */ /* ----- JavaScript Files ----- */
if ($config->get_bool("autocache_js")) if ($autocache_js)
{ {
$data = ''; $data = '';
$js_files = glob("lib/*.js"); $js_files = glob("lib/*.js");
@ -394,7 +398,7 @@ class Page {
// Minify the JS if enabled. // Minify the JS if enabled.
if ($config->get_bool("autocache_min_js")){ if ($config->get_bool("autocache_min_js")){
// not supported yet. // not supported yet.
// TODO: add support for Minifying CSS files. // TODO: add support for Minifying JS files.
} }
// compute the MD5 sum of the concatenated JavaScript files // compute the MD5 sum of the concatenated JavaScript files

14
core/util.inc.php
View File

@ -839,6 +839,7 @@ $_event_count = 0;
function send_event(Event $event) { function send_event(Event $event) {
global $_event_listeners, $_event_count; global $_event_listeners, $_event_count;
if(!isset($_event_listeners[get_class($event)])) return; if(!isset($_event_listeners[get_class($event)])) return;
$method_name = "on".str_replace("Event", "", get_class($event));
ctx_log_start(get_class($event)); ctx_log_start(get_class($event));
// SHIT: http://bugs.php.net/bug.php?id=35106 // SHIT: http://bugs.php.net/bug.php?id=35106
@ -846,7 +847,7 @@ function send_event(Event $event) {
ksort($my_event_listeners); ksort($my_event_listeners);
foreach($my_event_listeners as $listener) { foreach($my_event_listeners as $listener) {
ctx_log_start(get_class($listener)); ctx_log_start(get_class($listener));
$listener->receive_event($event); $listener->$method_name($event);
ctx_log_endok(); ctx_log_endok();
} }
$_event_count++; $_event_count++;
@ -1023,7 +1024,7 @@ function _load_extensions() {
if($rclass->isAbstract()) { if($rclass->isAbstract()) {
// don't do anything // don't do anything
} }
elseif(is_subclass_of($class, "SimpleExtension")) { elseif(is_subclass_of($class, "Extension")) {
$c = new $class(); $c = new $class();
$c->i_am($c); $c->i_am($c);
$my_events = array(); $my_events = array();
@ -1034,10 +1035,6 @@ function _load_extensions() {
} }
add_event_listener($c, $c->get_priority(), $my_events); add_event_listener($c, $c->get_priority(), $my_events);
} }
elseif(is_subclass_of($class, "Extension")) {
$c = new $class();
add_event_listener($c, $c->get_priority(), $all_events);
}
} }
if(COMPILE_ELS) { if(COMPILE_ELS) {
@ -1046,13 +1043,10 @@ function _load_extensions() {
foreach(get_declared_classes() as $class) { foreach(get_declared_classes() as $class) {
$rclass = new ReflectionClass($class); $rclass = new ReflectionClass($class);
if($rclass->isAbstract()) {} if($rclass->isAbstract()) {}
elseif(is_subclass_of($class, "SimpleExtension")) { elseif(is_subclass_of($class, "Extension")) {
$p .= "\$$class = new $class(); "; $p .= "\$$class = new $class(); ";
$p .= "\${$class}->i_am(\$$class);\n"; $p .= "\${$class}->i_am(\$$class);\n";
} }
elseif(is_subclass_of($class, "Extension")) {
$p .= "\$$class = new $class();\n";
}
} }
$p .= "\$_event_listeners = array(\n"; $p .= "\$_event_listeners = array(\n";

2
ext/alias_editor/main.php
View File

@ -22,7 +22,7 @@ class AddAliasEvent extends Event {
class AddAliasException extends SCoreException {} class AddAliasException extends SCoreException {}
class AliasEditor extends SimpleExtension { class AliasEditor extends Extension {
public function onPageRequest(PageRequestEvent $event) { public function onPageRequest(PageRequestEvent $event) {
global $config, $database, $page, $user; global $config, $database, $page, $user;

2
ext/comment/main.php
View File

@ -60,7 +60,7 @@ class Comment {
} }
} }
class CommentList extends SimpleExtension { class CommentList extends Extension {
public function onInitExt(InitExtEvent $event) { public function onInitExt(InitExtEvent $event) {
global $config, $database; global $config, $database;
$config->set_default_bool('comment_anon', true); $config->set_default_bool('comment_anon', true);

9
ext/comment/theme.php
View File

@ -35,14 +35,17 @@ class CommentListTheme extends Themelet {
// parts for each image // parts for each image
$position = 10; $position = 10;
$comment_limit = $config->get_int("comment_list_count", 10);
$comment_captcha = $config->get_bool('comment_captcha');
foreach($images as $pair) { foreach($images as $pair) {
$image = $pair[0]; $image = $pair[0];
$comments = $pair[1]; $comments = $pair[1];
$thumb_html = $this->build_thumb_html($image); $thumb_html = $this->build_thumb_html($image);
$comment_html = ""; $comment_html = "";
$comment_limit = $config->get_int("comment_list_count", 10);
$comment_count = count($comments); $comment_count = count($comments);
if($comment_limit > 0 && $comment_count > $comment_limit) { if($comment_limit > 0 && $comment_count > $comment_limit) {
$hidden = $comment_count - $comment_limit; $hidden = $comment_count - $comment_limit;
@ -59,7 +62,7 @@ class CommentListTheme extends Themelet {
} }
} else { } else {
if ($can_post) { if ($can_post) {
if(!$config->get_bool('comment_captcha')) { if(!$comment_captcha) {
$comment_html .= $this->build_postbox($image->id); $comment_html .= $this->build_postbox($image->id);
} }
else { else {

2
ext/ext_manager/main.php
View File

@ -87,7 +87,7 @@ class ExtensionInfo {
} }
} }
class ExtManager extends SimpleExtension { class ExtManager extends Extension {
public function onPageRequest(PageRequestEvent $event) { public function onPageRequest(PageRequestEvent $event) {
global $page, $user; global $page, $user;
if($event->page_matches("ext_manager")) { if($event->page_matches("ext_manager")) {

2
ext/handle_404/main.php
View File

@ -8,7 +8,7 @@
* Description: Shows an error message when the user views a page with no content * Description: Shows an error message when the user views a page with no content
*/ */
class Handle404 extends SimpleExtension { class Handle404 extends Extension {
public function onPageRequest(PageRequestEvent $event) { public function onPageRequest(PageRequestEvent $event) {
global $page; global $page;
// hax. // hax.

2
ext/image/main.php
View File

@ -129,7 +129,7 @@ class ParseLinkTemplateEvent extends Event {
/** /**
* A class to handle adding / getting / removing image files from the disk. * A class to handle adding / getting / removing image files from the disk.
*/ */
class ImageIO extends SimpleExtension { class ImageIO extends Extension {
public function onInitExt(InitExtEvent $event) { public function onInitExt(InitExtEvent $event) {
global $config; global $config;
$config->set_default_int('thumb_width', 192); $config->set_default_int('thumb_width', 192);

2
ext/index/main.php
View File

@ -128,7 +128,7 @@ class PostListBuildingEvent extends Event {
} }
} }
class Index extends SimpleExtension { class Index extends Extension {
public function onInitExt(InitExtEvent $event) { public function onInitExt(InitExtEvent $event) {
global $config; global $config;
$config->set_default_int("index_width", 3); $config->set_default_int("index_width", 3);

4
ext/mail/main.php
View File

@ -7,7 +7,7 @@
* Description: Provides an interface for sending and receiving mail. * Description: Provides an interface for sending and receiving mail.
*/ */
class Mail extends SimpleExtension { class Mail extends Extension {
public function onSetupBuilding(SetupBuildingEvent $event) { public function onSetupBuilding(SetupBuildingEvent $event) {
$sb = new SetupBlock("Mailing Options"); $sb = new SetupBlock("Mailing Options");
$sb->add_text_option("mail_sub", "<br>Subject prefix: "); $sb->add_text_option("mail_sub", "<br>Subject prefix: ");
@ -26,7 +26,7 @@ class Mail extends SimpleExtension {
$config->set_default_string("mail_fot", "<a href='".make_http(make_link())."'>".$config->get_string("site_title")."</a>"); $config->set_default_string("mail_fot", "<a href='".make_http(make_link())."'>".$config->get_string("site_title")."</a>");
} }
} }
class MailTest extends SimpleExtension { class MailTest extends Extension {
public function onPageRequest(PageRequestEvent $event) { public function onPageRequest(PageRequestEvent $event) {
if($event->page_matches("mail/test")) { if($event->page_matches("mail/test")) {
global $page; global $page;

2
ext/setup/main.php
View File

@ -161,7 +161,7 @@ class SetupBlock extends Block {
} }
// }}} // }}}
class Setup extends SimpleExtension { class Setup extends Extension {
public function onInitExt(InitExtEvent $event) { public function onInitExt(InitExtEvent $event) {
global $config; global $config;
$config->set_default_string("title", "Shimmie"); $config->set_default_string("title", "Shimmie");

2
ext/tag_edit/main.php
View File

@ -55,7 +55,7 @@ class LockSetEvent extends Event {
} }
} }
class TagEdit extends SimpleExtension { class TagEdit extends Extension {
public function onPageRequest(PageRequestEvent $event) { public function onPageRequest(PageRequestEvent $event) {
global $user, $page; global $user, $page;
if($event->page_matches("tag_edit")) { if($event->page_matches("tag_edit")) {

2
ext/tag_list/main.php
View File

@ -6,7 +6,7 @@
* Description: Show the tags in various ways * Description: Show the tags in various ways
*/ */
class TagList extends SimpleExtension { class TagList extends Extension {
public function onInitExt(InitExtEvent $event) { public function onInitExt(InitExtEvent $event) {
global $config; global $config;
$config->set_default_int("tag_list_length", 15); $config->set_default_int("tag_list_length", 15);

29
ext/tag_list/theme.php
View File

@ -69,23 +69,28 @@ class TagListTheme extends Themelet {
*/ */
public function display_popular_block(Page $page, $tag_infos) { public function display_popular_block(Page $page, $tag_infos) {
global $config; global $config;
// store local copies for speed.
$info_link = $config->get_string('info_link');
$tag_list_num = $config->get_bool("tag_list_numbers");
$html = ""; $html = "";
$n = 0; $n = 0;
foreach($tag_infos as $row) { foreach($tag_infos as $row) {
$tag = $row['tag']; $tag = $row['tag'];
$h_tag = html_escape($tag); $h_tag = html_escape($tag);
$h_tag_no_underscores = str_replace("_", " ", $h_tag); $h_tag_no_underscores = str_replace("_", " ", $h_tag);
$count = $row['count']; $count = $row['count'];
if($n++) $html .= "\n<br/>"; if($n++) $html .= "\n<br/>";
if(!is_null($config->get_string('info_link'))) { if(!is_null($info_link)) {
$link = str_replace('$tag', $tag, $config->get_string('info_link')); $link = str_replace('$tag', $tag, $info_link);
$html .= " <a class='tag_info_link' href='$link'>?</a>"; $html .= ' <a class="tag_info_link" href="'.$link.'">?</a>';
} }
$link = $this->tag_link($row['tag']); $link = $this->tag_link($row['tag']);
$html .= " <a class='tag_name' href='$link'>$h_tag_no_underscores</a>"; $html .= ' <a class="tag_name" href="$link">'.$h_tag_no_underscores.'</a>';
if($config->get_bool("tag_list_numbers")) { if($tag_list_num) {
$html .= " <span class='tag_count'>$count</span>"; $html .= ' <span class="tag_count">'.$count.'</span>';
} }
} }
@ -103,19 +108,23 @@ class TagListTheme extends Themelet {
public function display_refine_block(Page $page, $tag_infos, $search) { public function display_refine_block(Page $page, $tag_infos, $search) {
global $config; global $config;
// store local copy for speed.
$info_link = $config->get_string('info_link');
$html = ""; $html = "";
$n = 0; $n = 0;
foreach($tag_infos as $row) { foreach($tag_infos as $row) {
$tag = $row['tag']; $tag = $row['tag'];
$h_tag = html_escape($tag); $h_tag = html_escape($tag);
$h_tag_no_underscores = str_replace("_", " ", $h_tag); $h_tag_no_underscores = str_replace("_", " ", $h_tag);
if($n++) $html .= "\n<br/>"; if($n++) $html .= "\n<br/>";
if(!is_null($config->get_string('info_link'))) { if(!is_null($info_link)) {
$link = str_replace('$tag', $tag, $config->get_string('info_link')); $link = str_replace('$tag', $tag, $info_link);
$html .= " <a class='tag_info_link' href='$link'>?</a>"; $html .= ' <a class="tag_info_link" href="'.$link.'">?</a>';
} }
$link = $this->tag_link($row['tag']); $link = $this->tag_link($row['tag']);
$html .= " <a class='tag_name' href='$link'>$h_tag_no_underscores</a>"; $html .= ' <a class="tag_name" href="'.$link.'">'.$h_tag_no_underscores.'</a>';
$html .= $this->ars($tag, $search); $html .= $this->ars($tag, $search);
} }

2
ext/upgrade/main.php
View File

@ -7,7 +7,7 @@
* Visibility: admin * Visibility: admin
*/ */
class Upgrade extends SimpleExtension { class Upgrade extends Extension {
public function onInitExt(InitExtEvent $event) { public function onInitExt(InitExtEvent $event) {
global $config, $database; global $config, $database;

48
ext/upload/bookmarklet.js
View File

@ -4,22 +4,49 @@
var maxsze = (maxsze.match("(?:\.*[0-9])")) * 1024; //This assumes we are only working with MB. var maxsze = (maxsze.match("(?:\.*[0-9])")) * 1024; //This assumes we are only working with MB.
var toobig = "The file you are trying to upload is too big to upload!"; var toobig = "The file you are trying to upload is too big to upload!";
var notsup = "The file you are trying to upload is not supported!"; var notsup = "The file you are trying to upload is not supported!";
if (CA === 0 || CA > 2){ //Default
if (confirm("OK = Use Current tags.\nCancel = Use new tags.")==true){
}else{
var tag=prompt("Enter Tags","");
var chk=1; //This makes sure it doesn't use current tags.
}
}else if (CA === 1){ //Current Tags
}else if (CA === 2){ //New Tags
var tag=prompt("Enter Tags","");
var chk=1;
}
if (confirm("OK = Use Current tags.\nCancel = Use new tags.")==true){}else{var tag=prompt("Enter Tags","");var chk=1;}; // Danbooru | oreno.imouto | konachan | sankakucomplex
// Danbooru
if(document.getElementById("post_tags") !== null){ if(document.getElementById("post_tags") !== null){
if (typeof tag !=="ftp://ftp." && chk !==1){var tag=document.getElementById("post_tags").value;} if (typeof tag !=="ftp://ftp." && chk !==1){var tag=document.getElementById("post_tags").value;}
var rtg=document.getElementById("stats").innerHTML.match("<li>Rating: (.*)<\/li>")[1]; var srx="http://" + document.location.hostname + document.location.href.match("\/post\/show\/[0-9]+");
var srx="http://" + document.location.hostname + document.location.href.match("\/post\/show\/[0-9]+\/"); if(srx.search("oreno\\.imouto") >= 0 || srx.search("konachan\\.com") >= 0){
var rtg=document.getElementById("stats").innerHTML.match("<li>Rating: (.*) <span")[1];
}else{
var rtg=document.getElementById("stats").innerHTML.match("<li>Rating: (.*)<\/li>")[1];
}
if(tag.search(/\bflash\b/)===-1){ if(tag.search(/\bflash\b/)===-1){
var filesze=document.getElementById("stats").innerHTML.match("[0-9] \\(((?:\.*[0-9])) ([a-zA-Z]+)"); var hrs=document.getElementById("highres").href;
if(srx.search("oreno\\.imouto") >= 0 || srx.search("konachan\\.com") >= 0){ //oreno's theme seems to have moved the filesize
var filesze = document.getElementById("highres").innerHTML.match("[a-zA-Z0-9]+ \\(+([0-9]+\\.[0-9]+) ([a-zA-Z]+)");
}else{
var filesze=document.getElementById("stats").innerHTML.match("[0-9] \\(((?:\.*[0-9])) ([a-zA-Z]+)");
}
if(filesze[2] == "MB"){var filesze = filesze[1] * 1024;}else{var filesze = filesze[2].match("[0-9]+");} if(filesze[2] == "MB"){var filesze = filesze[1] * 1024;}else{var filesze = filesze[2].match("[0-9]+");}
if(supext.search(document.getElementById("highres").href.match("http\:\/\/.*\\.([a-z0-9]+)")[1]) !== -1){ if(supext.search(hrs.match("http\:\/\/.*\\.([a-z0-9]+)")[1]) !== -1){
if(filesze <= maxsze){ if(filesze <= maxsze){
location.href=ste+document.getElementById("highres").href+"&tags="+tag+"&rating="+rtg+"&source="+srx; if(srx.search("oreno\\.imouto") >= 0){
//this regex tends to be a bit picky with tags -_-;;
var hrs=hrs.match("(http\:\/\/[a-z0-9]+\.[a-z]+\.[a-z]\/[a-z0-9]+\/[a-z0-9]+)\/[a-z0-9A-Z%_-]+(\.[a-zA-Z0-9]+)");
var hrs=hrs[1]+hrs[2]; //this should bypass hotlink protection
}else if(srx.search("konachan\\.com") >= 0){
//konachan affixs konachan.com to the start of the tags, this requires different regex
var hrs=hrs.match("(http\:\/\/[a-z0-9]+\.[a-z]+\.[a-z]\/[a-z0-9]+\/[a-z0-9]+)\/[a-z0-9A-Z%_]+\.[a-zA-Z0-9%_-]+(\.[a-z0-9A-Z]+)")
var hrs=hrs[1]+hrs[2];
}
location.href=ste+hrs+"&tags="+tag+"&rating="+rtg+"&source="+srx;
}else{alert(toobig);} }else{alert(toobig);}
}else{alert(notsup);} }else{alert(notsup);}
}else{ }else{
@ -29,6 +56,7 @@ if(document.getElementById("post_tags") !== null){
} }
} }
/* Shimmie /* Shimmie
One problem with shimmie is each theme does not show the same info as other themes (I.E only the danbooru & lite themes show statistics)
Shimmie doesn't seem to have any way to grab tags via id unless you have the ability to edit tags. Shimmie doesn't seem to have any way to grab tags via id unless you have the ability to edit tags.
Have to go the round about way of checking the title for tags. Have to go the round about way of checking the title for tags.
This crazy way of checking "should" work with older releases though (Seems to work with 2009~ ver) */ This crazy way of checking "should" work with older releases though (Seems to work with 2009~ ver) */
@ -36,7 +64,6 @@ else if(document.getElementsByTagName("title")[0].innerHTML.search("Image [0-9.-
if (typeof tag !=="ftp://ftp." && chk !==1){var tag=document.getElementsByTagName("title")[0].innerHTML.match("Image [0-9.-]+\: (.*)")[1];} if (typeof tag !=="ftp://ftp." && chk !==1){var tag=document.getElementsByTagName("title")[0].innerHTML.match("Image [0-9.-]+\: (.*)")[1];}
//TODO: Make rating show in statistics. //TODO: Make rating show in statistics.
var srx="http://" + document.location.hostname + document.location.href.match("\/post\/view\/[0-9]+"); var srx="http://" + document.location.hostname + document.location.href.match("\/post\/view\/[0-9]+");
/*TODO: Figure out regex for shortening file link. I.E http://blah.net/_images/1234abcd/everysingletag.png > http://blah.net/_images/1234abcd.png*/
/*TODO: Make file size show on all themes (Only seems to show in lite/Danbooru themes.)*/ /*TODO: Make file size show on all themes (Only seems to show in lite/Danbooru themes.)*/
if(tag.search(/\bflash\b/)==-1){ if(tag.search(/\bflash\b/)==-1){
var img = document.getElementById("main_image").src; var img = document.getElementById("main_image").src;
@ -52,7 +79,6 @@ else if(document.getElementsByTagName("title")[0].innerHTML.search("Image [0-9.-
} }
// Gelbooru // Gelbooru
else if(document.getElementById("tags") !== null){ else if(document.getElementById("tags") !== null){
//Gelbooru has an annoying anti-hotlinking thing which doesn't seem to like the bookmarklet.
if (typeof tag !=="ftp://ftp." && chk !==1){var tag=document.getElementById("tags").value;} if (typeof tag !=="ftp://ftp." && chk !==1){var tag=document.getElementById("tags").value;}
var rtg=document.getElementById("stats").innerHTML.match("<li>Rating: (.*)<\/li>")[1]; var rtg=document.getElementById("stats").innerHTML.match("<li>Rating: (.*)<\/li>")[1];
//Can't seem to grab source due to url containing a & //Can't seem to grab source due to url containing a &
@ -61,6 +87,6 @@ else if(document.getElementById("tags") !== null){
//Since Gelbooru does not allow flash, no need to search for flash tag. //Since Gelbooru does not allow flash, no need to search for flash tag.
//Gelbooru doesn't show file size in statistics either... //Gelbooru doesn't show file size in statistics either...
if(supext.search(gmi.match("http\:\/\/.*\\.([a-z0-9]+)")[1]) !== -1){ if(supext.search(gmi.match("http\:\/\/.*\\.([a-z0-9]+)")[1]) !== -1){
location.href=ste+gmi+"&tags="+tag+"&rating="+rtg[1];//+"&source="+srx; location.href=ste+gmi+"&tags="+tag+"&rating="+rtg;//+"&source="+srx;
}else{alert(notsup);} }else{alert(notsup);}
} }

8
ext/upload/main.php
View File

@ -41,7 +41,7 @@ class UploadException extends SCoreException {}
* All files that are uploaded to the site are handled through this class. * All files that are uploaded to the site are handled through this class.
* This also includes transloaded files as well. * This also includes transloaded files as well.
*/ */
class Upload extends SimpleExtension { class Upload extends Extension {
// early, so it can stop the DataUploadEvent before any data handlers see it // early, so it can stop the DataUploadEvent before any data handlers see it
public function get_priority() {return 40;} public function get_priority() {return 40;}
@ -58,6 +58,8 @@ class Upload extends SimpleExtension {
$this->is_full = false; $this->is_full = false;
} }
else { else {
// TODO: This size limit should be configureable by the admin...
// currently set to 100 MB
$this->is_full = $free_num < 100*1024*1024; $this->is_full = $free_num < 100*1024*1024;
} }
@ -150,12 +152,14 @@ class Upload extends SimpleExtension {
$tags = ''; // Tags aren't changed when uploading. Set to null to stop PHP warnings. $tags = ''; // Tags aren't changed when uploading. Set to null to stop PHP warnings.
if(count($_FILES)) { if(count($_FILES)) {
reset($_FILES); // rewind to first element in array.
foreach($_FILES as $file) { foreach($_FILES as $file) {
$ok = $this->try_upload($file, $tags, $source, $image_id); $ok = $this->try_upload($file, $tags, $source, $image_id);
break; // leave the foreach loop. break; // leave the foreach loop.
} }
} }
else { else {
reset($_POST); // rewind to first element in array.
foreach($_POST as $name => $value) { foreach($_POST as $name => $value) {
if(substr($name, 0, 3) == "url" && strlen($value) > 0) { if(substr($name, 0, 3) == "url" && strlen($value) > 0) {
$ok = $this->try_transload($value, $tags, $source, $image_id); $ok = $this->try_transload($value, $tags, $source, $image_id);
@ -186,9 +190,11 @@ class Upload extends SimpleExtension {
$source = isset($_POST['source']) ? $_POST['source'] : null; $source = isset($_POST['source']) ? $_POST['source'] : null;
$ok = true; $ok = true;
foreach($_FILES as $file) { foreach($_FILES as $file) {
reset($_FILES); // rewind to first element in array.
$ok = $ok & $this->try_upload($file, $tags, $source); $ok = $ok & $this->try_upload($file, $tags, $source);
} }
foreach($_POST as $name => $value) { foreach($_POST as $name => $value) {
reset($_POST); // rewind to first element in array.
if(substr($name, 0, 3) == "url" && strlen($value) > 0) { if(substr($name, 0, 3) == "url" && strlen($value) > 0) {
$ok = $ok & $this->try_transload($value, $tags, $source); $ok = $ok & $this->try_transload($value, $tags, $source);
} }

9
ext/upload/theme.php
View File

@ -18,6 +18,7 @@ class UploadTheme extends Themelet {
$upload_list = ""; $upload_list = "";
$upload_count = $config->get_int('upload_count'); $upload_count = $config->get_int('upload_count');
for($i=0; $i<$upload_count; $i++) for($i=0; $i<$upload_count; $i++)
{ {
$a=$i+1; $a=$i+1;
@ -53,7 +54,7 @@ class UploadTheme extends Themelet {
<a href='#' onclick='$js'>". <a href='#' onclick='$js'>".
"<img src='ext/upload/minus.png' /></a>"; "<img src='ext/upload/minus.png' /></a>";
if($a==$config->get_int('upload_count')){ if($a == $upload_count){
$upload_list .="<img id='wrapper' src='ext/upload/plus.png' />"; $upload_list .="<img id='wrapper' src='ext/upload/plus.png' />";
}else{ }else{
$js1 = 'javascript:$(function() { $js1 = 'javascript:$(function() {
@ -145,8 +146,7 @@ class UploadTheme extends Themelet {
{ {
/* Imageboard > Shimmie Bookmarklet /* Imageboard > Shimmie Bookmarklet
This is more or less, an upgraded version of the "Danbooru>Shimmie" bookmarklet. This is more or less, an upgraded version of the "Danbooru>Shimmie" bookmarklet.
At the moment this works with Shimmie & Danbooru. At the moment this is known to work with Shimmie/Danbooru/Gelbooru/oreno.imouto/konachan/sankakucomplex.
It would also work with Gelbooru but unless someone can figure out how to bypass their hotlinking..meh.
The bookmarklet is now also loaded via the .js file in this folder. The bookmarklet is now also loaded via the .js file in this folder.
*/ */
//Bookmarklet checks if shimmie supports ext. If not, won't upload to site/shows alert saying not supported. //Bookmarklet checks if shimmie supports ext. If not, won't upload to site/shows alert saying not supported.
@ -156,7 +156,8 @@ class UploadTheme extends Themelet {
if(file_exists("ext/handle_mp3")){$supported_ext .= " mp3";} if(file_exists("ext/handle_mp3")){$supported_ext .= " mp3";}
if(file_exists("ext/handle_svg")){$supported_ext .= " svg";} if(file_exists("ext/handle_svg")){$supported_ext .= " svg";}
$title = "Booru to " . $config->get_string('title'); $title = "Booru to " . $config->get_string('title');
$html .= '<p><a href="javascript:var ste=&quot;'. $link . $delimiter .'url=&quot;; var supext=&quot;'.$supported_ext.'&quot;; var maxsze=&quot;'.$max_kb.'&quot;; void(document.body.appendChild(document.createElement(&quot;script&quot;)).src=&quot;'.make_http(make_link("ext/upload/bookmarklet.js")).'&quot;)">'. //CA=0: Ask to use current or new tags | CA=1: Always use current tags | CA=2: Always use new tags
$html .= '<p><a href="javascript:var ste=&quot;'. $link . $delimiter .'url=&quot;; var supext=&quot;'.$supported_ext.'&quot;; var maxsze=&quot;'.$max_kb.'&quot;; var CA=0; void(document.body.appendChild(document.createElement(&quot;script&quot;)).src=&quot;'.make_http(get_base_href())."/ext/upload/bookmarklet.js".'&quot;)">'.
$title . '</a> (Click when looking at an image page. Works on sites running Shimmie/Danbooru/Gelbooru. (This also grabs the tags/rating/source!))'; $title . '</a> (Click when looking at an image page. Works on sites running Shimmie/Danbooru/Gelbooru. (This also grabs the tags/rating/source!))';
} }

2
ext/user/main.php
View File

@ -42,7 +42,7 @@ class UserCreationEvent extends Event {
class UserCreationException extends SCoreException {} class UserCreationException extends SCoreException {}
class UserPage extends SimpleExtension { class UserPage extends Extension {
public function onInitExt(InitExtEvent $event) { public function onInitExt(InitExtEvent $event) {
global $config; global $config;
$config->set_default_bool("login_signup_enabled", true); $config->set_default_bool("login_signup_enabled", true);

2
ext/view/main.php
View File

@ -66,7 +66,7 @@ class ImageAdminBlockBuildingEvent extends Event {
} }
} }
class ViewImage extends SimpleExtension { class ViewImage extends Extension {
public function onPageRequest(PageRequestEvent $event) { public function onPageRequest(PageRequestEvent $event) {
global $page, $user; global $page, $user;

8
themes/danbooru/comment.theme.php
View File

@ -25,6 +25,10 @@ class CustomCommentListTheme extends CommentListTheme {
// parts for each image // parts for each image
$position = 10; $position = 10;
$comment_captcha = $config->get_bool('comment_captcha');
$comment_limit = $config->get_int("comment_list_count", 10);
foreach($images as $pair) { foreach($images as $pair) {
$image = $pair[0]; $image = $pair[0];
$comments = $pair[1]; $comments = $pair[1];
@ -42,7 +46,7 @@ class CustomCommentListTheme extends CommentListTheme {
$r = class_exists("Ratings") ? "<b>Rating</b> ".Ratings::rating_to_human($image->rating) : ""; $r = class_exists("Ratings") ? "<b>Rating</b> ".Ratings::rating_to_human($image->rating) : "";
$comment_html = "<b>Date</b> $p $s <b>User</b> $un $s $r<br><b>Tags</b> $t<p>&nbsp;"; $comment_html = "<b>Date</b> $p $s <b>User</b> $un $s $r<br><b>Tags</b> $t<p>&nbsp;";
$comment_limit = $config->get_int("comment_list_count", 10);
$comment_count = count($comments); $comment_count = count($comments);
if($comment_limit > 0 && $comment_count > $comment_limit) { if($comment_limit > 0 && $comment_count > $comment_limit) {
$hidden = $comment_count - $comment_limit; $hidden = $comment_count - $comment_limit;
@ -57,7 +61,7 @@ class CustomCommentListTheme extends CommentListTheme {
$comment_html .= $this->build_postbox($image->id); $comment_html .= $this->build_postbox($image->id);
} }
else { else {
if(!$config->get_bool('comment_captcha')) { if(!$comment_captcha) {
$comment_html .= $this->build_postbox($image->id); $comment_html .= $this->build_postbox($image->id);
} }
else { else {

2
themes/danbooru/view.theme.php
View File

@ -38,7 +38,7 @@ class CustomViewImageTheme extends ViewImageTheme {
$html .= "<br>Source: <a href='$h_source'>link</a>"; $html .= "<br>Source: <a href='$h_source'>link</a>";
} }
if(!is_null($image->rating) && file_exists("ext/rating")) { if(file_exists("ext/rating")) {
if($image->rating == null || $image->rating == "u"){ if($image->rating == null || $image->rating == "u"){
$image->rating = "u"; $image->rating = "u";
} }

2
themes/lite/view.theme.php
View File

@ -44,7 +44,7 @@ class CustomViewImageTheme extends ViewImageTheme {
$html .= "<br>Source: <a href='$h_source'>link</a>"; $html .= "<br>Source: <a href='$h_source'>link</a>";
} }
if(!is_null($image->rating) && file_exists("ext/rating")) { if(file_exists("ext/rating")) {
if($image->rating == null || $image->rating == "u"){ if($image->rating == null || $image->rating == "u"){
$image->rating = "u"; $image->rating = "u";
} }