From 662ec330f84a4ea8af6d12c6cbb8e456fc90c79b Mon Sep 17 00:00:00 2001 From: tenzap Date: Tue, 1 Mar 2022 14:09:07 +0100 Subject: [PATCH 1/6] move media index.php and install to www --- index.php => www/index.php | 0 install => www/install | 0 {media => www/media}/css/base.css | 0 {media => www/media}/css/blue.css | 0 {media => www/media}/css/ie-fix.css | 0 {media => www/media}/css/index.html | 0 {media => www/media}/css/install.css | 0 {media => www/media}/css/jquery-plugin/index.html | 0 .../jquery.tagsinput-revisited.min.css | 0 .../media}/css/jquery-plugin/jquerycssmenu.css | 0 .../css/jquery-plugin/token-input-facebook.css | 0 .../media}/css/jquery-plugin/token-input.css | 0 .../media}/css/jquery-ui/images/index.html | 0 .../jquery-ui/images/ui-icons_444444_256x240.png | Bin .../jquery-ui/images/ui-icons_555555_256x240.png | Bin .../jquery-ui/images/ui-icons_777620_256x240.png | Bin .../jquery-ui/images/ui-icons_777777_256x240.png | Bin .../jquery-ui/images/ui-icons_cc0000_256x240.png | Bin .../jquery-ui/images/ui-icons_ffffff_256x240.png | Bin {media => www/media}/css/jquery-ui/index.html | 0 .../media}/css/jquery-ui/jquery-ui.min.css | 0 {media => www/media}/csv/contact_sample.csv | 0 {media => www/media}/csv/index.html | 0 {media => www/media}/csv/number_sample.csv | 0 {media => www/media}/db/cubrid_kalkun.sql | 0 {media => www/media}/db/cubrid_upgrade_kalkun.sql | 0 {media => www/media}/db/index.html | 0 {media => www/media}/db/mysql_b8_v3.sql | 0 {media => www/media}/db/mysql_kalkun.sql | 0 {media => www/media}/db/mysql_pbk_gammu.sql | 0 {media => www/media}/db/mysql_pbk_kalkun.sql | 0 .../media}/db/mysql_upgrade_kalkun_0.7.sql | 0 .../media}/db/mysql_upgrade_kalkun_0.8.sql | 0 {media => www/media}/db/pgsql_b8_v3.sql | 0 {media => www/media}/db/pgsql_kalkun.sql | 0 {media => www/media}/db/pgsql_pbk_gammu.sql | 0 {media => www/media}/db/pgsql_pbk_kalkun.sql | 0 .../media}/db/pgsql_upgrade_kalkun_0.7.sql | 0 .../media}/db/pgsql_upgrade_kalkun_0.8.sql | 0 {media => www/media}/db/sqlite_b8_v3.sql | 0 {media => www/media}/db/sqlite_kalkun.sql | 0 {media => www/media}/db/sqlite_pbk_gammu.sql | 0 {media => www/media}/db/sqlite_pbk_kalkun.sql | 0 .../media}/db/sqlite_upgrade_kalkun_0.7.sql | 0 .../media}/db/sqlite_upgrade_kalkun_0.8.sql | 0 {media => www/media}/images/arrow.png | Bin {media => www/media}/images/arrow_left.gif | Bin {media => www/media}/images/arrow_right.gif | Bin {media => www/media}/images/background.jpg | Bin {media => www/media}/images/bg-button.gif | Bin {media => www/media}/images/bg_search_input.gif | Bin {media => www/media}/images/button_bg.png | Bin {media => www/media}/images/calendar.gif | Bin {media => www/media}/images/circle.gif | Bin {media => www/media}/images/emoticons/COPYING | 0 .../media}/images/emoticons/face-angel.png | Bin .../media}/images/emoticons/face-crying.png | Bin .../media}/images/emoticons/face-devilish.png | Bin .../media}/images/emoticons/face-glasses.png | Bin {media => www/media}/images/emoticons/face-grin.png | Bin {media => www/media}/images/emoticons/face-kiss.png | Bin {media => www/media}/images/emoticons/face-love.png | Bin .../media}/images/emoticons/face-monkey.png | Bin .../media}/images/emoticons/face-plain.png | Bin {media => www/media}/images/emoticons/face-sad.png | Bin .../media}/images/emoticons/face-smile-big.png | Bin .../media}/images/emoticons/face-smile.png | Bin .../media}/images/emoticons/face-surprise.png | Bin .../media}/images/emoticons/face-unlove.png | Bin {media => www/media}/images/emoticons/face-wink.png | Bin {media => www/media}/images/emoticons/index.html | 0 {media => www/media}/images/icon.ico | Bin {media => www/media}/images/index.html | 0 {media => www/media}/images/kalkun_bg.png | Bin {media => www/media}/images/logo.png | Bin {media => www/media}/images/mascot.png | Bin {media => www/media}/images/processing.gif | Bin {media => www/media}/index.html | 0 {media => www/media}/js/Chart.bundle.min.js | 0 {media => www/media}/js/GPL-LICENSE.txt | 0 {media => www/media}/js/MIT-LICENSE.txt | 0 {media => www/media}/js/autosize-5.0.1.min.js | 0 {media => www/media}/js/index.html | 0 {media => www/media}/js/jquery-3.6.0.min.js | 0 {media => www/media}/js/jquery-plugin/index.html | 0 .../media}/js/jquery-plugin/jquery.emoticons.min.js | 0 .../media}/js/jquery-plugin/jquery.field.min.js | 0 .../media}/js/jquery-plugin/jquery.form.min.js | 0 .../media}/js/jquery-plugin/jquery.hotkeys.js | 0 .../jquery-plugin/jquery.tagsinput-revisited.min.js | 0 .../js/jquery-plugin/jquery.tokeninput.min.js | 0 .../media}/js/jquery-plugin/jquery.validate.min.js | 0 .../media}/js/jquery-ui/i18n/datepicker-cs.js | 0 .../media}/js/jquery-ui/i18n/datepicker-da.js | 0 .../media}/js/jquery-ui/i18n/datepicker-de.js | 0 .../media}/js/jquery-ui/i18n/datepicker-es.js | 0 .../media}/js/jquery-ui/i18n/datepicker-fi.js | 0 .../media}/js/jquery-ui/i18n/datepicker-fr.js | 0 .../media}/js/jquery-ui/i18n/datepicker-hu.js | 0 .../media}/js/jquery-ui/i18n/datepicker-id.js | 0 .../media}/js/jquery-ui/i18n/datepicker-it.js | 0 .../media}/js/jquery-ui/i18n/datepicker-nl.js | 0 .../media}/js/jquery-ui/i18n/datepicker-pl.js | 0 .../media}/js/jquery-ui/i18n/datepicker-pt-BR.js | 0 .../media}/js/jquery-ui/i18n/datepicker-pt.js | 0 .../media}/js/jquery-ui/i18n/datepicker-ru.js | 0 .../media}/js/jquery-ui/i18n/datepicker-sk.js | 0 .../media}/js/jquery-ui/i18n/datepicker-tr.js | 0 {media => www/media}/js/jquery-ui/i18n/index.html | 0 {media => www/media}/js/jquery-ui/index.html | 0 {media => www/media}/js/jquery-ui/jquery-ui.min.js | 0 {media => www/media}/js/modernizr.min.js | 0 {media => www/media}/sound/index.html | 0 {media => www/media}/sound/ponderous.m4a | Bin 114 files changed, 0 insertions(+), 0 deletions(-) rename index.php => www/index.php (100%) rename install => www/install (100%) rename {media => www/media}/css/base.css (100%) rename {media => www/media}/css/blue.css (100%) rename {media => www/media}/css/ie-fix.css (100%) rename {media => www/media}/css/index.html (100%) rename {media => www/media}/css/install.css (100%) rename {media => www/media}/css/jquery-plugin/index.html (100%) rename {media => www/media}/css/jquery-plugin/jquery.tagsinput-revisited.min.css (100%) rename {media => www/media}/css/jquery-plugin/jquerycssmenu.css (100%) rename {media => www/media}/css/jquery-plugin/token-input-facebook.css (100%) rename {media => www/media}/css/jquery-plugin/token-input.css (100%) rename {media => www/media}/css/jquery-ui/images/index.html (100%) rename {media => www/media}/css/jquery-ui/images/ui-icons_444444_256x240.png (100%) rename {media => www/media}/css/jquery-ui/images/ui-icons_555555_256x240.png (100%) rename {media => www/media}/css/jquery-ui/images/ui-icons_777620_256x240.png (100%) rename {media => www/media}/css/jquery-ui/images/ui-icons_777777_256x240.png (100%) rename {media => www/media}/css/jquery-ui/images/ui-icons_cc0000_256x240.png (100%) rename {media => www/media}/css/jquery-ui/images/ui-icons_ffffff_256x240.png (100%) rename {media => www/media}/css/jquery-ui/index.html (100%) rename {media => www/media}/css/jquery-ui/jquery-ui.min.css (100%) rename {media => www/media}/csv/contact_sample.csv (100%) rename {media => www/media}/csv/index.html (100%) rename {media => www/media}/csv/number_sample.csv (100%) rename {media => www/media}/db/cubrid_kalkun.sql (100%) rename {media => www/media}/db/cubrid_upgrade_kalkun.sql (100%) rename {media => www/media}/db/index.html (100%) rename {media => www/media}/db/mysql_b8_v3.sql (100%) rename {media => www/media}/db/mysql_kalkun.sql (100%) rename {media => www/media}/db/mysql_pbk_gammu.sql (100%) rename {media => www/media}/db/mysql_pbk_kalkun.sql (100%) rename {media => www/media}/db/mysql_upgrade_kalkun_0.7.sql (100%) rename {media => www/media}/db/mysql_upgrade_kalkun_0.8.sql (100%) rename {media => www/media}/db/pgsql_b8_v3.sql (100%) rename {media => www/media}/db/pgsql_kalkun.sql (100%) rename {media => www/media}/db/pgsql_pbk_gammu.sql (100%) rename {media => www/media}/db/pgsql_pbk_kalkun.sql (100%) rename {media => www/media}/db/pgsql_upgrade_kalkun_0.7.sql (100%) rename {media => www/media}/db/pgsql_upgrade_kalkun_0.8.sql (100%) rename {media => www/media}/db/sqlite_b8_v3.sql (100%) rename {media => www/media}/db/sqlite_kalkun.sql (100%) rename {media => www/media}/db/sqlite_pbk_gammu.sql (100%) rename {media => www/media}/db/sqlite_pbk_kalkun.sql (100%) rename {media => www/media}/db/sqlite_upgrade_kalkun_0.7.sql (100%) rename {media => www/media}/db/sqlite_upgrade_kalkun_0.8.sql (100%) rename {media => www/media}/images/arrow.png (100%) rename {media => www/media}/images/arrow_left.gif (100%) rename {media => www/media}/images/arrow_right.gif (100%) rename {media => www/media}/images/background.jpg (100%) rename {media => www/media}/images/bg-button.gif (100%) rename {media => www/media}/images/bg_search_input.gif (100%) rename {media => www/media}/images/button_bg.png (100%) rename {media => www/media}/images/calendar.gif (100%) rename {media => www/media}/images/circle.gif (100%) rename {media => www/media}/images/emoticons/COPYING (100%) rename {media => www/media}/images/emoticons/face-angel.png (100%) rename {media => www/media}/images/emoticons/face-crying.png (100%) rename {media => www/media}/images/emoticons/face-devilish.png (100%) rename {media => www/media}/images/emoticons/face-glasses.png (100%) rename {media => www/media}/images/emoticons/face-grin.png (100%) rename {media => www/media}/images/emoticons/face-kiss.png (100%) rename {media => www/media}/images/emoticons/face-love.png (100%) rename {media => www/media}/images/emoticons/face-monkey.png (100%) rename {media => www/media}/images/emoticons/face-plain.png (100%) rename {media => www/media}/images/emoticons/face-sad.png (100%) rename {media => www/media}/images/emoticons/face-smile-big.png (100%) rename {media => www/media}/images/emoticons/face-smile.png (100%) rename {media => www/media}/images/emoticons/face-surprise.png (100%) rename {media => www/media}/images/emoticons/face-unlove.png (100%) rename {media => www/media}/images/emoticons/face-wink.png (100%) rename {media => www/media}/images/emoticons/index.html (100%) rename {media => www/media}/images/icon.ico (100%) rename {media => www/media}/images/index.html (100%) rename {media => www/media}/images/kalkun_bg.png (100%) rename {media => www/media}/images/logo.png (100%) rename {media => www/media}/images/mascot.png (100%) rename {media => www/media}/images/processing.gif (100%) rename {media => www/media}/index.html (100%) rename {media => www/media}/js/Chart.bundle.min.js (100%) rename {media => www/media}/js/GPL-LICENSE.txt (100%) rename {media => www/media}/js/MIT-LICENSE.txt (100%) rename {media => www/media}/js/autosize-5.0.1.min.js (100%) rename {media => www/media}/js/index.html (100%) rename {media => www/media}/js/jquery-3.6.0.min.js (100%) rename {media => www/media}/js/jquery-plugin/index.html (100%) rename {media => www/media}/js/jquery-plugin/jquery.emoticons.min.js (100%) rename {media => www/media}/js/jquery-plugin/jquery.field.min.js (100%) rename {media => www/media}/js/jquery-plugin/jquery.form.min.js (100%) rename {media => www/media}/js/jquery-plugin/jquery.hotkeys.js (100%) rename {media => www/media}/js/jquery-plugin/jquery.tagsinput-revisited.min.js (100%) rename {media => www/media}/js/jquery-plugin/jquery.tokeninput.min.js (100%) rename {media => www/media}/js/jquery-plugin/jquery.validate.min.js (100%) rename {media => www/media}/js/jquery-ui/i18n/datepicker-cs.js (100%) rename {media => www/media}/js/jquery-ui/i18n/datepicker-da.js (100%) rename {media => www/media}/js/jquery-ui/i18n/datepicker-de.js (100%) rename {media => www/media}/js/jquery-ui/i18n/datepicker-es.js (100%) rename {media => www/media}/js/jquery-ui/i18n/datepicker-fi.js (100%) rename {media => www/media}/js/jquery-ui/i18n/datepicker-fr.js (100%) rename {media => www/media}/js/jquery-ui/i18n/datepicker-hu.js (100%) rename {media => www/media}/js/jquery-ui/i18n/datepicker-id.js (100%) rename {media => www/media}/js/jquery-ui/i18n/datepicker-it.js (100%) rename {media => www/media}/js/jquery-ui/i18n/datepicker-nl.js (100%) rename {media => www/media}/js/jquery-ui/i18n/datepicker-pl.js (100%) rename {media => www/media}/js/jquery-ui/i18n/datepicker-pt-BR.js (100%) rename {media => www/media}/js/jquery-ui/i18n/datepicker-pt.js (100%) rename {media => www/media}/js/jquery-ui/i18n/datepicker-ru.js (100%) rename {media => www/media}/js/jquery-ui/i18n/datepicker-sk.js (100%) rename {media => www/media}/js/jquery-ui/i18n/datepicker-tr.js (100%) rename {media => www/media}/js/jquery-ui/i18n/index.html (100%) rename {media => www/media}/js/jquery-ui/index.html (100%) rename {media => www/media}/js/jquery-ui/jquery-ui.min.js (100%) rename {media => www/media}/js/modernizr.min.js (100%) rename {media => www/media}/sound/index.html (100%) rename {media => www/media}/sound/ponderous.m4a (100%) diff --git a/index.php b/www/index.php similarity index 100% rename from index.php rename to www/index.php diff --git a/install b/www/install similarity index 100% rename from install rename to www/install diff --git a/media/css/base.css b/www/media/css/base.css similarity index 100% rename from media/css/base.css rename to www/media/css/base.css diff --git a/media/css/blue.css b/www/media/css/blue.css similarity index 100% rename from media/css/blue.css rename to www/media/css/blue.css diff --git a/media/css/ie-fix.css b/www/media/css/ie-fix.css similarity index 100% rename from media/css/ie-fix.css rename to www/media/css/ie-fix.css diff --git a/media/css/index.html b/www/media/css/index.html similarity index 100% rename from media/css/index.html rename to www/media/css/index.html diff --git a/media/css/install.css b/www/media/css/install.css similarity index 100% rename from media/css/install.css rename to www/media/css/install.css diff --git a/media/css/jquery-plugin/index.html b/www/media/css/jquery-plugin/index.html similarity index 100% rename from media/css/jquery-plugin/index.html rename to www/media/css/jquery-plugin/index.html diff --git a/media/css/jquery-plugin/jquery.tagsinput-revisited.min.css b/www/media/css/jquery-plugin/jquery.tagsinput-revisited.min.css similarity index 100% rename from media/css/jquery-plugin/jquery.tagsinput-revisited.min.css rename to www/media/css/jquery-plugin/jquery.tagsinput-revisited.min.css diff --git a/media/css/jquery-plugin/jquerycssmenu.css b/www/media/css/jquery-plugin/jquerycssmenu.css similarity index 100% rename from media/css/jquery-plugin/jquerycssmenu.css rename to www/media/css/jquery-plugin/jquerycssmenu.css diff --git a/media/css/jquery-plugin/token-input-facebook.css b/www/media/css/jquery-plugin/token-input-facebook.css similarity index 100% rename from media/css/jquery-plugin/token-input-facebook.css rename to www/media/css/jquery-plugin/token-input-facebook.css diff --git a/media/css/jquery-plugin/token-input.css b/www/media/css/jquery-plugin/token-input.css similarity index 100% rename from media/css/jquery-plugin/token-input.css rename to www/media/css/jquery-plugin/token-input.css diff --git a/media/css/jquery-ui/images/index.html b/www/media/css/jquery-ui/images/index.html similarity index 100% rename from media/css/jquery-ui/images/index.html rename to www/media/css/jquery-ui/images/index.html diff --git a/media/css/jquery-ui/images/ui-icons_444444_256x240.png b/www/media/css/jquery-ui/images/ui-icons_444444_256x240.png similarity index 100% rename from media/css/jquery-ui/images/ui-icons_444444_256x240.png rename to www/media/css/jquery-ui/images/ui-icons_444444_256x240.png diff --git a/media/css/jquery-ui/images/ui-icons_555555_256x240.png b/www/media/css/jquery-ui/images/ui-icons_555555_256x240.png similarity index 100% rename from media/css/jquery-ui/images/ui-icons_555555_256x240.png rename to www/media/css/jquery-ui/images/ui-icons_555555_256x240.png diff --git a/media/css/jquery-ui/images/ui-icons_777620_256x240.png b/www/media/css/jquery-ui/images/ui-icons_777620_256x240.png similarity index 100% rename from media/css/jquery-ui/images/ui-icons_777620_256x240.png rename to www/media/css/jquery-ui/images/ui-icons_777620_256x240.png diff --git a/media/css/jquery-ui/images/ui-icons_777777_256x240.png b/www/media/css/jquery-ui/images/ui-icons_777777_256x240.png similarity index 100% rename from media/css/jquery-ui/images/ui-icons_777777_256x240.png rename to www/media/css/jquery-ui/images/ui-icons_777777_256x240.png diff --git a/media/css/jquery-ui/images/ui-icons_cc0000_256x240.png b/www/media/css/jquery-ui/images/ui-icons_cc0000_256x240.png similarity index 100% rename from media/css/jquery-ui/images/ui-icons_cc0000_256x240.png rename to www/media/css/jquery-ui/images/ui-icons_cc0000_256x240.png diff --git a/media/css/jquery-ui/images/ui-icons_ffffff_256x240.png b/www/media/css/jquery-ui/images/ui-icons_ffffff_256x240.png similarity index 100% rename from media/css/jquery-ui/images/ui-icons_ffffff_256x240.png rename to www/media/css/jquery-ui/images/ui-icons_ffffff_256x240.png diff --git a/media/css/jquery-ui/index.html b/www/media/css/jquery-ui/index.html similarity index 100% rename from media/css/jquery-ui/index.html rename to www/media/css/jquery-ui/index.html diff --git a/media/css/jquery-ui/jquery-ui.min.css b/www/media/css/jquery-ui/jquery-ui.min.css similarity index 100% rename from media/css/jquery-ui/jquery-ui.min.css rename to www/media/css/jquery-ui/jquery-ui.min.css diff --git a/media/csv/contact_sample.csv b/www/media/csv/contact_sample.csv similarity index 100% rename from media/csv/contact_sample.csv rename to www/media/csv/contact_sample.csv diff --git a/media/csv/index.html b/www/media/csv/index.html similarity index 100% rename from media/csv/index.html rename to www/media/csv/index.html diff --git a/media/csv/number_sample.csv b/www/media/csv/number_sample.csv similarity index 100% rename from media/csv/number_sample.csv rename to www/media/csv/number_sample.csv diff --git a/media/db/cubrid_kalkun.sql b/www/media/db/cubrid_kalkun.sql similarity index 100% rename from media/db/cubrid_kalkun.sql rename to www/media/db/cubrid_kalkun.sql diff --git a/media/db/cubrid_upgrade_kalkun.sql b/www/media/db/cubrid_upgrade_kalkun.sql similarity index 100% rename from media/db/cubrid_upgrade_kalkun.sql rename to www/media/db/cubrid_upgrade_kalkun.sql diff --git a/media/db/index.html b/www/media/db/index.html similarity index 100% rename from media/db/index.html rename to www/media/db/index.html diff --git a/media/db/mysql_b8_v3.sql b/www/media/db/mysql_b8_v3.sql similarity index 100% rename from media/db/mysql_b8_v3.sql rename to www/media/db/mysql_b8_v3.sql diff --git a/media/db/mysql_kalkun.sql b/www/media/db/mysql_kalkun.sql similarity index 100% rename from media/db/mysql_kalkun.sql rename to www/media/db/mysql_kalkun.sql diff --git a/media/db/mysql_pbk_gammu.sql b/www/media/db/mysql_pbk_gammu.sql similarity index 100% rename from media/db/mysql_pbk_gammu.sql rename to www/media/db/mysql_pbk_gammu.sql diff --git a/media/db/mysql_pbk_kalkun.sql b/www/media/db/mysql_pbk_kalkun.sql similarity index 100% rename from media/db/mysql_pbk_kalkun.sql rename to www/media/db/mysql_pbk_kalkun.sql diff --git a/media/db/mysql_upgrade_kalkun_0.7.sql b/www/media/db/mysql_upgrade_kalkun_0.7.sql similarity index 100% rename from media/db/mysql_upgrade_kalkun_0.7.sql rename to www/media/db/mysql_upgrade_kalkun_0.7.sql diff --git a/media/db/mysql_upgrade_kalkun_0.8.sql b/www/media/db/mysql_upgrade_kalkun_0.8.sql similarity index 100% rename from media/db/mysql_upgrade_kalkun_0.8.sql rename to www/media/db/mysql_upgrade_kalkun_0.8.sql diff --git a/media/db/pgsql_b8_v3.sql b/www/media/db/pgsql_b8_v3.sql similarity index 100% rename from media/db/pgsql_b8_v3.sql rename to www/media/db/pgsql_b8_v3.sql diff --git a/media/db/pgsql_kalkun.sql b/www/media/db/pgsql_kalkun.sql similarity index 100% rename from media/db/pgsql_kalkun.sql rename to www/media/db/pgsql_kalkun.sql diff --git a/media/db/pgsql_pbk_gammu.sql b/www/media/db/pgsql_pbk_gammu.sql similarity index 100% rename from media/db/pgsql_pbk_gammu.sql rename to www/media/db/pgsql_pbk_gammu.sql diff --git a/media/db/pgsql_pbk_kalkun.sql b/www/media/db/pgsql_pbk_kalkun.sql similarity index 100% rename from media/db/pgsql_pbk_kalkun.sql rename to www/media/db/pgsql_pbk_kalkun.sql diff --git a/media/db/pgsql_upgrade_kalkun_0.7.sql b/www/media/db/pgsql_upgrade_kalkun_0.7.sql similarity index 100% rename from media/db/pgsql_upgrade_kalkun_0.7.sql rename to www/media/db/pgsql_upgrade_kalkun_0.7.sql diff --git a/media/db/pgsql_upgrade_kalkun_0.8.sql b/www/media/db/pgsql_upgrade_kalkun_0.8.sql similarity index 100% rename from media/db/pgsql_upgrade_kalkun_0.8.sql rename to www/media/db/pgsql_upgrade_kalkun_0.8.sql diff --git a/media/db/sqlite_b8_v3.sql b/www/media/db/sqlite_b8_v3.sql similarity index 100% rename from media/db/sqlite_b8_v3.sql rename to www/media/db/sqlite_b8_v3.sql diff --git a/media/db/sqlite_kalkun.sql b/www/media/db/sqlite_kalkun.sql similarity index 100% rename from media/db/sqlite_kalkun.sql rename to www/media/db/sqlite_kalkun.sql diff --git a/media/db/sqlite_pbk_gammu.sql b/www/media/db/sqlite_pbk_gammu.sql similarity index 100% rename from media/db/sqlite_pbk_gammu.sql rename to www/media/db/sqlite_pbk_gammu.sql diff --git a/media/db/sqlite_pbk_kalkun.sql b/www/media/db/sqlite_pbk_kalkun.sql similarity index 100% rename from media/db/sqlite_pbk_kalkun.sql rename to www/media/db/sqlite_pbk_kalkun.sql diff --git a/media/db/sqlite_upgrade_kalkun_0.7.sql b/www/media/db/sqlite_upgrade_kalkun_0.7.sql similarity index 100% rename from media/db/sqlite_upgrade_kalkun_0.7.sql rename to www/media/db/sqlite_upgrade_kalkun_0.7.sql diff --git a/media/db/sqlite_upgrade_kalkun_0.8.sql b/www/media/db/sqlite_upgrade_kalkun_0.8.sql similarity index 100% rename from media/db/sqlite_upgrade_kalkun_0.8.sql rename to www/media/db/sqlite_upgrade_kalkun_0.8.sql diff --git a/media/images/arrow.png b/www/media/images/arrow.png similarity index 100% rename from media/images/arrow.png rename to www/media/images/arrow.png diff --git a/media/images/arrow_left.gif b/www/media/images/arrow_left.gif similarity index 100% rename from media/images/arrow_left.gif rename to www/media/images/arrow_left.gif diff --git a/media/images/arrow_right.gif b/www/media/images/arrow_right.gif similarity index 100% rename from media/images/arrow_right.gif rename to www/media/images/arrow_right.gif diff --git a/media/images/background.jpg b/www/media/images/background.jpg similarity index 100% rename from media/images/background.jpg rename to www/media/images/background.jpg diff --git a/media/images/bg-button.gif b/www/media/images/bg-button.gif similarity index 100% rename from media/images/bg-button.gif rename to www/media/images/bg-button.gif diff --git a/media/images/bg_search_input.gif b/www/media/images/bg_search_input.gif similarity index 100% rename from media/images/bg_search_input.gif rename to www/media/images/bg_search_input.gif diff --git a/media/images/button_bg.png b/www/media/images/button_bg.png similarity index 100% rename from media/images/button_bg.png rename to www/media/images/button_bg.png diff --git a/media/images/calendar.gif b/www/media/images/calendar.gif similarity index 100% rename from media/images/calendar.gif rename to www/media/images/calendar.gif diff --git a/media/images/circle.gif b/www/media/images/circle.gif similarity index 100% rename from media/images/circle.gif rename to www/media/images/circle.gif diff --git a/media/images/emoticons/COPYING b/www/media/images/emoticons/COPYING similarity index 100% rename from media/images/emoticons/COPYING rename to www/media/images/emoticons/COPYING diff --git a/media/images/emoticons/face-angel.png b/www/media/images/emoticons/face-angel.png similarity index 100% rename from media/images/emoticons/face-angel.png rename to www/media/images/emoticons/face-angel.png diff --git a/media/images/emoticons/face-crying.png b/www/media/images/emoticons/face-crying.png similarity index 100% rename from media/images/emoticons/face-crying.png rename to www/media/images/emoticons/face-crying.png diff --git a/media/images/emoticons/face-devilish.png b/www/media/images/emoticons/face-devilish.png similarity index 100% rename from media/images/emoticons/face-devilish.png rename to www/media/images/emoticons/face-devilish.png diff --git a/media/images/emoticons/face-glasses.png b/www/media/images/emoticons/face-glasses.png similarity index 100% rename from media/images/emoticons/face-glasses.png rename to www/media/images/emoticons/face-glasses.png diff --git a/media/images/emoticons/face-grin.png b/www/media/images/emoticons/face-grin.png similarity index 100% rename from media/images/emoticons/face-grin.png rename to www/media/images/emoticons/face-grin.png diff --git a/media/images/emoticons/face-kiss.png b/www/media/images/emoticons/face-kiss.png similarity index 100% rename from media/images/emoticons/face-kiss.png rename to www/media/images/emoticons/face-kiss.png diff --git a/media/images/emoticons/face-love.png b/www/media/images/emoticons/face-love.png similarity index 100% rename from media/images/emoticons/face-love.png rename to www/media/images/emoticons/face-love.png diff --git a/media/images/emoticons/face-monkey.png b/www/media/images/emoticons/face-monkey.png similarity index 100% rename from media/images/emoticons/face-monkey.png rename to www/media/images/emoticons/face-monkey.png diff --git a/media/images/emoticons/face-plain.png b/www/media/images/emoticons/face-plain.png similarity index 100% rename from media/images/emoticons/face-plain.png rename to www/media/images/emoticons/face-plain.png diff --git a/media/images/emoticons/face-sad.png b/www/media/images/emoticons/face-sad.png similarity index 100% rename from media/images/emoticons/face-sad.png rename to www/media/images/emoticons/face-sad.png diff --git a/media/images/emoticons/face-smile-big.png b/www/media/images/emoticons/face-smile-big.png similarity index 100% rename from media/images/emoticons/face-smile-big.png rename to www/media/images/emoticons/face-smile-big.png diff --git a/media/images/emoticons/face-smile.png b/www/media/images/emoticons/face-smile.png similarity index 100% rename from media/images/emoticons/face-smile.png rename to www/media/images/emoticons/face-smile.png diff --git a/media/images/emoticons/face-surprise.png b/www/media/images/emoticons/face-surprise.png similarity index 100% rename from media/images/emoticons/face-surprise.png rename to www/media/images/emoticons/face-surprise.png diff --git a/media/images/emoticons/face-unlove.png b/www/media/images/emoticons/face-unlove.png similarity index 100% rename from media/images/emoticons/face-unlove.png rename to www/media/images/emoticons/face-unlove.png diff --git a/media/images/emoticons/face-wink.png b/www/media/images/emoticons/face-wink.png similarity index 100% rename from media/images/emoticons/face-wink.png rename to www/media/images/emoticons/face-wink.png diff --git a/media/images/emoticons/index.html b/www/media/images/emoticons/index.html similarity index 100% rename from media/images/emoticons/index.html rename to www/media/images/emoticons/index.html diff --git a/media/images/icon.ico b/www/media/images/icon.ico similarity index 100% rename from media/images/icon.ico rename to www/media/images/icon.ico diff --git a/media/images/index.html b/www/media/images/index.html similarity index 100% rename from media/images/index.html rename to www/media/images/index.html diff --git a/media/images/kalkun_bg.png b/www/media/images/kalkun_bg.png similarity index 100% rename from media/images/kalkun_bg.png rename to www/media/images/kalkun_bg.png diff --git a/media/images/logo.png b/www/media/images/logo.png similarity index 100% rename from media/images/logo.png rename to www/media/images/logo.png diff --git a/media/images/mascot.png b/www/media/images/mascot.png similarity index 100% rename from media/images/mascot.png rename to www/media/images/mascot.png diff --git a/media/images/processing.gif b/www/media/images/processing.gif similarity index 100% rename from media/images/processing.gif rename to www/media/images/processing.gif diff --git a/media/index.html b/www/media/index.html similarity index 100% rename from media/index.html rename to www/media/index.html diff --git a/media/js/Chart.bundle.min.js b/www/media/js/Chart.bundle.min.js similarity index 100% rename from media/js/Chart.bundle.min.js rename to www/media/js/Chart.bundle.min.js diff --git a/media/js/GPL-LICENSE.txt b/www/media/js/GPL-LICENSE.txt similarity index 100% rename from media/js/GPL-LICENSE.txt rename to www/media/js/GPL-LICENSE.txt diff --git a/media/js/MIT-LICENSE.txt b/www/media/js/MIT-LICENSE.txt similarity index 100% rename from media/js/MIT-LICENSE.txt rename to www/media/js/MIT-LICENSE.txt diff --git a/media/js/autosize-5.0.1.min.js b/www/media/js/autosize-5.0.1.min.js similarity index 100% rename from media/js/autosize-5.0.1.min.js rename to www/media/js/autosize-5.0.1.min.js diff --git a/media/js/index.html b/www/media/js/index.html similarity index 100% rename from media/js/index.html rename to www/media/js/index.html diff --git a/media/js/jquery-3.6.0.min.js b/www/media/js/jquery-3.6.0.min.js similarity index 100% rename from media/js/jquery-3.6.0.min.js rename to www/media/js/jquery-3.6.0.min.js diff --git a/media/js/jquery-plugin/index.html b/www/media/js/jquery-plugin/index.html similarity index 100% rename from media/js/jquery-plugin/index.html rename to www/media/js/jquery-plugin/index.html diff --git a/media/js/jquery-plugin/jquery.emoticons.min.js b/www/media/js/jquery-plugin/jquery.emoticons.min.js similarity index 100% rename from media/js/jquery-plugin/jquery.emoticons.min.js rename to www/media/js/jquery-plugin/jquery.emoticons.min.js diff --git a/media/js/jquery-plugin/jquery.field.min.js b/www/media/js/jquery-plugin/jquery.field.min.js similarity index 100% rename from media/js/jquery-plugin/jquery.field.min.js rename to www/media/js/jquery-plugin/jquery.field.min.js diff --git a/media/js/jquery-plugin/jquery.form.min.js b/www/media/js/jquery-plugin/jquery.form.min.js similarity index 100% rename from media/js/jquery-plugin/jquery.form.min.js rename to www/media/js/jquery-plugin/jquery.form.min.js diff --git a/media/js/jquery-plugin/jquery.hotkeys.js b/www/media/js/jquery-plugin/jquery.hotkeys.js similarity index 100% rename from media/js/jquery-plugin/jquery.hotkeys.js rename to www/media/js/jquery-plugin/jquery.hotkeys.js diff --git a/media/js/jquery-plugin/jquery.tagsinput-revisited.min.js b/www/media/js/jquery-plugin/jquery.tagsinput-revisited.min.js similarity index 100% rename from media/js/jquery-plugin/jquery.tagsinput-revisited.min.js rename to www/media/js/jquery-plugin/jquery.tagsinput-revisited.min.js diff --git a/media/js/jquery-plugin/jquery.tokeninput.min.js b/www/media/js/jquery-plugin/jquery.tokeninput.min.js similarity index 100% rename from media/js/jquery-plugin/jquery.tokeninput.min.js rename to www/media/js/jquery-plugin/jquery.tokeninput.min.js diff --git a/media/js/jquery-plugin/jquery.validate.min.js b/www/media/js/jquery-plugin/jquery.validate.min.js similarity index 100% rename from media/js/jquery-plugin/jquery.validate.min.js rename to www/media/js/jquery-plugin/jquery.validate.min.js diff --git a/media/js/jquery-ui/i18n/datepicker-cs.js b/www/media/js/jquery-ui/i18n/datepicker-cs.js similarity index 100% rename from media/js/jquery-ui/i18n/datepicker-cs.js rename to www/media/js/jquery-ui/i18n/datepicker-cs.js diff --git a/media/js/jquery-ui/i18n/datepicker-da.js b/www/media/js/jquery-ui/i18n/datepicker-da.js similarity index 100% rename from media/js/jquery-ui/i18n/datepicker-da.js rename to www/media/js/jquery-ui/i18n/datepicker-da.js diff --git a/media/js/jquery-ui/i18n/datepicker-de.js b/www/media/js/jquery-ui/i18n/datepicker-de.js similarity index 100% rename from media/js/jquery-ui/i18n/datepicker-de.js rename to www/media/js/jquery-ui/i18n/datepicker-de.js diff --git a/media/js/jquery-ui/i18n/datepicker-es.js b/www/media/js/jquery-ui/i18n/datepicker-es.js similarity index 100% rename from media/js/jquery-ui/i18n/datepicker-es.js rename to www/media/js/jquery-ui/i18n/datepicker-es.js diff --git a/media/js/jquery-ui/i18n/datepicker-fi.js b/www/media/js/jquery-ui/i18n/datepicker-fi.js similarity index 100% rename from media/js/jquery-ui/i18n/datepicker-fi.js rename to www/media/js/jquery-ui/i18n/datepicker-fi.js diff --git a/media/js/jquery-ui/i18n/datepicker-fr.js b/www/media/js/jquery-ui/i18n/datepicker-fr.js similarity index 100% rename from media/js/jquery-ui/i18n/datepicker-fr.js rename to www/media/js/jquery-ui/i18n/datepicker-fr.js diff --git a/media/js/jquery-ui/i18n/datepicker-hu.js b/www/media/js/jquery-ui/i18n/datepicker-hu.js similarity index 100% rename from media/js/jquery-ui/i18n/datepicker-hu.js rename to www/media/js/jquery-ui/i18n/datepicker-hu.js diff --git a/media/js/jquery-ui/i18n/datepicker-id.js b/www/media/js/jquery-ui/i18n/datepicker-id.js similarity index 100% rename from media/js/jquery-ui/i18n/datepicker-id.js rename to www/media/js/jquery-ui/i18n/datepicker-id.js diff --git a/media/js/jquery-ui/i18n/datepicker-it.js b/www/media/js/jquery-ui/i18n/datepicker-it.js similarity index 100% rename from media/js/jquery-ui/i18n/datepicker-it.js rename to www/media/js/jquery-ui/i18n/datepicker-it.js diff --git a/media/js/jquery-ui/i18n/datepicker-nl.js b/www/media/js/jquery-ui/i18n/datepicker-nl.js similarity index 100% rename from media/js/jquery-ui/i18n/datepicker-nl.js rename to www/media/js/jquery-ui/i18n/datepicker-nl.js diff --git a/media/js/jquery-ui/i18n/datepicker-pl.js b/www/media/js/jquery-ui/i18n/datepicker-pl.js similarity index 100% rename from media/js/jquery-ui/i18n/datepicker-pl.js rename to www/media/js/jquery-ui/i18n/datepicker-pl.js diff --git a/media/js/jquery-ui/i18n/datepicker-pt-BR.js b/www/media/js/jquery-ui/i18n/datepicker-pt-BR.js similarity index 100% rename from media/js/jquery-ui/i18n/datepicker-pt-BR.js rename to www/media/js/jquery-ui/i18n/datepicker-pt-BR.js diff --git a/media/js/jquery-ui/i18n/datepicker-pt.js b/www/media/js/jquery-ui/i18n/datepicker-pt.js similarity index 100% rename from media/js/jquery-ui/i18n/datepicker-pt.js rename to www/media/js/jquery-ui/i18n/datepicker-pt.js diff --git a/media/js/jquery-ui/i18n/datepicker-ru.js b/www/media/js/jquery-ui/i18n/datepicker-ru.js similarity index 100% rename from media/js/jquery-ui/i18n/datepicker-ru.js rename to www/media/js/jquery-ui/i18n/datepicker-ru.js diff --git a/media/js/jquery-ui/i18n/datepicker-sk.js b/www/media/js/jquery-ui/i18n/datepicker-sk.js similarity index 100% rename from media/js/jquery-ui/i18n/datepicker-sk.js rename to www/media/js/jquery-ui/i18n/datepicker-sk.js diff --git a/media/js/jquery-ui/i18n/datepicker-tr.js b/www/media/js/jquery-ui/i18n/datepicker-tr.js similarity index 100% rename from media/js/jquery-ui/i18n/datepicker-tr.js rename to www/media/js/jquery-ui/i18n/datepicker-tr.js diff --git a/media/js/jquery-ui/i18n/index.html b/www/media/js/jquery-ui/i18n/index.html similarity index 100% rename from media/js/jquery-ui/i18n/index.html rename to www/media/js/jquery-ui/i18n/index.html diff --git a/media/js/jquery-ui/index.html b/www/media/js/jquery-ui/index.html similarity index 100% rename from media/js/jquery-ui/index.html rename to www/media/js/jquery-ui/index.html diff --git a/media/js/jquery-ui/jquery-ui.min.js b/www/media/js/jquery-ui/jquery-ui.min.js similarity index 100% rename from media/js/jquery-ui/jquery-ui.min.js rename to www/media/js/jquery-ui/jquery-ui.min.js diff --git a/media/js/modernizr.min.js b/www/media/js/modernizr.min.js similarity index 100% rename from media/js/modernizr.min.js rename to www/media/js/modernizr.min.js diff --git a/media/sound/index.html b/www/media/sound/index.html similarity index 100% rename from media/sound/index.html rename to www/media/sound/index.html diff --git a/media/sound/ponderous.m4a b/www/media/sound/ponderous.m4a similarity index 100% rename from media/sound/ponderous.m4a rename to www/media/sound/ponderous.m4a From 1975f0dc29c7fe5c012c365832bbdd521673383f Mon Sep 17 00:00:00 2001 From: tenzap Date: Tue, 1 Mar 2022 13:57:06 +0100 Subject: [PATCH 2/6] update paths to install file --- application/controllers/Install.php | 21 ++++++++++++------- application/core/MY_Controller.php | 2 +- .../views/main/install/install_result.php | 6 +++--- 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/application/controllers/Install.php b/application/controllers/Install.php index 2070dfb1c..656004c97 100644 --- a/application/controllers/Install.php +++ b/application/controllers/Install.php @@ -30,13 +30,6 @@ class Install extends CI_Controller { function __construct() { parent::__construct(); - if ( ! file_exists('./install')) - { - show_error('Installation has been disabled by the administrator.

- To enable access to it, create a file named install - in this directory of the server: '.realpath('.').'. -

Otherwise you may log in.', 403, '403 Forbidden'); - } // language $this->load->helper('i18n'); @@ -51,6 +44,20 @@ function __construct() } $this->lang->load('kalkun', $this->idiom); + if ( ! file_exists(FCPATH.'install')) + { + show_error( + tr( + 'Installation has been disabled by the administrator.

To enable access to it, create a file named install in this directory of the server: {0}.

Otherwise you may log in.', + NULL, + realpath(FCPATH), + $this->config->item('base_url') + ), + 403, + tr('403 Forbidden') + ); + } + require_once(APPPATH.'config/database.php'); $this->db_config = $db[$active_group]; } diff --git a/application/core/MY_Controller.php b/application/core/MY_Controller.php index f174c64c4..80741bead 100644 --- a/application/core/MY_Controller.php +++ b/application/core/MY_Controller.php @@ -32,7 +32,7 @@ function __construct($login = TRUE) parent::__construct(); // installation mode - if (file_exists('install')) + if (file_exists(FCPATH.'install')) { redirect('install'); } diff --git a/application/views/main/install/install_result.php b/application/views/main/install/install_result.php index 102d8564c..8af6a18fc 100644 --- a/application/views/main/install/install_result.php +++ b/application/views/main/install/install_result.php @@ -13,12 +13,12 @@

Remaining manual steps

Remove Installation file

From 69607f2b6a3b5a8e201312e41aa111fa8f38061b Mon Sep 17 00:00:00 2001 From: tenzap Date: Tue, 1 Mar 2022 14:12:30 +0100 Subject: [PATCH 3/6] update fix_code_style script --- fix_code_style.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fix_code_style.sh b/fix_code_style.sh index 2075e6e3f..a1b966a7e 100755 --- a/fix_code_style.sh +++ b/fix_code_style.sh @@ -104,7 +104,7 @@ if command -v html-beautify >/dev/null ; then --indent-scripts=normal \ "$file" done < <(find application/views/js_init application/views/main -name "*.php" -print0 && \ - find media/css -name "b*.css" -print0 -or -name "i*.css" -print0 ) + find www/media/css -name "b*.css" -print0 -or -name "i*.css" -print0 ) PLUGIN_VIEWS=$(find application/plugins -type d -name views) while IFS= read -r -d '' file; do @@ -153,10 +153,10 @@ fi # to hide some of this data, but have it in mind that this is not enough to prevent a serious attacker. #find application/ -type d -exec cp -a vendor/codeigniter/framework/application/index.html '{}' \; find application/ -type d '!' -exec test -e "{}/index.html" ';' -exec cp -a vendor/codeigniter/framework/application/index.html '{}' \; && -find media/ -type d '!' -exec test -e "{}/index.html" ';' -exec cp -a vendor/codeigniter/framework/application/index.html '{}' \; && +find www/media/ -type d '!' -exec test -e "{}/index.html" ';' -exec cp -a vendor/codeigniter/framework/application/index.html '{}' \; && if [ $DO_GIT_COMMIT -eq 1 ]; then git add "application/**index.html" && - git add "media/**index.html" && + git add "www/media/**index.html" && git commit -m "[AUTO] Add missing protective index.html" fi From 66f8d37cce3a2e63f1cf5e7844e8cb50d83bb3b6 Mon Sep 17 00:00:00 2001 From: tenzap Date: Tue, 1 Mar 2022 14:12:39 +0100 Subject: [PATCH 4/6] update README --- README.md | 51 ++++++++++++++++++++++++++++++++++----------------- 1 file changed, 34 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index f36a1ca5f..820242fdb 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,7 @@ github actions page: ### Manual Installation -1. Extract to web root folder (eg: /var/www/html => Ubuntu) +1. Extract to a folder (eg: `/usr/local/share/kalkun` for Ubuntu, Debian...) 1. Run `composer install` from there 1. If you haven't created the gammu database yet, create it. It is shared by gammu & kalkun. Here we name it `kalkun`, but by default, gammu may name it `smsd`. @@ -60,13 +60,13 @@ github actions page: CREATE USER username WITH password 'password' NOCREATEDB NOCREATEROLE; CREATE DATABASE kalkun WITH OWNER = username; ``` -1. Edit database config (application/config/database.php) - Change database value to 'kalkun'. - username and password depends on your database configuration. +1. Edit database config (`application/config/database.php`) + Change database value to `kalkun`. + username and password depend on your database configuration. If you use a specific port with PostgreSQL, you may also need to set `$db['default']['port'] = "5432";` -1. Import gammu database schema (it's included on gammu source, eg. `gammu/docs/sql/mysql.sql`). +1. Import gammu database schema (it's included in gammu source, eg. `gammu/docs/sql/mysql.sql`). For MySQL : ``` @@ -84,36 +84,53 @@ github actions page: - Set path on gammu-smsd configuration at runonreceive directive, e.g: ``` [smsd] - runonreceive = /var/www/html/kalkun/scripts/daemon.sh + runonreceive = /usr/local/share/kalkun/scripts/daemon.sh ``` or, if you use Windows: ``` [smsd] runonreceive = C:\xampp\htdocs\kalkun\scripts\daemon.bat ``` - - set correct path (php-cli path and daemon.php path) on daemon.sh or daemon.bat - - set correct path (php-cli path and outbox_queue.php path) on outbox_queue.sh or outbox_queue.bat + - set correct path (`php-cli` path and `daemon.php` path) in `daemon.sh` or `daemon.bat` + - set correct path (`php-cli` path and `outbox_queue.php` path) in `outbox_queue.sh` or `outbox_queue.bat` - make sure that the daemon & outbox_queue scripts are executable - - Change URI path in daemon.php & outbox_queue.php. Default is (http://localhost/kalkun) + - Change URI path in `daemon.php` & `outbox_queue.php`. Default is (http://localhost/kalkun) +1. Configure your webserver to point to `/usr/local/share/kalkun/www` + - With Apache, on Ubuntu, debian, you may add such a file `/etc/apache2/conf-enabled/kalkun.conf` + ``` + Alias /kalkun /usr/local/share/kalkun/www + + + Options -Indexes + + ``` + - Then restart the webserver + ``` + systemctl restart apache2.service + ``` +1. Set the log directory as writable by the HTTP Server. On Ubuntu, debian: + ``` + chown www-data:www-data /usr/local/share/kalkun/application/logs + ``` 1. Configure Kalkun - _There are 2 ways to configure_ - - Graphic Install (this will also check that all the dependencies are installed) + - Graphic Install (this will also check that all the dependencies are installed and update the database schema if this is an upgrade) 1. Launch http://localhost/kalkun/index.php/install, and follow instruction there - 1. Finally delete file /var/www/html/kalkun/*install* in case the installer didn't do so. - - Manual Install + 1. Finally delete file `/usr/local/share/kalkun/www/install` in case the installer couldn't do so. + - Manual Install (only for fresh install) 1. Import sql file located in kalkun/media/db/ to kalkun database. For MySQL ``` - mysql -u username -p kalkun < /var/www/html/kalkun/media/db/mysql_kalkun.sql + mysql -u username -p kalkun < /usr/local/share/kalkun/media/db/mysql_kalkun.sql ``` For PostgreSQL ``` - psql -U username -h localhost kalkun < /var/www/html/kalkun/media/db/pgsql_kalkun.sql + psql -U username -h localhost kalkun < /usr/local/share/kalkun/media/db/pgsql_kalkun.sql ``` - 2. Delete the file /var/www/html/kalkun/*install* + 2. Delete the file `/usr/local/share/kalkun/www/install` - `rm /var/www/html/kalkun/install` + `rm /usr/local/share/kalkun/www/install` ## IMPORTANT * After install is finished, you may need to remove install file. @@ -122,7 +139,7 @@ github actions page: ``` php -r 'echo bin2hex(random_bytes(16)), "\n";' ``` - Write the value in application/config/config.php and enclose it in a hex2bin() function. + Write the value in `application/config/config.php` and enclose it in a `hex2bin()` function. ### Migration Note (to kalkun 0.8) * During migration to codeigniter 3 (done with version 0.8 of Kalkun), it was strongly advised to switch to the Encryption Library for security reasons. This required to change the default encryption key. The Encryption library was used in "sms to wordpress" and "sms to xmpp" plugins. You need to recreate the configuration of these plugins so that they continue to work. From bd2f1a11b78aaa64c8743c541c7a560efdeb8b1a Mon Sep 17 00:00:00 2001 From: tenzap Date: Tue, 1 Mar 2022 14:15:41 +0100 Subject: [PATCH 5/6] update paths --- application/config/config.php | 2 +- www/index.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/application/config/config.php b/application/config/config.php index 60589e5a3..d88a4d1fe 100644 --- a/application/config/config.php +++ b/application/config/config.php @@ -147,7 +147,7 @@ | Note: This will NOT disable or override the CodeIgniter-specific | autoloading (application/config/autoload.php) */ -$config['composer_autoload'] = 'vendor/autoload.php'; +$config['composer_autoload'] = '../vendor/autoload.php'; /* |-------------------------------------------------------------------------- diff --git a/www/index.php b/www/index.php index fa311e658..1fd68c461 100644 --- a/www/index.php +++ b/www/index.php @@ -97,7 +97,7 @@ * This variable must contain the name of your "system" directory. * Set the path if it is not in the same directory as this file. */ - $system_path = 'vendor/codeigniter/framework/system'; + $system_path = '../vendor/codeigniter/framework/system'; /* *--------------------------------------------------------------- @@ -114,7 +114,7 @@ * * NO TRAILING SLASH! */ - $application_folder = 'application'; + $application_folder = '../application'; /* *--------------------------------------------------------------- From 9b1fcd29bd9938ef6cf920b2e7646380e01a9c20 Mon Sep 17 00:00:00 2001 From: tenzap Date: Tue, 1 Mar 2022 14:18:14 +0100 Subject: [PATCH 6/6] update test --- application/tests/controllers/Install_test.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/tests/controllers/Install_test.php b/application/tests/controllers/Install_test.php index bc6115682..e0e0a4b87 100644 --- a/application/tests/controllers/Install_test.php +++ b/application/tests/controllers/Install_test.php @@ -12,7 +12,7 @@ class Install_test extends TestCase { public function test_index() { - $output = $this->request('GET', 'install'); + $output = $this->request('GET', 'www/install'); $this->assertContains('Kalkun › Installation', $output); }