diff --git a/application/config/config.php b/application/config/config.php index 6efb9d80..91019a86 100644 --- a/application/config/config.php +++ b/application/config/config.php @@ -83,33 +83,7 @@ $config['url_suffix'] = ''; */ $languages = [ - 'ar' => 'arabic', - 'bu' => 'bulgarian', - 'ca' => 'catalan', - 'zh' => 'chinese', - 'cs' => 'czech', - 'da' => 'danish', - 'nl' => 'dutch', 'en' => 'english', - 'fi' => 'finnish', - 'fr' => 'french', - 'de' => 'german', - 'el' => 'greek', - 'he' => 'hebrew', - 'hi' => 'hindi', - 'hu' => 'hungarian', - 'it' => 'italian', - 'ja' => 'japanese', - 'fa' => 'persian', - 'lb' => 'luxembourgish', - 'mr' => 'marathi', - 'pl' => 'polish', - 'pt' => 'portuguese', - 'ro' => 'romanian', - 'ru' => 'russian', - 'sk' => 'slovak', - 'es' => 'spanish', - 'sv' => 'swedish', 'tr' => 'turkish', ]; @@ -130,33 +104,7 @@ $config['language'] = isset($_SERVER['HTTP_ACCEPT_LANGUAGE'], $languages[$langua | */ $config['available_languages'] = [ - 'arabic', - 'bulgarian', - 'catalan', - 'chinese', - 'czech', - 'danish', - 'dutch', 'english', - 'finnish', - 'french', - 'german', - 'greek', - 'hebrew', - 'hindi', - 'hungarian', - 'italian', - 'japanese', - 'luxembourgish', - 'marathi', - 'persian', - 'polish', - 'portuguese', - 'portuguese-br', - 'romanian', - 'russian', - 'slovak', - 'spanish', 'turkish' ]; diff --git a/application/language/arabic/calendar_lang.php b/application/language/arabic/calendar_lang.php deleted file mode 100644 index ce838142..00000000 --- a/application/language/arabic/calendar_lang.php +++ /dev/null @@ -1,84 +0,0 @@ - - - ٤٠٣ غير مصرح للوصول هنا - - - -

الوصول هنا غير مصرح به.

- - - diff --git a/application/language/arabic/migration_lang.php b/application/language/arabic/migration_lang.php deleted file mode 100644 index 4deda43a..00000000 --- a/application/language/arabic/migration_lang.php +++ /dev/null @@ -1,19 +0,0 @@ - - - 403 Forbidden - - - -

Directory access is forbidden.

- - - diff --git a/application/language/bulgarian/migration_lang.php b/application/language/bulgarian/migration_lang.php deleted file mode 100644 index db92704f..00000000 --- a/application/language/bulgarian/migration_lang.php +++ /dev/null @@ -1,20 +0,0 @@ - - - 403 Forbidden - - - -

Directory access is forbidden.

- - - diff --git a/application/language/catalan/migration_lang.php b/application/language/catalan/migration_lang.php deleted file mode 100644 index 62ce1526..00000000 --- a/application/language/catalan/migration_lang.php +++ /dev/null @@ -1,20 +0,0 @@ - - - 403 Forbidden - - - -

Directory access is forbidden.

- - - diff --git a/application/language/chinese/migration_lang.php b/application/language/chinese/migration_lang.php deleted file mode 100644 index dbb529b7..00000000 --- a/application/language/chinese/migration_lang.php +++ /dev/null @@ -1,19 +0,0 @@ - - - 403 Forbidden - - - -

Directory access is forbidden.

- - - diff --git a/application/language/czech/migration_lang.php b/application/language/czech/migration_lang.php deleted file mode 100644 index 21a7d99b..00000000 --- a/application/language/czech/migration_lang.php +++ /dev/null @@ -1,19 +0,0 @@ - - - 403 Forbidden - - - -

Directory access is forbidden.

- - - diff --git a/application/language/danish/migration_lang.php b/application/language/danish/migration_lang.php deleted file mode 100644 index 4ec44b96..00000000 --- a/application/language/danish/migration_lang.php +++ /dev/null @@ -1,19 +0,0 @@ - - - 403 Forbidden - - - -

Directory access is forbidden.

- - - diff --git a/application/language/dutch/migration_lang.php b/application/language/dutch/migration_lang.php deleted file mode 100644 index 5e7d4b7b..00000000 --- a/application/language/dutch/migration_lang.php +++ /dev/null @@ -1,20 +0,0 @@ - - - 403 Forbidden - - - -

Directory access is forbidden.

- - - diff --git a/application/language/finnish/migration_lang.php b/application/language/finnish/migration_lang.php deleted file mode 100644 index 188e14d3..00000000 --- a/application/language/finnish/migration_lang.php +++ /dev/null @@ -1,47 +0,0 @@ - - - 403 Forbidden - - - -

Directory access is forbidden.

- - - diff --git a/application/language/french/migration_lang.php b/application/language/french/migration_lang.php deleted file mode 100644 index 54ba26ac..00000000 --- a/application/language/french/migration_lang.php +++ /dev/null @@ -1,18 +0,0 @@ - - - 403 Forbidden - - - -

Directory access is forbidden.

- - - diff --git a/application/language/german/migration_lang.php b/application/language/german/migration_lang.php deleted file mode 100644 index cb7b3cbe..00000000 --- a/application/language/german/migration_lang.php +++ /dev/null @@ -1,19 +0,0 @@ - - - 403 Forbidden - - - -

Directory access is forbidden.

- - - diff --git a/application/language/greek/migration_lang.php b/application/language/greek/migration_lang.php deleted file mode 100644 index 15147517..00000000 --- a/application/language/greek/migration_lang.php +++ /dev/null @@ -1,20 +0,0 @@ - - - 403 Forbidden - - - -

Directory access is forbidden.

- - - diff --git a/application/language/hebrew/migration_lang.php b/application/language/hebrew/migration_lang.php deleted file mode 100644 index 298a63b3..00000000 --- a/application/language/hebrew/migration_lang.php +++ /dev/null @@ -1,20 +0,0 @@ - - - 403 Forbidden - - - -

Directory access is forbidden.

- - - diff --git a/application/language/hindi/migration_lang.php b/application/language/hindi/migration_lang.php deleted file mode 100644 index 7d71335b..00000000 --- a/application/language/hindi/migration_lang.php +++ /dev/null @@ -1,19 +0,0 @@ - - - 403 Forbidden - - - -

Directory access is forbidden.

- - - diff --git a/application/language/hungarian/migration_lang.php b/application/language/hungarian/migration_lang.php deleted file mode 100644 index a86265e2..00000000 --- a/application/language/hungarian/migration_lang.php +++ /dev/null @@ -1,19 +0,0 @@ - - - 403 Forbidden - - - -

Directory access is forbidden.

- - - diff --git a/application/language/italian/migration_lang.php b/application/language/italian/migration_lang.php deleted file mode 100644 index f9506107..00000000 --- a/application/language/italian/migration_lang.php +++ /dev/null @@ -1,20 +0,0 @@ - - - 403 Forbidden - - - -

Directory access is forbidden.

- - - diff --git a/application/language/japanese/migration_lang.php b/application/language/japanese/migration_lang.php deleted file mode 100644 index df245023..00000000 --- a/application/language/japanese/migration_lang.php +++ /dev/null @@ -1,19 +0,0 @@ - - - 403 Forbidden - - - -

Directory access is forbidden.

- - - diff --git a/application/language/luxembourgish/migration_lang.php b/application/language/luxembourgish/migration_lang.php deleted file mode 100644 index 188e14d3..00000000 --- a/application/language/luxembourgish/migration_lang.php +++ /dev/null @@ -1,47 +0,0 @@ - - - 403 Forbidden - - - -

Directory access is forbidden.

- - - diff --git a/application/language/marathi/migration_lang.php b/application/language/marathi/migration_lang.php deleted file mode 100644 index 9a6247ff..00000000 --- a/application/language/marathi/migration_lang.php +++ /dev/null @@ -1,19 +0,0 @@ - - - 403 Forbidden - - - -

Directory access is forbidden.

- - - diff --git a/application/language/persian/migration_lang.php b/application/language/persian/migration_lang.php deleted file mode 100644 index 0f826c0f..00000000 --- a/application/language/persian/migration_lang.php +++ /dev/null @@ -1,20 +0,0 @@ - - - 403 Forbidden - - - -

Directory access is forbidden.

- - - diff --git a/application/language/polish/migration_lang.php b/application/language/polish/migration_lang.php deleted file mode 100644 index b56af4dc..00000000 --- a/application/language/polish/migration_lang.php +++ /dev/null @@ -1,19 +0,0 @@ - - - 403 Forbidden - - - -

Directory access is forbidden.

- - - diff --git a/application/language/portuguese-br/migration_lang.php b/application/language/portuguese-br/migration_lang.php deleted file mode 100644 index 3eb311c6..00000000 --- a/application/language/portuguese-br/migration_lang.php +++ /dev/null @@ -1,19 +0,0 @@ - - - 403 Forbidden - - - -

Directory access is forbidden.

- - - diff --git a/application/language/portuguese/migration_lang.php b/application/language/portuguese/migration_lang.php deleted file mode 100644 index 5367e0cc..00000000 --- a/application/language/portuguese/migration_lang.php +++ /dev/null @@ -1,19 +0,0 @@ - - - 403 Forbidden - - - -

Directory access is forbidden.

- - - diff --git a/application/language/romanian/migration_lang.php b/application/language/romanian/migration_lang.php deleted file mode 100644 index 84c70043..00000000 --- a/application/language/romanian/migration_lang.php +++ /dev/null @@ -1,20 +0,0 @@ - - - 403 Forbidden - - - -

Directory access is forbidden.

- - - diff --git a/application/language/russian/migration_lang.php b/application/language/russian/migration_lang.php deleted file mode 100644 index 8f50fd58..00000000 --- a/application/language/russian/migration_lang.php +++ /dev/null @@ -1,19 +0,0 @@ - - * @copyright Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/) - * @license http://opensource.org/licenses/MIT MIT License - * @link https://codeigniter.com - */ -defined('BASEPATH') OR exit('No direct script access allowed'); - -$lang['db_invalid_connection_str'] = 'Nebolo možné zistiť databázové nastavenie podľa vloženého reťazca'; -$lang['db_unable_to_connect'] = 'Nepodarilo sa pripojiť k databáze s daným nastavením'; -$lang['db_unable_to_select'] = 'Nepodarilo sa vybrať (select) databázu: %s'; -$lang['db_unable_to_create'] = 'Nepodarilo sa vytvoriť danú databázu: %s'; -$lang['db_invalid_query'] = 'Odoslaná požiadavka nie je platná.'; -$lang['db_must_set_table'] = 'Musíte určiť databázovú tabuľku, ktorej sa požiadavka týka.'; -$lang['db_must_use_set'] = 'Musíte nastaviť metódu "set" pre úpravu záznamu.'; -$lang['db_must_use_index'] = 'Je nutné určiť párový index pre dávkový update).'; -$lang['db_batch_missing_index'] = 'Pre jeden alebo viac daných riadkov určených k dávkovému updatu chýba špecifikovaný index.'; -$lang['db_must_use_where'] = 'Nie je možné upravovať záznamy bez podmienky "where".'; -$lang['db_del_must_use_where'] = 'Nie je možné mazať záznamy bez podmienky "where".'; -$lang['db_field_param_missing'] = 'Spracovanie polí vyžaduje ako parameter názov tabuľky.'; -$lang['db_unsupported_function'] = 'Táto funkcia nie je dostupná v tomto type databázy.'; -$lang['db_transaction_failure'] = 'Chyba transakcie: aplikovaný Rollback'; -$lang['db_unable_to_drop'] = 'Nie je možné odstrániť požadovanú databázu.'; -$lang['db_unsupported_feature'] = 'Táto vlastnosť nie je dostupná pri aktuálnej platforme.'; -$lang['db_unsupported_compression'] = 'Zvolená kompresia súborov nie je podporovaná serverom.'; -$lang['db_filepath_error'] = 'Nepodarilo sa zapísať dáta do zadanej cesty.'; -$lang['db_invalid_cache_path'] = 'Zadaná cesta pre kešovanie nie je platná alebo do nej nemožno zapisovať.'; -$lang['db_table_name_required'] = 'Táto operácia potrebuje názov tabuľky.'; -$lang['db_column_name_required'] = 'Táto operácia potrebuje názov stĺpca.'; -$lang['db_column_definition_required'] = 'Táto operácia potrebuje definíciu stĺpca.'; -$lang['db_unable_to_set_charset'] = 'Nie je možné nastaviť znakovú sadu pripojenia: %s'; -$lang['db_error_heading'] = 'Nastala chyba databázy'; \ No newline at end of file diff --git a/application/language/slovak/email_lang.php b/application/language/slovak/email_lang.php deleted file mode 100644 index 3f113e43..00000000 --- a/application/language/slovak/email_lang.php +++ /dev/null @@ -1,31 +0,0 @@ - - * @copyright Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/) - * @license http://opensource.org/licenses/MIT MIT License - * @link https://codeigniter.com - */ -defined('BASEPATH') OR exit('No direct script access allowed'); - -$lang['email_must_be_array'] = 'Metóde na kontrolu e-mailu musí byť poslané pole.'; -$lang['email_invalid_address'] = 'Neplatná e-mailová adresa: %s'; -$lang['email_attachment_missing'] = 'Nie je možné nájsť prílohu e-mailu: %s'; -$lang['email_attachment_unreadable'] = 'Nepodarilo sa otvoriť prílohu: %s'; -$lang['email_no_from'] = 'Nie je možné odoslať e-mail bez odosielateľa.'; -$lang['email_no_recipients'] = 'Musíte uviesť príjemcu: Komu, Cc, alebo Bcc'; -$lang['email_send_failure_phpmail'] = 'Nie je možné poslať e-mail pomocou PHP funkcie mail(). Server nemusí byť nastavený pre posielanie e-mailov touto metódou.'; -$lang['email_send_failure_sendmail'] = 'Nie je možné poslať e-mail pomocou programu Sendmail. Server nemusí byť nastavený pre posielanie e-mailov touto metódou.'; -$lang['email_send_failure_smtp'] = 'Nie je možné poslať e-mail pomocou PHP funkcie pre SMTP. Server nemusí byť nastavený pre posielanie e-mailov touto metódou.'; -$lang['email_sent'] = 'Správa bola úspešne odoslaná pomocou protokolu: %s'; -$lang['email_no_socket'] = 'Nie je možné otvoriť prístup k programu Sendmail. Skontrolujte nastavenia.'; -$lang['email_no_hostname'] = 'Nie je nastavené meno SMTP servera'; -$lang['email_smtp_error'] = 'Bola zaznamenaná chyba SMTP: %s'; -$lang['email_no_smtp_unpw'] = 'Chyba: Musíte nastaviť užívateľské meno a heslo pre SMTP.'; -$lang['email_failed_smtp_login'] = 'Zlyhalo odoslanie príkazu AUTH LOGIN. Chyba: %s'; -$lang['email_smtp_auth_un'] = 'Zlyhalo overenie užívateľského mena. Chyba: %s'; -$lang['email_smtp_auth_pw'] = 'Zlyhalo overenie hesla. Chyba: %s'; -$lang['email_smtp_data_failure'] = 'Nie je možné odoslať dáta: %s'; -$lang['email_exit_status'] = 'Stav pri ukončení: %s'; diff --git a/application/language/slovak/form_validation_lang.php b/application/language/slovak/form_validation_lang.php deleted file mode 100644 index bdb02544..00000000 --- a/application/language/slovak/form_validation_lang.php +++ /dev/null @@ -1,69 +0,0 @@ - - - 403 Forbidden - - - -

Directory access is forbidden.

- - - diff --git a/application/language/slovak/migration_lang.php b/application/language/slovak/migration_lang.php deleted file mode 100644 index 899619b5..00000000 --- a/application/language/slovak/migration_lang.php +++ /dev/null @@ -1,20 +0,0 @@ - - * @copyright Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/) - * @license http://opensource.org/licenses/MIT MIT License - * @link https://codeigniter.com - */ -defined('BASEPATH') OR exit('No direct script access allowed'); - -$lang['migration_none_found'] = 'Žiadne migrácie neboli nájdené.'; -$lang['migration_not_found'] = 'Migrácia s číslom tejto verzie nebola nájdená: %s.'; -$lang['migration_sequence_gap'] = 'Chýbajúca migrácia v sekvencii blízko: %s.'; -$lang['migration_multiple_version'] = 'Existuje viacej migracií s rovnakým číslom verzie: %s.'; -$lang['migration_class_doesnt_exist'] = 'Trieda pre migráciu "%s" nebola nájdená.'; -$lang['migration_missing_up_method'] = 'V migračnej triede "%s" chýba "up" metoda.'; -$lang['migration_missing_down_method'] = 'V migračnej triede "%s" chýba "down" metoda.'; -$lang['migration_invalid_filename'] = 'Migrácia "%s" má chybné meno.'; diff --git a/application/language/slovak/number_lang.php b/application/language/slovak/number_lang.php deleted file mode 100644 index f1e50bd1..00000000 --- a/application/language/slovak/number_lang.php +++ /dev/null @@ -1,44 +0,0 @@ - - - 403 Forbidden - - - -

