eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

Ticket #2638: allow themes to specify a base theme to load with 'include' setting in a theme.ini file

Browse Source
This commit is contained in:
Brion Vibber
2010-09-02 14:11:52 -07:00
parent 11f7fce3bb
commit c24458a9f0
4 changed files with 82 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/themeuploader.php
View File

@@ -198,7 +198,7 @@ class ThemeUploader
protected function validateFile($filename, $ext)
{
$this->validateFileOrFolder($filename);
$this->validateExtension($ext);
$this->validateExtension($filename, $ext);
// @fixme validate content
}
@@ -216,13 +216,17 @@ class ThemeUploader
return true;
}
protected function validateExtension($ext)
protected function validateExtension($base, $ext)
{
$allowed = array('css', // CSS may need validation
'png', 'gif', 'jpg', 'jpeg',
'svg', // SVG images/fonts may need validation
'ttf', 'eot', 'woff');
if (!in_array(strtolower($ext), $allowed)) {
if ($ext == 'ini' && $base == 'theme') {
// theme.ini exception
return true;
}
$msg = sprintf(_("Theme contains file of type '.%s', " .
"which is not allowed."),
$ext);