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

much friendlier get_theme_object

Browse Source 
git-svn-id: file:///home/shish/svn/shimmie2/trunk@1019 7f39781d-f577-437e-ae19-be835c7a54ca
This commit is contained in:
shish 2008-09-06 16:59:02 +00:00
parent 1f0e363645
commit f8f7470e61
33 changed files with 37 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/bulk_add/main.php
View File

@ -10,7 +10,7 @@ class BulkAdd implements Extension {
var $theme; var $theme;
public function receive_event(Event $event) { public function receive_event(Event $event) {
if(is_null($this->theme)) $this->theme = get_theme_object("bulk_add", "BulkAddTheme"); if(is_null($this->theme)) $this->theme = get_theme_object($this);
if(($event instanceof PageRequestEvent) && ($event->page_name == "bulk_add")) { if(($event instanceof PageRequestEvent) && ($event->page_name == "bulk_add")) {
if($event->user->is_admin() && isset($_POST['dir'])) { if($event->user->is_admin() && isset($_POST['dir'])) {

2
contrib/downtime/main.php
View File

@ -10,7 +10,7 @@ class Downtime implements Extension {
var $theme; var $theme;
public function receive_event(Event $event) { public function receive_event(Event $event) {
if(is_null($this->theme)) $this->theme = get_theme_object("downtime", "DowntimeTheme"); if(is_null($this->theme)) $this->theme = get_theme_object($this);
if($event instanceof SetupBuildingEvent) { if($event instanceof SetupBuildingEvent) {
$sb = new SetupBlock("Downtime"); $sb = new SetupBlock("Downtime");

2
contrib/et/main.php
View File

@ -10,7 +10,7 @@ class ET implements Extension {
var $theme; var $theme;
public function receive_event(Event $event) { public function receive_event(Event $event) {
if(is_null($this->theme)) $this->theme = get_theme_object("et", "ETTheme"); if(is_null($this->theme)) $this->theme = get_theme_object($this);
if(($event instanceof PageRequestEvent) && ($event->page_name == "system_info")) { if(($event instanceof PageRequestEvent) && ($event->page_name == "system_info")) {
if($event->user->is_admin()) { if($event->user->is_admin()) {

2
contrib/event_log/main.php
View File

@ -10,7 +10,7 @@ class EventLog implements Extension {
var $theme; var $theme;
public function receive_event(Event $event) { public function receive_event(Event $event) {
if(is_null($this->theme)) $this->theme = get_theme_object("event_log", "EventLogTheme"); if(is_null($this->theme)) $this->theme = get_theme_object($this);
if($event instanceof InitExtEvent) { if($event instanceof InitExtEvent) {
$this->setup(); $this->setup();

2
contrib/featured/main.php
View File

@ -10,7 +10,7 @@ class Featured implements Extension {
var $theme; var $theme;
public function receive_event(Event $event) { public function receive_event(Event $event) {
if(is_null($this->theme)) $this->theme = get_theme_object("featured", "FeaturedTheme"); if(is_null($this->theme)) $this->theme = get_theme_object($this);
if($event instanceof InitExtEvent) { if($event instanceof InitExtEvent) {
global $config; global $config;

2
contrib/home/main.php
View File

@ -12,7 +12,7 @@ class Home implements Extension {
var $theme; var $theme;
public function receive_event(Event $event) { public function receive_event(Event $event) {
if(is_null($this->theme)) $this->theme = get_theme_object("home", "HomeTheme"); if(is_null($this->theme)) $this->theme = get_theme_object($this);
if(($event instanceof PageRequestEvent) && ($event->page_name == "home")) if(($event instanceof PageRequestEvent) && ($event->page_name == "home"))
{ {

2
contrib/image_hash_ban/main.php
View File

@ -34,7 +34,7 @@ class Image_Hash_Ban implements Extension {
var $theme; var $theme;
public function receive_event(Event $event) { public function receive_event(Event $event) {
if(is_null($this->theme)) $this->theme = get_theme_object("Image_Hash_Ban", "ImageBanTheme"); if(is_null($this->theme)) $this->theme = get_theme_object($this);
if($event instanceof InitExtEvent) { if($event instanceof InitExtEvent) {
global $config; global $config;

2
contrib/ipban/main.php
View File

@ -34,7 +34,7 @@ class IPBan implements Extension {
var $theme; var $theme;
// event handler {{{ // event handler {{{
public function receive_event(Event $event) { public function receive_event(Event $event) {
if(is_null($this->theme)) $this->theme = get_theme_object("ipban", "IPBanTheme"); if(is_null($this->theme)) $this->theme = get_theme_object($this);
if($event instanceof InitExtEvent) { if($event instanceof InitExtEvent) {
global $config; global $config;

2
contrib/link_image/main.php
View File

@ -8,7 +8,7 @@ class LinkImage implements Extension {
var $theme; var $theme;
public function receive_event(Event $event) { public function receive_event(Event $event) {
if(is_null($this->theme)) $this->theme = get_theme_object("link_image", "LinkImageTheme"); if(is_null($this->theme)) $this->theme = get_theme_object($this);
if(($event instanceof DisplayingImageEvent)) { if(($event instanceof DisplayingImageEvent)) {
global $config; global $config;
$data_href = get_base_href(); $data_href = get_base_href();

2
contrib/news/main.php
View File

@ -10,7 +10,7 @@ class News implements Extension {
var $theme; var $theme;
public function receive_event(Event $event) { public function receive_event(Event $event) {
if(is_null($this->theme)) $this->theme = get_theme_object("news", "NewsTheme"); if(is_null($this->theme)) $this->theme = get_theme_object($this);
if($event instanceof PostListBuildingEvent) { if($event instanceof PostListBuildingEvent) {
global $config; global $config;

2
contrib/notes/main.php
View File

@ -10,7 +10,7 @@ class Notes implements Extension {
var $theme; var $theme;
public function receive_event(Event $event) { public function receive_event(Event $event) {
if(is_null($this->theme)) $this->theme = get_theme_object("notes", "NotesTheme"); if(is_null($this->theme)) $this->theme = get_theme_object($this);
if($event instanceof InitExtEvent) { if($event instanceof InitExtEvent) {
global $config; global $config;

2
contrib/numeric_score/main.php
View File

@ -20,7 +20,7 @@ class NumericScore implements Extension {
var $theme; var $theme;
public function receive_event(Event $event) { public function receive_event(Event $event) {
if(is_null($this->theme)) $this->theme = get_theme_object("numeric_score", "NumericScoreTheme"); if(is_null($this->theme)) $this->theme = get_theme_object($this);
if($event instanceof InitExtEvent) { if($event instanceof InitExtEvent) {
global $config; global $config;

2
contrib/rating/main.php
View File

@ -20,7 +20,7 @@ class Ratings implements Extension {
var $theme; var $theme;
public function receive_event(Event $event) { public function receive_event(Event $event) {
if(is_null($this->theme)) $this->theme = get_theme_object("rating", "RatingsTheme"); if(is_null($this->theme)) $this->theme = get_theme_object($this);
if($event instanceof InitExtEvent) { if($event instanceof InitExtEvent) {
global $config; global $config;

2
contrib/regen_thumb/main.php
View File

@ -10,7 +10,7 @@ class RegenThumb implements Extension {
var $theme; var $theme;
public function receive_event(Event $event) { public function receive_event(Event $event) {
if(is_null($this->theme)) $this->theme = get_theme_object("regen_thumb", "RegenThumbTheme"); if(is_null($this->theme)) $this->theme = get_theme_object($this);
if(($event instanceof PageRequestEvent) && ($event->page_name == "regen_thumb")) { if(($event instanceof PageRequestEvent) && ($event->page_name == "regen_thumb")) {
global $user; global $user;

2
contrib/report_image/main.php
View File

@ -33,7 +33,7 @@ class ReportImage implements Extension {
var $theme; var $theme;
public function receive_event(Event $event) { public function receive_event(Event $event) {
if(is_null($this->theme)) $this->theme = get_theme_object("report_image", "ReportImageTheme"); if(is_null($this->theme)) $this->theme = get_theme_object($this);
if($event instanceof InitExtEvent) { if($event instanceof InitExtEvent) {
global $config; global $config;

2
contrib/svn_update/main.php
View File

@ -10,7 +10,7 @@ class SVNUpdate implements Extension {
var $theme; var $theme;
public function receive_event(Event $event) { public function receive_event(Event $event) {
if(is_null($this->theme)) $this->theme = get_theme_object("svn_update", "SVNUpdateTheme"); if(is_null($this->theme)) $this->theme = get_theme_object($this);
if(($event instanceof PageRequestEvent) && ($event->page_name == "update")) { if(($event instanceof PageRequestEvent) && ($event->page_name == "update")) {
if($event->user->is_admin()) { if($event->user->is_admin()) {

2
contrib/tag_history/main.php
View File

@ -9,7 +9,7 @@ class Tag_History implements Extension {
var $theme; var $theme;
public function receive_event(Event $event) { public function receive_event(Event $event) {
if(is_null($this->theme)) $this->theme = get_theme_object("tag_history", "Tag_HistoryTheme"); if(is_null($this->theme)) $this->theme = get_theme_object($this);
if(($event instanceof InitExtEvent)) { if(($event instanceof InitExtEvent)) {
// shimmie is being installed so call install to create the table. // shimmie is being installed so call install to create the table.

2
contrib/tagger/main.php
View File

@ -11,7 +11,7 @@ class Tagger implements Extension {
public function receive_event ($event) { public function receive_event ($event) {
if(is_null($this->theme)) if(is_null($this->theme))
$this->theme = get_theme_object("tagger", "taggerTheme"); $this->theme = get_theme_object($this);
if($event instanceof DisplayingImageEvent) { if($event instanceof DisplayingImageEvent) {
global $page, $config, $user; global $page, $config, $user;

2
contrib/text_score/main.php
View File

@ -20,7 +20,7 @@ class TextScore implements Extension {
var $theme; var $theme;
public function receive_event(Event $event) { public function receive_event(Event $event) {
if(is_null($this->theme)) $this->theme = get_theme_object("text_score", "TextScoreTheme"); if(is_null($this->theme)) $this->theme = get_theme_object($this);
if(($event instanceof InitExtEvent)) { if(($event instanceof InitExtEvent)) {
global $config; global $config;

2
contrib/wiki/main.php
View File

@ -56,7 +56,7 @@ class Wiki implements Extension {
var $theme; var $theme;
public function receive_event(Event $event) { public function receive_event(Event $event) {
if(is_null($this->theme)) $this->theme = get_theme_object("wiki", "WikiTheme"); if(is_null($this->theme)) $this->theme = get_theme_object($this);
if(($event instanceof InitExtEvent)) { if(($event instanceof InitExtEvent)) {
$this->setup(); $this->setup();

2
contrib/zoom/main.php
View File

@ -10,7 +10,7 @@ class Zoom implements Extension {
var $theme; var $theme;
public function receive_event(Event $event) { public function receive_event(Event $event) {
if($this->theme == null) $this->theme = get_theme_object("zoom", "ZoomTheme"); if($this->theme == null) $this->theme = get_theme_object($this);
if($event instanceof DisplayingImageEvent) { if($event instanceof DisplayingImageEvent) {
global $config; global $config;

8
core/util.inc.php
View File

@ -178,12 +178,14 @@ function _count_execs($db, $sql, $inputarray) {
$null = null; return $null; $null = null; return $null;
} }
function get_theme_object($file, $class) { function get_theme_object($class) {
if(class_exists("Custom$class")) { $base = get_class($class);
$class = "Custom$class"; if(class_exists("Custom{$base}Theme")) {
$class = "Custom{$base}Theme";
return new $class(); return new $class();
} }
else { else {
$class = "{$base}Theme";
return new $class(); return new $class();
} }
} }

2
ext/admin/main.php
View File

@ -15,7 +15,7 @@ class AdminPage implements Extension {
var $theme; var $theme;
public function receive_event(Event $event) { public function receive_event(Event $event) {
if(is_null($this->theme)) $this->theme = get_theme_object("admin", "AdminPageTheme"); if(is_null($this->theme)) $this->theme = get_theme_object($this);
if(($event instanceof PageRequestEvent) && ($event->page_name == "admin")) { if(($event instanceof PageRequestEvent) && ($event->page_name == "admin")) {
if(!$event->user->is_admin()) { if(!$event->user->is_admin()) {

2
ext/alias_editor/main.php
View File

@ -14,7 +14,7 @@ class AliasEditor implements Extension {
var $theme; var $theme;
public function receive_event(Event $event) { public function receive_event(Event $event) {
if(is_null($this->theme)) $this->theme = get_theme_object("alias_editor", "AliasEditorTheme"); if(is_null($this->theme)) $this->theme = get_theme_object($this);
if(($event instanceof PageRequestEvent) && ($event->page_name == "alias")) { if(($event instanceof PageRequestEvent) && ($event->page_name == "alias")) {
if($event->get_arg(0) == "add") { if($event->get_arg(0) == "add") {

2
ext/comment/main.php
View File

@ -52,7 +52,7 @@ class CommentList implements Extension {
var $theme; var $theme;
// event handler {{{ // event handler {{{
public function receive_event(Event $event) { public function receive_event(Event $event) {
if(is_null($this->theme)) $this->theme = get_theme_object("comment", "CommentListTheme"); if(is_null($this->theme)) $this->theme = get_theme_object($this);
if($event instanceof InitExtEvent) { if($event instanceof InitExtEvent) {
global $config; global $config;

2
ext/ext_manager/main.php
View File

@ -57,7 +57,7 @@ class ExtManager implements Extension {
var $theme; var $theme;
public function receive_event(Event $event) { public function receive_event(Event $event) {
if(is_null($this->theme)) $this->theme = get_theme_object("ext_manager", "ExtManagerTheme"); if(is_null($this->theme)) $this->theme = get_theme_object($this);
if(($event instanceof PageRequestEvent) && ($event->page_name == "ext_manager")) { if(($event instanceof PageRequestEvent) && ($event->page_name == "ext_manager")) {
if($event->user->is_admin()) { if($event->user->is_admin()) {

2
ext/index/main.php
View File

@ -14,7 +14,7 @@ class Index implements Extension {
var $theme; var $theme;
public function receive_event(Event $event) { public function receive_event(Event $event) {
if(is_null($this->theme)) $this->theme = get_theme_object("index", "IndexTheme"); if(is_null($this->theme)) $this->theme = get_theme_object($this);
if($event instanceof InitExtEvent) { if($event instanceof InitExtEvent) {
global $config; global $config;

2
ext/setup/main.php
View File

@ -126,7 +126,7 @@ class Setup implements Extension {
var $theme; var $theme;
public function receive_event(Event $event) { public function receive_event(Event $event) {
if(is_null($this->theme)) $this->theme = get_theme_object("setup", "SetupTheme"); if(is_null($this->theme)) $this->theme = get_theme_object($this);
if($event instanceof InitExtEvent) { if($event instanceof InitExtEvent) {
global $config; global $config;

2
ext/tag_edit/main.php
View File

@ -4,7 +4,7 @@ class TagEdit implements Extension {
var $theme; var $theme;
// event handling {{{ // event handling {{{
public function receive_event(Event $event) { public function receive_event(Event $event) {
if(is_null($this->theme)) $this->theme = get_theme_object("tag_edit", "TagEditTheme"); if(is_null($this->theme)) $this->theme = get_theme_object($this);
if(($event instanceof PageRequestEvent) && ($event->page_name == "tag_edit")) { if(($event instanceof PageRequestEvent) && ($event->page_name == "tag_edit")) {
global $page; global $page;

2
ext/tag_list/main.php
View File

@ -5,7 +5,7 @@ class TagList implements Extension {
// event handling {{{ // event handling {{{
public function receive_event(Event $event) { public function receive_event(Event $event) {
if($this->theme == null) $this->theme = get_theme_object("tag_list", "TagListTheme"); if($this->theme == null) $this->theme = get_theme_object($this);
if($event instanceof InitExtEvent) { if($event instanceof InitExtEvent) {
global $config; global $config;

2
ext/upload/main.php
View File

@ -4,7 +4,7 @@ class Upload implements Extension {
var $theme; var $theme;
// event handling {{{ // event handling {{{
public function receive_event(Event $event) { public function receive_event(Event $event) {
if(is_null($this->theme)) $this->theme = get_theme_object("upload", "UploadTheme"); if(is_null($this->theme)) $this->theme = get_theme_object($this);
$is_full = (disk_free_space(realpath("./images/")) < 100*1024*1024); $is_full = (disk_free_space(realpath("./images/")) < 100*1024*1024);

2
ext/user/main.php
View File

@ -41,7 +41,7 @@ class UserPage implements Extension {
// event handling {{{ // event handling {{{
public function receive_event(Event $event) { public function receive_event(Event $event) {
if(is_null($this->theme)) $this->theme = get_theme_object("user", "UserPageTheme"); if(is_null($this->theme)) $this->theme = get_theme_object($this);
if($event instanceof InitExtEvent) { if($event instanceof InitExtEvent) {
global $config; global $config;

2
ext/view/main.php
View File

@ -43,7 +43,7 @@ class ViewImage implements Extension {
var $theme; var $theme;
public function receive_event(Event $event) { public function receive_event(Event $event) {
if(is_null($this->theme)) $this->theme = get_theme_object("view", "ViewTheme"); if(is_null($this->theme)) $this->theme = get_theme_object($this);
if(($event instanceof PageRequestEvent) && ($event->page_name == "post") && ($event->get_arg(0) == "view")) { if(($event instanceof PageRequestEvent) && ($event->page_name == "post") && ($event->get_arg(0) == "view")) {
$image_id = int_escape($event->get_arg(1)); $image_id = int_escape($event->get_arg(1));