Skip to content

armgit / Vvveb

Public Imported from GitHub
0

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

Change menu items url for subdir installs, fixed double subdiretory path on successful install redirect.

givanz9e4ef3707812
diff --git a/install/controller/index.php b/install/controller/index.php
index 340dd41..9587d30 100755
--- a/install/controller/index.php
+++ b/install/controller/index.php
@@ -27,6 +27,7 @@ use function Vvveb\installedLanguages;
use function Vvveb\session as sess;
use function Vvveb\setLanguage;
use Vvveb\Sql\LanguageSQL;
+use Vvveb\Sql\menuSQL;
use Vvveb\Sql\RoleSQL;
use Vvveb\Sql\SiteSQL;
use Vvveb\System\Core\View;
@@ -362,6 +363,20 @@ class Index extends Base {
@\Vvveb\setConfig('app.cache.driver', 'APCu');
}
+ if (V_SUBDIR_INSTALL) {
+ //add subdir path to menu links
+ $menus = new menuSQL();
+
+ foreach ([1, 5] as $menu_id) { //main menu and footer menu id's
+ $menuItems = $menus->getMenus(['menu_id' => $menu_id, 'language_id' => 1])['menus'] ?? [];
+
+ foreach ($menuItems as $menuItem) {
+ $data = ['url' => V_SUBDIR_INSTALL . $menuItem['url'], 'menu_item_content' => []];
+ $menus->editMenuItem(['menu_item' => $data, 'menu_item_id' => $menuItem['menu_item_id']]);
+ }
+ }
+ }
+
if ($error) {
$this->view->error[] = $error;
}
@@ -369,6 +384,7 @@ class Index extends Base {
$success = __('Installation succesful!');
$this->view->success[] = $success;
$admin_path = \Vvveb\adminPath();
+ $admin_path = str_replace(V_SUBDIR_INSTALL, '', $admin_path);
$location = preg_replace('@/install.*$@', $admin_path . "/index.php?success=$success&errors=$error", ($_SERVER['REQUEST_URI'] ?? ''));
header("Location: $location");
diff --git a/install/sql/mysqli/menu.sql b/install/sql/mysqli/menu.sql
new file mode 100644
index 0000000..0b50c1f
--- /dev/null
+++ b/install/sql/mysqli/menu.sql
@@ -0,0 +1,3 @@
+-- Menu
+
+ import(/admin/menu.sql);
diff --git a/install/sql/pgsql/menu.sql b/install/sql/pgsql/menu.sql
new file mode 100644
index 0000000..0b50c1f
--- /dev/null
+++ b/install/sql/pgsql/menu.sql
@@ -0,0 +1,3 @@
+-- Menu
+
+ import(/admin/menu.sql);
diff --git a/install/sql/sqlite/menu.sql b/install/sql/sqlite/menu.sql
new file mode 100644
index 0000000..0b50c1f
--- /dev/null
+++ b/install/sql/sqlite/menu.sql
@@ -0,0 +1,3 @@
+-- Menu
+
+ import(/admin/menu.sql);