File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -44,6 +44,11 @@ final class SetupController
4444 public function index (Request $ request ): Response
4545 {
4646 $ system = new System ();
47+
48+ if (!$ system ->checkInstallation ()) {
49+ return new Response ('phpMyFAQ is already installed. ' , Response::HTTP_FORBIDDEN );
50+ }
51+
4752 $ installer = new Installer ($ system );
4853
4954 $ checkBasicError = '' ;
@@ -84,6 +89,11 @@ public function index(Request $request): Response
8489 public function install (): Response
8590 {
8691 $ system = new System ();
92+
93+ if (!$ system ->checkInstallation ()) {
94+ return new Response ('phpMyFAQ is already installed. ' , Response::HTTP_FORBIDDEN );
95+ }
96+
8797 $ installer = new Installer ($ system );
8898
8999 $ installationError = '' ;
Original file line number Diff line number Diff line change @@ -732,6 +732,11 @@ public function checkInitialRewriteBasePath(Request $request): bool
732732 */
733733 public function startInstall (?array $ setup = null ): void
734734 {
735+ $ rootDir = $ setup ['rootDir ' ] ?? PMF_ROOT_DIR ;
736+ if (is_file ($ rootDir . '/content/core/config/database.php ' )) {
737+ throw new Exception ('phpMyFAQ is already installed. Please use the update. ' );
738+ }
739+
735740 $ ldapSetup = [];
736741 $ query = [];
737742 $ uninstall = [];
Original file line number Diff line number Diff line change 7474$ loader ->register ();
7575
7676//
77- // Delete a possible SQLite file first
77+ // Delete possible leftover files from previous test runs
7878//
7979@unlink (PMF_TEST_DIR . '/test.db ' );
80+ @unlink (PMF_TEST_DIR . '/content/core/config/database.php ' );
8081
8182//
8283// Create database credentials for SQLite
You can’t perform that action at this time.
0 commit comments