mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-02 20:57:26 +02:00
Code Issues Releases Wiki Activity

Moved core-image to e107_system/ and renamed to core_image.phar

Browse Source
This commit is contained in:
Cameron
2020-05-11 13:28:01 -07:00
parent 968701c842
commit e7a79edcd0
4 changed files with 3 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build-release/e107_make.php vendored
View File

@@ -252,7 +252,7 @@ class e107Build
$this->createCoreImage(); // Create Image $this->createCoreImage(); // Create Image
} }
$this->copyCoreImage($this->exportDir . "e107_admin/core_image.php"); $this->copyCoreImage($this->exportDir . "e107_system/core_image.phar");
if (isset($rel['readme'])) if (isset($rel['readme']))
{ {

16
e107_admin/lancheck.php
View File

@@ -354,22 +354,6 @@ class lancheck
$acceptedLans = explode(",",e_LANLIST); $acceptedLans = explode(",",e_LANLIST);
if(!isset($_SESSION['lancheck-core-image']))
{
$core = array();
$coredir = array('admin' => 'e107_admin', 'files' => 'e107_files', 'images' => 'e107_images', 'themes' => 'e107_themes', 'plugins' => 'e107_plugins', 'handlers' => 'e107_handlers', 'languages' => 'e107_languages', 'downloads' => 'e107_downloads', 'docs' => 'e107_docs');
$core_image = array();
require_once(e_ADMIN."core_image.php");
unset($core_image['e107_images'],$core_image['e107_files'],$core_image['e107_admin']);
$_SESSION['lancheck-core-image'] = $core_image;
}
if(!empty($_POST['ziplang'])) if(!empty($_POST['ziplang']))
{ {

2
e107_handlers/e107_class.php
View File

@@ -1615,7 +1615,7 @@ class e107
*/ */
public static function getFileInspector($type = 'core') public static function getFileInspector($type = 'core')
{ {
$fileInspectorPath = realpath(e_ADMIN . "core_image.php"); $fileInspectorPath = realpath(e_SYSTEM . "core_image.phar");
/** @var e_file_inspector $fileInspector */ /** @var e_file_inspector $fileInspector */
$fileInspector = self::getObject('e_file_inspector_json_phar', $fileInspectorPath); $fileInspector = self::getObject('e_file_inspector_json_phar', $fileInspectorPath);

2
e107_handlers/e_file_inspector.php
View File

@@ -68,7 +68,7 @@ abstract class e_file_inspector implements e_file_inspector_interface
return realpath($path) ? realpath($path) : $path; return realpath($path) ? realpath($path) : $path;
}, [ }, [
$appRoot . "e107_config.php", $appRoot . "e107_config.php",
$appRoot . e107::getFolder('admin') . "core_image.php", $appRoot . e107::getFolder('system') . "core_image.phar",
] ]
); );
$this->existingInsecureFiles = array_filter($this->insecureFiles, function ($path) $this->existingInsecureFiles = array_filter($this->insecureFiles, function ($path)