Directory access is forbidden.

- - - diff --git a/application/language/spanish/migration_lang.php b/application/language/spanish/migration_lang.php deleted file mode 100644 index a77dfc84..00000000 --- a/application/language/spanish/migration_lang.php +++ /dev/null @@ -1,20 +0,0 @@ - - Installation | Easy!Appointments + <?= lang('system_installation') ?> | <?= update_branding('GeneralServiceProvider')?> @@ -18,7 +18,7 @@
-

Easy!Appointments Installation

+

diff --git a/nginx_docker_localtest.sh b/nginx_docker_localtest.sh index c353084b..b304ab6f 100755 --- a/nginx_docker_localtest.sh +++ b/nginx_docker_localtest.sh @@ -5,12 +5,31 @@ CONT_NAME="IFLRANDEVU_NGINX_LOCALTEST" # nginx docker name MOUNT_PATH="/source" # binded mount path in nginx docker SCRIPT_NAME="nginx_docker_localtest.sh" # name of the *this* file +DEBUG="FALSE" ### REMOTE RELEASE ### LATEST_RELEASE="1.4.3-ifl.2" FILE_NAME="iflrandevu-$LATEST_RELEASE.zip" DOWNLOAD_LINK=https://git.aliberksandikci.com.tr/ifl/iflrandevu/releases/download/$LATEST_RELEASE/$FILE_NAME +WEB_ROOT_FOLDER="/usr/share/nginx/html/" + +HELP=""" +Usage: + dock [command] [subcommand] + +COMMANDS: + install: install iflrandevu + local: get from local /source/ + remote: get from git service + reconf : reconfigure configs + restart: restart services (nginx, mariadb, php-fpm) + update: update source files with new build on /source/ + help : see this help text + + +""" + CONFIG_FILE_CONTENT=""" >/root/.bashrc - eval "$(cat /root/.bashrc | tail -n +10)" + sleep 1 if [[ $2 == "restart" ]]; then service mariadb restart @@ -186,59 +216,73 @@ elif [[ $1 == "docker" ]]; then service mariadb status service php8.2-fpm status - echo - echo - echo "exiting..." - exit - fi + elif [[ $2 == "reconf" ]]; then - if [[ $2 == "reconf" ]]; then - - echo -e "$CONFIG_FILE_CONTENT" >"/usr/share/nginx/html/config.php" + echo -e "$CONFIG_FILE_CONTENT" >"$WEB_ROOT_FOLDER/config.php" echo -e "$NGINX_CONFIG_FILE" >"/etc/nginx/conf.d/default.conf" echo -e "$PHP_FPM_CONFIG_FILE" >"/etc/php/8.2/fpm/pool.d/iflrandevu.conf" echo RECONFIGURED echo - echo "exiting..." - exit - fi - apt update - apt install nano exa tree wget unzip less -y - cd /usr/share/nginx/html - # rm -f "50x.html" - rm -f "index.html" - if [[ $2 == "local" ]]; then - cp -r /source/build/* /usr/share/nginx/html/ - elif [[ $2 == "remote" ]]; then - wget $DOWNLOAD_LINK - unzip $FILE_NAME - mv $FILE_NAME ../ + _exit + elif [[ $2 == "update" ]]; then + echo "updating sources!" + rsync -av --progress /source/build/ $WEB_ROOT_FOLDER --exclude config.php --exclude storage + elif [[ $2 == "install" ]]; then + if [[ $# -eq 2 || ! ($3 == "local" || $3 == "remote") ]]; then + echo -e "use $_RED dock install local $NC or $_RED dock install remote" + _exit + fi + sleep 1 + apt update + apt install nano exa tree wget unzip less rsync -y + rm -rf $WEB_ROOT_FOLDER + mkdir -p $WEB_ROOT_FOLDER + cd $WEB_ROOT_FOLDER + if [[ $3 == "local" ]]; then + cp -r /source/build/* $WEB_ROOT_FOLDER/ + elif [[ $3 == "remote" ]]; then + wget "$DOWNLOAD_LINK" + sleep 3 + unzip $FILE_NAME + mv $FILE_NAME ../ + + else + echo -e "${_RED}use docker local or docker remote${_NC}" + fi + + ### CONFIGURATIONS ### + apt install php php-fpm -y + apt install mariadb-server php-mysql -y + service mariadb start + mysql -u root -e "create database iflrandevu" + mysql -u root -e "set password for root@localhost = password('root');" + echo -e "$CONFIG_FILE_CONTENT" >"$WEB_ROOT_FOLDER/config.php" + echo -e "$NGINX_CONFIG_FILE" >"/etc/nginx/conf.d/default.conf" + echo -e "$PHP_FPM_CONFIG_FILE" >"/etc/php/8.2/fpm/pool.d/iflrandevu.conf" + groupadd iflrandevu + useradd -g iflrandevu iflrandevu + cd $WEB_ROOT_FOLDER + chown iflrandevu:nginx -R . + chmod 770 storage + + service php8.2-fpm start + service nginx start + service nginx status + service nginx restart + echo -e "${_RED}DONE! - OPEN localhost:8000 TO TEST${_NC}" + elif [[ $2 == "help" ]]; then + echo -e "$HELP!" else - echo -e "${_RED}use docker local or docker remote${_NC}" + echo -e "$_RED ! COMMAND NOT FOUND ! $_NC" + echo + echo -e "$HELP" + exec bash fi - ### CONFIGURATIONS ### - apt install php php-fpm -y - apt install mariadb-server php-mysql -y - service mariadb start - mysql -u root -e "create database iflrandevu" - mysql -u root -e "set password for root@localhost = password('root');" - echo -e "$CONFIG_FILE_CONTENT" >"config.php" - echo -e "$NGINX_CONFIG_FILE" >"/etc/nginx/conf.d/default.conf" - echo -e "$PHP_FPM_CONFIG_FILE" >"/etc/php/8.2/fpm/pool.d/iflrandevu.conf" - groupadd iflrandevu - useradd -g iflrandevu iflrandevu - cd /usr/share/nginx/html - chown iflrandevu:nginx -R . - chmod 770 storage +else + echo -e "$_RED ! COMMAND NOT FOUND ! $_NC" - - service php8.2-fpm start - service nginx start - service nginx status - service nginx restart - echo -e "${_RED}DONE! - OPEN localhost:8000 TO TEST${_NC}" fi # TODO Docker compose to run with /docker/build/docker.sh container together diff --git a/package-lock.json b/package-lock.json index 7525b790..1e6c932f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5784,7 +5784,6 @@ "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz", "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==", "extraneous": true, - "hasInstallScript": true, "dependencies": { "bindings": "^1.5.0", "nan": "^2.12.1"