diff --git a/install/tools/7-finish.php b/install/tools/7-finish.php index 9c64382b..3ddd0afe 100644 --- a/install/tools/7-finish.php +++ b/install/tools/7-finish.php @@ -57,6 +57,8 @@ if ($db->hasTable('players')) { DataLoader::setLocale($locale); DataLoader::load(); +clearCache(); + // add menus entries require_once SYSTEM . 'migrations/17.php'; $up(); @@ -105,6 +107,10 @@ if(file_exists(CACHE . 'install.txt')) { unlink(CACHE . 'install.txt'); } +if(file_exists(BASE . 'install/ip.txt')) { + unlink(BASE . 'install/ip.txt'); +} + $locale['step_finish_desc'] = str_replace('$ADMIN_PANEL$', generateLink(str_replace('tools/', '',ADMIN_URL), $locale['step_finish_admin_panel'], true), $locale['step_finish_desc']); $locale['step_finish_desc'] = str_replace('$HOMEPAGE$', generateLink(str_replace('tools/', '', BASE_URL), $locale['step_finish_homepage'], true), $locale['step_finish_desc']); $locale['step_finish_desc'] = str_replace('$LINK$', generateLink('https://my-aac.org', 'https://my-aac.org', true), $locale['step_finish_desc']); diff --git a/system/locale/de/install.php b/system/locale/de/install.php index 351f6009..b725da9c 100644 --- a/system/locale/de/install.php +++ b/system/locale/de/install.php @@ -20,7 +20,7 @@ $locale['not_loaded'] = 'Nicht geladen'; $locale['loading_spinner'] = 'Bitte warten, installieren...'; $locale['importing_spinner'] = 'Bitte warte, Daten werden importiert...'; $locale['please_fill_all'] = 'Bitte füllen Sie alle Felder aus!'; -$locale['already_installed'] = 'MyAAC wurde bereits installiert. Bitte löschen install/ Verzeichnis. Wenn Sie MyAAC neu installieren möchten, löschen Sie die Datei config.local.php aus dem Hauptverzeichnis und aktualisieren Sie die Seite.'; +$locale['already_installed'] = 'MyAAC wurde bereits installiert. Wenn Sie MyAAC neu installieren möchten, löschen Sie die Datei config.local.php aus dem Hauptverzeichnis und aktualisieren Sie die Seite.'; // welcome $locale['step_welcome'] = 'Willkommen'; diff --git a/system/locale/en/install.php b/system/locale/en/install.php index c623035c..a278cd64 100644 --- a/system/locale/en/install.php +++ b/system/locale/en/install.php @@ -20,7 +20,7 @@ $locale['not_loaded'] = 'Not loaded'; $locale['loading_spinner'] = 'Please wait, installing...'; $locale['importing_spinner'] = 'Please wait, importing data...'; $locale['please_fill_all'] = 'Please fill all inputs!'; -$locale['already_installed'] = 'MyAAC has been already installed. Please delete install/ directory. If you want to reinstall MyAAC - please delete config.local.php file from the main directory and refresh the page.'; +$locale['already_installed'] = 'MyAAC has been already installed. If you want to reinstall MyAAC - please delete config.local.php file from the main directory and refresh the page.'; // welcome $locale['step_welcome'] = 'Welcome'; diff --git a/system/locale/pl/install.php b/system/locale/pl/install.php index a8ea0cf6..34152cfd 100644 --- a/system/locale/pl/install.php +++ b/system/locale/pl/install.php @@ -20,7 +20,7 @@ $locale['not_loaded'] = 'Nie załadowane'; $locale['loading_spinner'] = 'Proszę czekać, trwa instalacja...'; $locale['importing_spinner'] = 'Proszę czekać, trwa importowanie danych...'; $locale['please_fill_all'] = 'Proszę wypełnić wszystkie pola!'; -$locale['already_installed'] = 'MyAAC został już zainstalowany. Proszę usunąć katalog install/. Jeśli chcesz zainstalować MyAAC od nowa - proszę usuń plik config.local.php z katalogu głównego i odśwież stronę.'; +$locale['already_installed'] = 'MyAAC został już zainstalowany. Jeśli chcesz zainstalować MyAAC od nowa - proszę usuń plik config.local.php z katalogu głównego i odśwież stronę.'; // welcome $locale['step_welcome'] = 'Witamy'; diff --git a/system/locale/pt_br/install.php b/system/locale/pt_br/install.php index 3a9ca9cc..d6b89dee 100644 --- a/system/locale/pt_br/install.php +++ b/system/locale/pt_br/install.php @@ -20,7 +20,7 @@ $locale['not_loaded'] = 'Não carregado'; $locale['loading_spinner'] = 'Por favor aguarde, instalando...'; $locale['importing_spinner'] = 'Por favor, aguarde, importando dados...'; $locale['please_fill_all'] = 'Por favor, preencha todas as entradas!'; -$locale['already_installed'] = 'MyAAC já foi instalado. Por favor, apague o diretório install/ . Se você quiser reinstalar o MyAAC - exclua o arquivo config.local.php do diretório principal e atualize a página.'; +$locale['already_installed'] = 'MyAAC já foi instalado. Se você quiser reinstalar o MyAAC - exclua o arquivo config.local.php do diretório principal e atualize a página.'; // welcome $locale['step_welcome'] = 'Bem vindo'; diff --git a/system/locale/sv/install.php b/system/locale/sv/install.php index 328ce91a..3d0b3ffd 100644 --- a/system/locale/sv/install.php +++ b/system/locale/sv/install.php @@ -18,7 +18,7 @@ $locale['loaded'] = 'Laddad'; $locale['not_loaded'] = 'Inte Laddad'; $locale['please_fill_all'] = 'Vänligen fyll i allt!'; -$locale['already_installed'] = 'MyAAC är redan installerat. Vänligen ta bort install/ mappen. Om du vill installera MyAAC igen - ta bort filen config.local.php från huvudkatalogen och uppdatera sidan.'; +$locale['already_installed'] = 'MyAAC är redan installerat. Om du vill installera MyAAC igen - ta bort filen config.local.php från huvudkatalogen och uppdatera sidan.'; // welcome $locale['step_welcome'] = 'Välkommen';