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

removal of data_href config variable -- it should be auto detected

Browse Source 
git-svn-id: file:///home/shish/svn/shimmie2/trunk@304 7f39781d-f577-437e-ae19-be835c7a54ca
This commit is contained in:
shish 2007-07-16 21:30:28 +00:00
parent e614634cf9
commit f5ec3f861e
6 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/emoticons/main.php
View File

@ -17,7 +17,7 @@ class Emoticons extends Extension {
private function bbcode_to_html($text) { private function bbcode_to_html($text) {
global $config; global $config;
$data_href = $config->get_string("data_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;
} }

4
core/util.inc.php
View File

@ -205,6 +205,10 @@ function get_memory_limit() {
return $memory; return $memory;
} }
function get_base_href() {
return dirname($_SERVER['SCRIPT_NAME']);
}
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *\ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *\
* Debugging functions * * Debugging functions *

2
ext/load_ext_data/main.php
View File

@ -4,7 +4,7 @@ class LoadExtData extends Extension {
if(is_a($event, 'PageRequestEvent')) { if(is_a($event, 'PageRequestEvent')) {
global $page, $config; global $page, $config;
$data_href = $config->get_string("data_href", './'); $data_href = get_base_href();
foreach(glob("ext/*/style.css") as $css_file) { foreach(glob("ext/*/style.css") as $css_file) {
$page->add_header("<link rel='stylesheet' href='$data_href/$css_file' type='text/css'>"); $page->add_header("<link rel='stylesheet' href='$data_href/$css_file' type='text/css'>");

1
ext/setup/main.php
View File

@ -164,7 +164,6 @@ class Setup extends Extension {
$sb->add_text_option("title", "Site title: "); $sb->add_text_option("title", "Site title: ");
$sb->add_text_option("front_page", "<br>Front page: "); $sb->add_text_option("front_page", "<br>Front page: ");
$sb->add_text_option("base_href", "<br>Base URL: "); $sb->add_text_option("base_href", "<br>Base URL: ");
$sb->add_text_option("data_href", "<br>Data URL: ");
$sb->add_text_option("contact_link", "<br>Contact URL:"); $sb->add_text_option("contact_link", "<br>Contact URL:");
$sb->add_choice_option("theme", $themes, "<br>Theme: "); $sb->add_choice_option("theme", $themes, "<br>Theme: ");
// $sb->add_int_option("anon_id", "<br>Anonymous ID: "); // FIXME: create advanced options page // $sb->add_int_option("anon_id", "<br>Anonymous ID: "); // FIXME: create advanced options page

2
themes/danbooru/layout.class.php
View File

@ -46,7 +46,7 @@ class Layout {
global $config; global $config;
$theme_name = $config->get_string('theme'); $theme_name = $config->get_string('theme');
$base_href = $config->get_string('base_href'); $base_href = $config->get_string('base_href');
$data_href = $config->get_string('data_href'); $data_href = get_base_href();
$contact_link = $config->get_string('contact_link'); $contact_link = $config->get_string('contact_link');
$version = $config->get_string('version'); $version = $config->get_string('version');

2
themes/default/layout.class.php
View File

@ -4,7 +4,7 @@ class Layout {
function display_page($page) { function display_page($page) {
global $config; global $config;
$theme_name = $config->get_string('theme', 'default'); $theme_name = $config->get_string('theme', 'default');
$data_href = $config->get_string('data_href', './'); $data_href = get_base_href();
$contact_link = $config->get_string('contact_link'); $contact_link = $config->get_string('contact_link');
$version = "Shimmie-".VERSION; $version = "Shimmie-".VERSION;