mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-04 13:47:31 +02:00
Code Issues Releases Wiki Activity

Issue #3655 Revert order change. Generate filetypes.xml during install.

Browse Source
This commit is contained in:
Cameron
2019-02-03 09:51:16 -08:00
parent f934976ac5
commit 548961c5ab
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
e107_admin/admin.php
View File

@@ -172,6 +172,9 @@ class admin_start
e107::getDb()->db_Mark_Time('Check Incompatible Plugins'); e107::getDb()->db_Mark_Time('Check Incompatible Plugins');
$this->checkIncompatiblePlugins(); $this->checkIncompatiblePlugins();
e107::getDb()->db_Mark_Time('Check Filetypes');
$this->checkFileTypes();
e107::getDb()->db_Mark_Time('Check Suspect Files'); e107::getDb()->db_Mark_Time('Check Suspect Files');
$this->checkSuspiciousFiles(); $this->checkSuspiciousFiles();
@@ -187,9 +190,6 @@ class admin_start
e107::getDb()->db_Mark_Time('Check Core Update'); e107::getDb()->db_Mark_Time('Check Core Update');
$this->checkCoreUpdate(); $this->checkCoreUpdate();
e107::getDb()->db_Mark_Time('Check Filetypes');
$this->checkFileTypes();
if($this->exit === true) if($this->exit === true)
{ {
return null; return null;

13
install.php
View File

@@ -1460,6 +1460,7 @@ if($this->pdo == true)
$this->template->SetTag("bartype", 'success'); $this->template->SetTag("bartype", 'success');
$htaccessError = $this->htaccess(); $htaccessError = $this->htaccess();
$this->saveFileTypes();
$e_forms->start_form("confirmation", "index.php"); $e_forms->start_form("confirmation", "index.php");
@@ -1493,6 +1494,18 @@ if($this->pdo == true)
e107::getMessage()->reset(false, false, true); e107::getMessage()->reset(false, false, true);
} }
private function saveFileTypes()
{
$data = '<?xml version="1.0" encoding="utf-8"?>
<e107Filetypes>
<class name="253" type="zip,gz,jpg,jpeg,png,gif,xml,pdf" maxupload="2M" />
</e107Filetypes>';
return file_put_contents($this->e107->e107_dirs['SYSTEM_DIRECTORY']."filetypes.xml",$data);
}
protected function stats() protected function stats()
{ {