1
0
mirror of https://github.com/vichan-devel/vichan.git synced 2024-11-29 17:54:29 +01:00

Fixed bug in auto-detecting $config[root]

This commit is contained in:
Savetheinternet 2011-05-18 16:00:33 +10:00
parent c3b5f2893e
commit f3f46ddd0b

View File

@ -140,6 +140,7 @@
$config['error']['fileexists'] = 'That file <a href="%s">already exists</a>!'; $config['error']['fileexists'] = 'That file <a href="%s">already exists</a>!';
$config['error']['delete_too_soon'] = 'You\'ll have to wait another %s before deleting that.'; $config['error']['delete_too_soon'] = 'You\'ll have to wait another %s before deleting that.';
$config['error']['mime_exploit'] = 'MIME type detection XSS exploit (IE) detected; post discarded.'; $config['error']['mime_exploit'] = 'MIME type detection XSS exploit (IE) detected; post discarded.';
$config['error']['invalid_embed'] = 'Couldn\'t make sense of the URL of the video you tried to embed.';
// Moderator errors // Moderator errors
$config['error']['invalid'] = 'Invalid username and/or password.'; $config['error']['invalid'] = 'Invalid username and/or password.';
@ -216,7 +217,7 @@
// The root directory, including the trailing slash, for Tinyboard. // The root directory, including the trailing slash, for Tinyboard.
// examples: '/', 'http://boards.chan.org/', '/chan/' // examples: '/', 'http://boards.chan.org/', '/chan/'
$config['root'] = ($_SERVER['REQUEST_URI'] == '/' ? '/' : str_replace('\\', '/', dirname($_SERVER['REQUEST_URI'])) . '/'); $config['root'] = (str_replace('\\', '/', dirname($_SERVER['REQUEST_URI'])) == '/' ? '/' : str_replace('\\', '/', dirname($_SERVER['REQUEST_URI'])) . '/');
$config['dir']['img'] = 'src/'; $config['dir']['img'] = 'src/';
$config['dir']['thumb'] = 'thumb/'; $config['dir']['thumb'] = 'thumb/';
@ -582,6 +583,18 @@
// Characters used to generate a random password (with Javascript) // Characters used to generate a random password (with Javascript)
$config['genpassword_chars'] = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789!@#$%^&*()_+'; $config['genpassword_chars'] = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789!@#$%^&*()_+';
// Custom embedding (YouTube, vimeo, etc.)
$config['embedding'] = Array(
Array(
'/^https?:\/\/(\w+\.)?youtube\.com\/watch\?v=([a-zA-Z0-9-]{10,11})(&|$)/i',
'<iframe width="%%tb_width%%" height="%%tb_height%%" src="http://www.youtube.com/embed/$2" frameborder="0" allowfullscreen></iframe>'
)
);
// Embedding width and height
$config['embed_width'] = 200;
$config['embed_height'] = 164;
// Enable IP range bans (eg. "127.*.0.1", "127.0.0.*", and "12*.0.0.1" all match "127.0.0.1"). // Enable IP range bans (eg. "127.*.0.1", "127.0.0.*", and "12*.0.0.1" all match "127.0.0.1").
// A little more load on the database // A little more load on the database
$config['ban_range'] = true; $config['ban_range'] = true;