Skip to content

armgit / Vvveb

Public Imported from GitHub
0

Powerful and easy to use cms to build websites, blogs or ecommerce stores.

Theme install unzip bug in some hosting configuration fix

givanz399b74b0a742
diff --git a/system/extensions/themes.php b/system/extensions/themes.php
index dd36e2f..f3341ae 100755
--- a/system/extensions/themes.php
+++ b/system/extensions/themes.php
@@ -183,24 +183,20 @@ class Themes extends Extensions {
}
static function install($extensionZipFile, $slug = false, $validate = false) {
- $extension = static :: $extension;
$success = true;
$extractTo = static :: $baseDir;
$fileCheck = 'index.html';
- $folder = false;
+ $folder = false;
$zip = new \ZipArchive();
if ($zip->open($extensionZipFile) === true) {
- $info = false;
- $folderName = $zip->getNameIndex(0);
-
//search for top level index.html
- for ($i = $zip->numFiles; ($i > 0 && $success == true); $i--) {
+ for ($i = 0; (($i < $zip->numFiles) && $success == true); $i++) {
$file = $zip->getNameIndex($i);
if (strpos($file, $fileCheck) !== false) {
- if (! $folder || strlen($file) < strlen($folder)) {
+ if (! $folder || (strlen($file) < strlen($folder))) {
$folder = $file;
}
}
@@ -211,13 +207,13 @@ class Themes extends Extensions {
$extractTo .= $slug;
}
-
-
+ $extractTo = preg_replace('@[\\\/]([^\\\/]+?)\.\w+$@', '', $extractTo);
if ($zip->extractTo($extractTo)) {
- $success = $slug;
+
if ($folder !== 'index.html') {
- $folder = str_replace('/index.html', '', $folder);
+ $folder = preg_replace('@[\\\/]([^\\\/]+?)\.\w+$@', '', $folder);
$slug = slugify($folder);
+
rename($extractTo . $folder, $extractTo . $slug);
}
} else {
@@ -232,7 +228,7 @@ class Themes extends Extensions {
throw new \Exception(__('File is not a valid zip archive!'));
}
- Event :: trigger(__CLASS__, __FUNCTION__, $extensionZipFile, $success);
+ Event :: trigger(__CLASS__, __FUNCTION__, $extensionZipFile, $slug, $success);
return $success;
}