From d0076fcabb5f901f7f7670fae7efadd4ee328ec4 Mon Sep 17 00:00:00 2001
From: evrifaessa
Date: Wed, 16 Dec 2020 13:06:39 +0300
Subject: [PATCH] Completely re-structuring the install script
---
bin/prepare.php | 6 +-
src/bb-config-sample.php | 4 +-
src/install/{ => assets}/css/main.css | 0
src/install/{ => assets}/images/adminUser.png | Bin
src/install/{ => assets}/images/alert2.png | Bin
src/install/{ => assets}/images/bodyBg.jpg | Bin
src/install/{ => assets}/images/book.png | Bin
src/install/{ => assets}/images/bubbles2.png | Bin
src/install/{ => assets}/images/cog4.png | Bin
src/install/{ => assets}/images/doc.png | Bin
src/install/{ => assets}/images/flag.png | Bin
src/install/{ => assets}/images/leftNavBg.png | Bin
src/install/{ => assets}/images/loader.gif | Bin
src/install/{ => assets}/images/middlebg.png | Bin
src/install/{ => assets}/images/topNav.jpg | Bin
.../{ => assets}/images/ui/basicBtn.png | Bin
.../{ => assets}/images/ui/blackBtn.png | Bin
.../{ => assets}/images/ui/blueBtn.png | Bin
.../{ => assets}/images/ui/greenBtn.png | Bin
.../{ => assets}/images/ui/greyishBtn.png | Bin
src/install/{ => assets}/images/ui/handle.png | Bin
.../{ => assets}/images/ui/numDataBg.png | Bin
.../{ => assets}/images/ui/pagination.png | Bin
.../{ => assets}/images/ui/progress.png | Bin
.../images/ui/progressOverlay.png | Bin
src/install/{ => assets}/images/ui/redBtn.png | Bin
src/install/{ => assets}/images/ui/seaBtn.png | Bin
.../{ => assets}/images/ui/sliderBg.png | Bin
.../{ => assets}/images/ui/sliderBgVert.png | Bin
.../{ => assets}/images/ui/sliderOverlay.png | Bin
.../images/ui/sliderOverlayVert.png | Bin
.../{ => assets}/images/ui/spinnerUpDown.png | Bin
.../{ => assets}/images/ui/uploadDisabled.png | Bin
src/install/{ => assets}/images/user.png | Bin
src/install/{ => assets}/images/vault.png | Bin
src/install/{ => assets}/install.phtml | 18 +-
src/install/{ => assets/js}/jquery.min.js | 0
.../{ => assets/js}/jquery.smartWizard.js | 0
src/install/{ => assets}/layout.phtml | 4 +-
src/install/index.php | 421 +-----------------
src/install/install.php | 418 +++++++++++++++++
src/install/{ => sql}/content.sql | 0
src/install/{ => sql}/content_test.sql | 0
src/install/{ => sql}/structure.sql | 0
44 files changed, 437 insertions(+), 434 deletions(-)
rename src/install/{ => assets}/css/main.css (100%)
mode change 100755 => 100644
rename src/install/{ => assets}/images/adminUser.png (100%)
rename src/install/{ => assets}/images/alert2.png (100%)
mode change 100755 => 100644
rename src/install/{ => assets}/images/bodyBg.jpg (100%)
mode change 100755 => 100644
rename src/install/{ => assets}/images/book.png (100%)
mode change 100755 => 100644
rename src/install/{ => assets}/images/bubbles2.png (100%)
mode change 100755 => 100644
rename src/install/{ => assets}/images/cog4.png (100%)
mode change 100755 => 100644
rename src/install/{ => assets}/images/doc.png (100%)
mode change 100755 => 100644
rename src/install/{ => assets}/images/flag.png (100%)
mode change 100755 => 100644
rename src/install/{ => assets}/images/leftNavBg.png (100%)
mode change 100755 => 100644
rename src/install/{ => assets}/images/loader.gif (100%)
mode change 100755 => 100644
rename src/install/{ => assets}/images/middlebg.png (100%)
mode change 100755 => 100644
rename src/install/{ => assets}/images/topNav.jpg (100%)
mode change 100755 => 100644
rename src/install/{ => assets}/images/ui/basicBtn.png (100%)
mode change 100755 => 100644
rename src/install/{ => assets}/images/ui/blackBtn.png (100%)
mode change 100755 => 100644
rename src/install/{ => assets}/images/ui/blueBtn.png (100%)
mode change 100755 => 100644
rename src/install/{ => assets}/images/ui/greenBtn.png (100%)
mode change 100755 => 100644
rename src/install/{ => assets}/images/ui/greyishBtn.png (100%)
mode change 100755 => 100644
rename src/install/{ => assets}/images/ui/handle.png (100%)
mode change 100755 => 100644
rename src/install/{ => assets}/images/ui/numDataBg.png (100%)
mode change 100755 => 100644
rename src/install/{ => assets}/images/ui/pagination.png (100%)
mode change 100755 => 100644
rename src/install/{ => assets}/images/ui/progress.png (100%)
mode change 100755 => 100644
rename src/install/{ => assets}/images/ui/progressOverlay.png (100%)
mode change 100755 => 100644
rename src/install/{ => assets}/images/ui/redBtn.png (100%)
mode change 100755 => 100644
rename src/install/{ => assets}/images/ui/seaBtn.png (100%)
mode change 100755 => 100644
rename src/install/{ => assets}/images/ui/sliderBg.png (100%)
mode change 100755 => 100644
rename src/install/{ => assets}/images/ui/sliderBgVert.png (100%)
mode change 100755 => 100644
rename src/install/{ => assets}/images/ui/sliderOverlay.png (100%)
mode change 100755 => 100644
rename src/install/{ => assets}/images/ui/sliderOverlayVert.png (100%)
mode change 100755 => 100644
rename src/install/{ => assets}/images/ui/spinnerUpDown.png (100%)
mode change 100755 => 100644
rename src/install/{ => assets}/images/ui/uploadDisabled.png (100%)
mode change 100755 => 100644
rename src/install/{ => assets}/images/user.png (100%)
rename src/install/{ => assets}/images/vault.png (100%)
mode change 100755 => 100644
rename src/install/{ => assets}/install.phtml (96%)
rename src/install/{ => assets/js}/jquery.min.js (100%)
rename src/install/{ => assets/js}/jquery.smartWizard.js (100%)
rename src/install/{ => assets}/layout.phtml (88%)
create mode 100644 src/install/install.php
rename src/install/{ => sql}/content.sql (100%)
rename src/install/{ => sql}/content_test.sql (100%)
rename src/install/{ => sql}/structure.sql (100%)
diff --git a/bin/prepare.php b/bin/prepare.php
index a135c9b9c..b5c9f429c 100644
--- a/bin/prepare.php
+++ b/bin/prepare.php
@@ -5,10 +5,10 @@ $pathAppRoot = $pathApp . '/src';
$pathAppInstall = $pathApp . '/src/install';
$config = include $pathAppRoot . '/bb-config.php';
-$structureSql = '/structure.sql';
-$contentSql = '/content_test.sql';
+$structureSql = '/sql/structure.sql';
+$contentSql = '/sql/content_test.sql';
if (isset($argv[1]) && $argv[1] == 'production') {
- $contentSql = '/content.sql';
+ $contentSql = '/sql/content.sql';
echo "Production content" . PHP_EOL;
}
diff --git a/src/bb-config-sample.php b/src/bb-config-sample.php
index 8b14beedc..78b1daa83 100755
--- a/src/bb-config-sample.php
+++ b/src/bb-config-sample.php
@@ -4,8 +4,8 @@
*
* If you are not using the web-installer, you can rename this file
* to "bb-config.php" and fill in the values.
- * Import /install/structure.sql to your database
- * Import /install/content.sql to your database
+ * Import /install/sql/structure.sql to your database
+ * Import /install/sql/content.sql to your database
* Open browser http://www.yourdomain.com/index.php?_url=/bb-admin to create new admin account.
* Remove /install directory
*/
diff --git a/src/install/css/main.css b/src/install/assets/css/main.css
old mode 100755
new mode 100644
similarity index 100%
rename from src/install/css/main.css
rename to src/install/assets/css/main.css
diff --git a/src/install/images/adminUser.png b/src/install/assets/images/adminUser.png
similarity index 100%
rename from src/install/images/adminUser.png
rename to src/install/assets/images/adminUser.png
diff --git a/src/install/images/alert2.png b/src/install/assets/images/alert2.png
old mode 100755
new mode 100644
similarity index 100%
rename from src/install/images/alert2.png
rename to src/install/assets/images/alert2.png
diff --git a/src/install/images/bodyBg.jpg b/src/install/assets/images/bodyBg.jpg
old mode 100755
new mode 100644
similarity index 100%
rename from src/install/images/bodyBg.jpg
rename to src/install/assets/images/bodyBg.jpg
diff --git a/src/install/images/book.png b/src/install/assets/images/book.png
old mode 100755
new mode 100644
similarity index 100%
rename from src/install/images/book.png
rename to src/install/assets/images/book.png
diff --git a/src/install/images/bubbles2.png b/src/install/assets/images/bubbles2.png
old mode 100755
new mode 100644
similarity index 100%
rename from src/install/images/bubbles2.png
rename to src/install/assets/images/bubbles2.png
diff --git a/src/install/images/cog4.png b/src/install/assets/images/cog4.png
old mode 100755
new mode 100644
similarity index 100%
rename from src/install/images/cog4.png
rename to src/install/assets/images/cog4.png
diff --git a/src/install/images/doc.png b/src/install/assets/images/doc.png
old mode 100755
new mode 100644
similarity index 100%
rename from src/install/images/doc.png
rename to src/install/assets/images/doc.png
diff --git a/src/install/images/flag.png b/src/install/assets/images/flag.png
old mode 100755
new mode 100644
similarity index 100%
rename from src/install/images/flag.png
rename to src/install/assets/images/flag.png
diff --git a/src/install/images/leftNavBg.png b/src/install/assets/images/leftNavBg.png
old mode 100755
new mode 100644
similarity index 100%
rename from src/install/images/leftNavBg.png
rename to src/install/assets/images/leftNavBg.png
diff --git a/src/install/images/loader.gif b/src/install/assets/images/loader.gif
old mode 100755
new mode 100644
similarity index 100%
rename from src/install/images/loader.gif
rename to src/install/assets/images/loader.gif
diff --git a/src/install/images/middlebg.png b/src/install/assets/images/middlebg.png
old mode 100755
new mode 100644
similarity index 100%
rename from src/install/images/middlebg.png
rename to src/install/assets/images/middlebg.png
diff --git a/src/install/images/topNav.jpg b/src/install/assets/images/topNav.jpg
old mode 100755
new mode 100644
similarity index 100%
rename from src/install/images/topNav.jpg
rename to src/install/assets/images/topNav.jpg
diff --git a/src/install/images/ui/basicBtn.png b/src/install/assets/images/ui/basicBtn.png
old mode 100755
new mode 100644
similarity index 100%
rename from src/install/images/ui/basicBtn.png
rename to src/install/assets/images/ui/basicBtn.png
diff --git a/src/install/images/ui/blackBtn.png b/src/install/assets/images/ui/blackBtn.png
old mode 100755
new mode 100644
similarity index 100%
rename from src/install/images/ui/blackBtn.png
rename to src/install/assets/images/ui/blackBtn.png
diff --git a/src/install/images/ui/blueBtn.png b/src/install/assets/images/ui/blueBtn.png
old mode 100755
new mode 100644
similarity index 100%
rename from src/install/images/ui/blueBtn.png
rename to src/install/assets/images/ui/blueBtn.png
diff --git a/src/install/images/ui/greenBtn.png b/src/install/assets/images/ui/greenBtn.png
old mode 100755
new mode 100644
similarity index 100%
rename from src/install/images/ui/greenBtn.png
rename to src/install/assets/images/ui/greenBtn.png
diff --git a/src/install/images/ui/greyishBtn.png b/src/install/assets/images/ui/greyishBtn.png
old mode 100755
new mode 100644
similarity index 100%
rename from src/install/images/ui/greyishBtn.png
rename to src/install/assets/images/ui/greyishBtn.png
diff --git a/src/install/images/ui/handle.png b/src/install/assets/images/ui/handle.png
old mode 100755
new mode 100644
similarity index 100%
rename from src/install/images/ui/handle.png
rename to src/install/assets/images/ui/handle.png
diff --git a/src/install/images/ui/numDataBg.png b/src/install/assets/images/ui/numDataBg.png
old mode 100755
new mode 100644
similarity index 100%
rename from src/install/images/ui/numDataBg.png
rename to src/install/assets/images/ui/numDataBg.png
diff --git a/src/install/images/ui/pagination.png b/src/install/assets/images/ui/pagination.png
old mode 100755
new mode 100644
similarity index 100%
rename from src/install/images/ui/pagination.png
rename to src/install/assets/images/ui/pagination.png
diff --git a/src/install/images/ui/progress.png b/src/install/assets/images/ui/progress.png
old mode 100755
new mode 100644
similarity index 100%
rename from src/install/images/ui/progress.png
rename to src/install/assets/images/ui/progress.png
diff --git a/src/install/images/ui/progressOverlay.png b/src/install/assets/images/ui/progressOverlay.png
old mode 100755
new mode 100644
similarity index 100%
rename from src/install/images/ui/progressOverlay.png
rename to src/install/assets/images/ui/progressOverlay.png
diff --git a/src/install/images/ui/redBtn.png b/src/install/assets/images/ui/redBtn.png
old mode 100755
new mode 100644
similarity index 100%
rename from src/install/images/ui/redBtn.png
rename to src/install/assets/images/ui/redBtn.png
diff --git a/src/install/images/ui/seaBtn.png b/src/install/assets/images/ui/seaBtn.png
old mode 100755
new mode 100644
similarity index 100%
rename from src/install/images/ui/seaBtn.png
rename to src/install/assets/images/ui/seaBtn.png
diff --git a/src/install/images/ui/sliderBg.png b/src/install/assets/images/ui/sliderBg.png
old mode 100755
new mode 100644
similarity index 100%
rename from src/install/images/ui/sliderBg.png
rename to src/install/assets/images/ui/sliderBg.png
diff --git a/src/install/images/ui/sliderBgVert.png b/src/install/assets/images/ui/sliderBgVert.png
old mode 100755
new mode 100644
similarity index 100%
rename from src/install/images/ui/sliderBgVert.png
rename to src/install/assets/images/ui/sliderBgVert.png
diff --git a/src/install/images/ui/sliderOverlay.png b/src/install/assets/images/ui/sliderOverlay.png
old mode 100755
new mode 100644
similarity index 100%
rename from src/install/images/ui/sliderOverlay.png
rename to src/install/assets/images/ui/sliderOverlay.png
diff --git a/src/install/images/ui/sliderOverlayVert.png b/src/install/assets/images/ui/sliderOverlayVert.png
old mode 100755
new mode 100644
similarity index 100%
rename from src/install/images/ui/sliderOverlayVert.png
rename to src/install/assets/images/ui/sliderOverlayVert.png
diff --git a/src/install/images/ui/spinnerUpDown.png b/src/install/assets/images/ui/spinnerUpDown.png
old mode 100755
new mode 100644
similarity index 100%
rename from src/install/images/ui/spinnerUpDown.png
rename to src/install/assets/images/ui/spinnerUpDown.png
diff --git a/src/install/images/ui/uploadDisabled.png b/src/install/assets/images/ui/uploadDisabled.png
old mode 100755
new mode 100644
similarity index 100%
rename from src/install/images/ui/uploadDisabled.png
rename to src/install/assets/images/ui/uploadDisabled.png
diff --git a/src/install/images/user.png b/src/install/assets/images/user.png
similarity index 100%
rename from src/install/images/user.png
rename to src/install/assets/images/user.png
diff --git a/src/install/images/vault.png b/src/install/assets/images/vault.png
old mode 100755
new mode 100644
similarity index 100%
rename from src/install/images/vault.png
rename to src/install/assets/images/vault.png
diff --git a/src/install/install.phtml b/src/install/assets/install.phtml
similarity index 96%
rename from src/install/install.phtml
rename to src/install/assets/install.phtml
index 576b60fb7..93f828fae 100644
--- a/src/install/install.phtml
+++ b/src/install/assets/install.phtml
@@ -1,4 +1,4 @@
-{% extends "layout.phtml" %}
+{% extends "./assets/layout.phtml" %}
{% block left %}
@@ -61,9 +61,9 @@
If you can not enable JavaScript for some reason you can follow these steps in
order to setup BoxBilling:
* Rename "bb-config-sample.php" file to "bb-config.php", fill in the values and change this file permissions to read only (CHMOD 644).
- * Import /install/structure.sql to your database
- * Import /install/content.sql to your database
- * Open browser {{constant("BB_URL")}}index.php?_url=/bb-admin to create new admin
+ * Import /install/sql/structure.sql to your database
+ * Import /install/sql/content.sql to your database
+ * Open browser {{constant("BB_URL")}}index.php?_url=/bb-admin to create new admin
account.
* Remove /install directory
@@ -233,8 +233,8 @@
{% block js %}
-
-
+
+