mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-06 14:46:56 +02:00
Code Issues Releases Wiki Activity

Support plugin.xml in most of the areas which currently read plugin.php; clear system cache in theme manager when saving theme prefs; bug fix in upload_handler XML file read; add filter option to XML class; remove some historic code from admin.php

Browse Source
This commit is contained in:
e107steved
2008-08-25 10:46:46 +00:00
parent d2da01b8db
commit 670b4964a7
11 changed files with 268 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
e107_handlers/upload_handler.php
View File

@@ -12,8 +12,8 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_handlers/upload_handler.php,v $
| $Revision: 1.15 $
| $Date: 2008-07-06 21:25:31 $
| $Revision: 1.16 $
| $Date: 2008-08-25 10:46:33 $
| $Author: e107steved $
+---------------------------------------------------------------+
*/
@@ -701,7 +701,15 @@ function get_XML_filetypes($def_file = FALSE, $file_mask = '')
require_once(e_HANDLER.'xml_class.php');
$xml = new xmlClass;
$temp_vars = $xml->loadXMLfile(e_ADMIN.$def_file, true, false);
if ($temp_vars === FALSE) return $ret;
if ($temp_vars === FALSE)
{
echo "Error reading XML file: {$def_file}<br />";
return $ret;
}
if (count($temp_vars['class']) == 1)
{
$temp_vars['class'] = array($temp_vars['class']);
}
foreach ($temp_vars['class'] as $v1)
{
$v = $v1['@attributes'];
@@ -769,7 +777,7 @@ function get_filetypes($file_mask = FALSE, $filename = '')
{
if (strtolower(substr($filename) == '.xml'))
{
return get_allowed_filetypes($filename, $file_mask);
return get_XML_filetypes($filename, $file_mask);
}
return get_allowed_filetypes($filename, $file_mask);
}