diff --git a/includes/config/include.php b/includes/config/include.php index 4af636575..b4e7f5bcc 100755 --- a/includes/config/include.php +++ b/includes/config/include.php @@ -17,7 +17,7 @@ */ define('TP_VERSION', '3.1.1'); define("UPGRADE_MIN_DATE", "1702452416"); -define('TP_VERSION_MINOR', '25'); +define('TP_VERSION_MINOR', '26'); define('TP_TOOL_NAME', 'Teampass'); define('TP_ONE_DAY_SECONDS', 86400); define('TP_ONE_WEEK_SECONDS', 604800); diff --git a/index.php b/index.php index 526042708..ccff888f5 100755 --- a/index.php +++ b/index.php @@ -1150,8 +1150,7 @@ function(teampassSettings) {} query->get('page') === null ? '' : $request->query->get('page'); + $get['page'] = $request->query->filter('page', null, FILTER_SANITIZE_SPECIAL_CHARS); if ($menuAdmin === true) { ?> diff --git a/install1/css/install.css b/install/install/css/install.css similarity index 100% rename from install1/css/install.css rename to install/install/css/install.css diff --git a/install1/css/overcast/images/animated-overlay.gif b/install/install/css/overcast/images/animated-overlay.gif similarity index 100% rename from install1/css/overcast/images/animated-overlay.gif rename to install/install/css/overcast/images/animated-overlay.gif diff --git a/install1/css/overcast/images/ui-bg_flat_0_aaaaaa_40x100.png b/install/install/css/overcast/images/ui-bg_flat_0_aaaaaa_40x100.png similarity index 100% rename from install1/css/overcast/images/ui-bg_flat_0_aaaaaa_40x100.png rename to install/install/css/overcast/images/ui-bg_flat_0_aaaaaa_40x100.png diff --git a/install1/css/overcast/images/ui-bg_flat_0_eeeeee_40x100.png b/install/install/css/overcast/images/ui-bg_flat_0_eeeeee_40x100.png similarity index 100% rename from install1/css/overcast/images/ui-bg_flat_0_eeeeee_40x100.png rename to install/install/css/overcast/images/ui-bg_flat_0_eeeeee_40x100.png diff --git a/install1/css/overcast/images/ui-bg_flat_55_c0402a_40x100.png b/install/install/css/overcast/images/ui-bg_flat_55_c0402a_40x100.png similarity index 100% rename from install1/css/overcast/images/ui-bg_flat_55_c0402a_40x100.png rename to install/install/css/overcast/images/ui-bg_flat_55_c0402a_40x100.png diff --git a/install1/css/overcast/images/ui-bg_flat_55_eeeeee_40x100.png b/install/install/css/overcast/images/ui-bg_flat_55_eeeeee_40x100.png similarity index 100% rename from install1/css/overcast/images/ui-bg_flat_55_eeeeee_40x100.png rename to install/install/css/overcast/images/ui-bg_flat_55_eeeeee_40x100.png diff --git a/install1/css/overcast/images/ui-bg_glass_100_f8f8f8_1x400.png b/install/install/css/overcast/images/ui-bg_glass_100_f8f8f8_1x400.png similarity index 100% rename from install1/css/overcast/images/ui-bg_glass_100_f8f8f8_1x400.png rename to install/install/css/overcast/images/ui-bg_glass_100_f8f8f8_1x400.png diff --git a/install1/css/overcast/images/ui-bg_glass_35_dddddd_1x400.png b/install/install/css/overcast/images/ui-bg_glass_35_dddddd_1x400.png similarity index 100% rename from install1/css/overcast/images/ui-bg_glass_35_dddddd_1x400.png rename to install/install/css/overcast/images/ui-bg_glass_35_dddddd_1x400.png diff --git a/install1/css/overcast/images/ui-bg_glass_60_eeeeee_1x400.png b/install/install/css/overcast/images/ui-bg_glass_60_eeeeee_1x400.png similarity index 100% rename from install1/css/overcast/images/ui-bg_glass_60_eeeeee_1x400.png rename to install/install/css/overcast/images/ui-bg_glass_60_eeeeee_1x400.png diff --git a/install1/css/overcast/images/ui-bg_inset-hard_75_999999_1x100.png b/install/install/css/overcast/images/ui-bg_inset-hard_75_999999_1x100.png similarity index 100% rename from install1/css/overcast/images/ui-bg_inset-hard_75_999999_1x100.png rename to install/install/css/overcast/images/ui-bg_inset-hard_75_999999_1x100.png diff --git a/install1/css/overcast/images/ui-bg_inset-soft_50_c9c9c9_1x100.png b/install/install/css/overcast/images/ui-bg_inset-soft_50_c9c9c9_1x100.png similarity index 100% rename from install1/css/overcast/images/ui-bg_inset-soft_50_c9c9c9_1x100.png rename to install/install/css/overcast/images/ui-bg_inset-soft_50_c9c9c9_1x100.png diff --git a/install1/css/overcast/images/ui-icons_3383bb_256x240.png b/install/install/css/overcast/images/ui-icons_3383bb_256x240.png similarity index 100% rename from install1/css/overcast/images/ui-icons_3383bb_256x240.png rename to install/install/css/overcast/images/ui-icons_3383bb_256x240.png diff --git a/install1/css/overcast/images/ui-icons_454545_256x240.png b/install/install/css/overcast/images/ui-icons_454545_256x240.png similarity index 100% rename from install1/css/overcast/images/ui-icons_454545_256x240.png rename to install/install/css/overcast/images/ui-icons_454545_256x240.png diff --git a/install1/css/overcast/images/ui-icons_70b2e1_256x240.png b/install/install/css/overcast/images/ui-icons_70b2e1_256x240.png similarity index 100% rename from install1/css/overcast/images/ui-icons_70b2e1_256x240.png rename to install/install/css/overcast/images/ui-icons_70b2e1_256x240.png diff --git a/install1/css/overcast/images/ui-icons_999999_256x240.png b/install/install/css/overcast/images/ui-icons_999999_256x240.png similarity index 100% rename from install1/css/overcast/images/ui-icons_999999_256x240.png rename to install/install/css/overcast/images/ui-icons_999999_256x240.png diff --git a/install1/css/overcast/images/ui-icons_fbc856_256x240.png b/install/install/css/overcast/images/ui-icons_fbc856_256x240.png similarity index 100% rename from install1/css/overcast/images/ui-icons_fbc856_256x240.png rename to install/install/css/overcast/images/ui-icons_fbc856_256x240.png diff --git a/install1/css/overcast/jquery-ui-1.10.3.custom.min.css b/install/install/css/overcast/jquery-ui-1.10.3.custom.min.css similarity index 100% rename from install1/css/overcast/jquery-ui-1.10.3.custom.min.css rename to install/install/css/overcast/jquery-ui-1.10.3.custom.min.css diff --git a/install1/images/76.gif b/install/install/images/76.gif similarity index 100% rename from install1/images/76.gif rename to install/install/images/76.gif diff --git a/install1/images/ajax-loader.gif b/install/install/images/ajax-loader.gif similarity index 100% rename from install1/images/ajax-loader.gif rename to install/install/images/ajax-loader.gif diff --git a/install1/images/cross.png b/install/install/images/cross.png similarity index 100% rename from install1/images/cross.png rename to install/install/images/cross.png diff --git a/install1/images/error.png b/install/install/images/error.png similarity index 100% rename from install1/images/error.png rename to install/install/images/error.png diff --git a/install1/images/exclamation-red.png b/install/install/images/exclamation-red.png similarity index 100% rename from install1/images/exclamation-red.png rename to install/install/images/exclamation-red.png diff --git a/install1/images/information-white.png b/install/install/images/information-white.png similarity index 100% rename from install1/images/information-white.png rename to install/install/images/information-white.png diff --git a/install1/images/minus-circle.png b/install/install/images/minus-circle.png similarity index 100% rename from install1/images/minus-circle.png rename to install/install/images/minus-circle.png diff --git a/install1/images/tick-circle.png b/install/install/images/tick-circle.png similarity index 100% rename from install1/images/tick-circle.png rename to install/install/images/tick-circle.png diff --git a/install1/images/tick.png b/install/install/images/tick.png similarity index 100% rename from install1/images/tick.png rename to install/install/images/tick.png diff --git a/install1/install.js b/install/install/install.js similarity index 100% rename from install1/install.js rename to install/install/install.js diff --git a/install1/install.php b/install/install/install.php similarity index 100% rename from install1/install.php rename to install/install/install.php diff --git a/install1/install.queries.php b/install/install/install.queries.php similarity index 100% rename from install1/install.queries.php rename to install/install/install.queries.php diff --git a/install1/install1/css/install.css b/install/install/install1/css/install.css similarity index 100% rename from install1/install1/css/install.css rename to install/install/install1/css/install.css diff --git a/install1/install1/css/overcast/images/animated-overlay.gif b/install/install/install1/css/overcast/images/animated-overlay.gif similarity index 100% rename from install1/install1/css/overcast/images/animated-overlay.gif rename to install/install/install1/css/overcast/images/animated-overlay.gif diff --git a/install1/install1/css/overcast/images/ui-bg_flat_0_aaaaaa_40x100.png b/install/install/install1/css/overcast/images/ui-bg_flat_0_aaaaaa_40x100.png similarity index 100% rename from install1/install1/css/overcast/images/ui-bg_flat_0_aaaaaa_40x100.png rename to install/install/install1/css/overcast/images/ui-bg_flat_0_aaaaaa_40x100.png diff --git a/install1/install1/css/overcast/images/ui-bg_flat_0_eeeeee_40x100.png b/install/install/install1/css/overcast/images/ui-bg_flat_0_eeeeee_40x100.png similarity index 100% rename from install1/install1/css/overcast/images/ui-bg_flat_0_eeeeee_40x100.png rename to install/install/install1/css/overcast/images/ui-bg_flat_0_eeeeee_40x100.png diff --git a/install1/install1/css/overcast/images/ui-bg_flat_55_c0402a_40x100.png b/install/install/install1/css/overcast/images/ui-bg_flat_55_c0402a_40x100.png similarity index 100% rename from install1/install1/css/overcast/images/ui-bg_flat_55_c0402a_40x100.png rename to install/install/install1/css/overcast/images/ui-bg_flat_55_c0402a_40x100.png diff --git a/install1/install1/css/overcast/images/ui-bg_flat_55_eeeeee_40x100.png b/install/install/install1/css/overcast/images/ui-bg_flat_55_eeeeee_40x100.png similarity index 100% rename from install1/install1/css/overcast/images/ui-bg_flat_55_eeeeee_40x100.png rename to install/install/install1/css/overcast/images/ui-bg_flat_55_eeeeee_40x100.png diff --git a/install1/install1/css/overcast/images/ui-bg_glass_100_f8f8f8_1x400.png b/install/install/install1/css/overcast/images/ui-bg_glass_100_f8f8f8_1x400.png similarity index 100% rename from install1/install1/css/overcast/images/ui-bg_glass_100_f8f8f8_1x400.png rename to install/install/install1/css/overcast/images/ui-bg_glass_100_f8f8f8_1x400.png diff --git a/install1/install1/css/overcast/images/ui-bg_glass_35_dddddd_1x400.png b/install/install/install1/css/overcast/images/ui-bg_glass_35_dddddd_1x400.png similarity index 100% rename from install1/install1/css/overcast/images/ui-bg_glass_35_dddddd_1x400.png rename to install/install/install1/css/overcast/images/ui-bg_glass_35_dddddd_1x400.png diff --git a/install1/install1/css/overcast/images/ui-bg_glass_60_eeeeee_1x400.png b/install/install/install1/css/overcast/images/ui-bg_glass_60_eeeeee_1x400.png similarity index 100% rename from install1/install1/css/overcast/images/ui-bg_glass_60_eeeeee_1x400.png rename to install/install/install1/css/overcast/images/ui-bg_glass_60_eeeeee_1x400.png diff --git a/install1/install1/css/overcast/images/ui-bg_inset-hard_75_999999_1x100.png b/install/install/install1/css/overcast/images/ui-bg_inset-hard_75_999999_1x100.png similarity index 100% rename from install1/install1/css/overcast/images/ui-bg_inset-hard_75_999999_1x100.png rename to install/install/install1/css/overcast/images/ui-bg_inset-hard_75_999999_1x100.png diff --git a/install1/install1/css/overcast/images/ui-bg_inset-soft_50_c9c9c9_1x100.png b/install/install/install1/css/overcast/images/ui-bg_inset-soft_50_c9c9c9_1x100.png similarity index 100% rename from install1/install1/css/overcast/images/ui-bg_inset-soft_50_c9c9c9_1x100.png rename to install/install/install1/css/overcast/images/ui-bg_inset-soft_50_c9c9c9_1x100.png diff --git a/install1/install1/css/overcast/images/ui-icons_3383bb_256x240.png b/install/install/install1/css/overcast/images/ui-icons_3383bb_256x240.png similarity index 100% rename from install1/install1/css/overcast/images/ui-icons_3383bb_256x240.png rename to install/install/install1/css/overcast/images/ui-icons_3383bb_256x240.png diff --git a/install1/install1/css/overcast/images/ui-icons_454545_256x240.png b/install/install/install1/css/overcast/images/ui-icons_454545_256x240.png similarity index 100% rename from install1/install1/css/overcast/images/ui-icons_454545_256x240.png rename to install/install/install1/css/overcast/images/ui-icons_454545_256x240.png diff --git a/install1/install1/css/overcast/images/ui-icons_70b2e1_256x240.png b/install/install/install1/css/overcast/images/ui-icons_70b2e1_256x240.png similarity index 100% rename from install1/install1/css/overcast/images/ui-icons_70b2e1_256x240.png rename to install/install/install1/css/overcast/images/ui-icons_70b2e1_256x240.png diff --git a/install1/install1/css/overcast/images/ui-icons_999999_256x240.png b/install/install/install1/css/overcast/images/ui-icons_999999_256x240.png similarity index 100% rename from install1/install1/css/overcast/images/ui-icons_999999_256x240.png rename to install/install/install1/css/overcast/images/ui-icons_999999_256x240.png diff --git a/install1/install1/css/overcast/images/ui-icons_fbc856_256x240.png b/install/install/install1/css/overcast/images/ui-icons_fbc856_256x240.png similarity index 100% rename from install1/install1/css/overcast/images/ui-icons_fbc856_256x240.png rename to install/install/install1/css/overcast/images/ui-icons_fbc856_256x240.png diff --git a/install1/install1/css/overcast/jquery-ui-1.10.3.custom.min.css b/install/install/install1/css/overcast/jquery-ui-1.10.3.custom.min.css similarity index 100% rename from install1/install1/css/overcast/jquery-ui-1.10.3.custom.min.css rename to install/install/install1/css/overcast/jquery-ui-1.10.3.custom.min.css diff --git a/install1/install1/images/76.gif b/install/install/install1/images/76.gif similarity index 100% rename from install1/install1/images/76.gif rename to install/install/install1/images/76.gif diff --git a/install1/install1/images/ajax-loader.gif b/install/install/install1/images/ajax-loader.gif similarity index 100% rename from install1/install1/images/ajax-loader.gif rename to install/install/install1/images/ajax-loader.gif diff --git a/install1/install1/images/cross.png b/install/install/install1/images/cross.png similarity index 100% rename from install1/install1/images/cross.png rename to install/install/install1/images/cross.png diff --git a/install1/install1/images/error.png b/install/install/install1/images/error.png similarity index 100% rename from install1/install1/images/error.png rename to install/install/install1/images/error.png diff --git a/install1/install1/images/exclamation-red.png b/install/install/install1/images/exclamation-red.png similarity index 100% rename from install1/install1/images/exclamation-red.png rename to install/install/install1/images/exclamation-red.png diff --git a/install1/install1/images/information-white.png b/install/install/install1/images/information-white.png similarity index 100% rename from install1/install1/images/information-white.png rename to install/install/install1/images/information-white.png diff --git a/install1/install1/images/minus-circle.png b/install/install/install1/images/minus-circle.png similarity index 100% rename from install1/install1/images/minus-circle.png rename to install/install/install1/images/minus-circle.png diff --git a/install1/install1/images/tick-circle.png b/install/install/install1/images/tick-circle.png similarity index 100% rename from install1/install1/images/tick-circle.png rename to install/install/install1/images/tick-circle.png diff --git a/install1/install1/images/tick.png b/install/install/install1/images/tick.png similarity index 100% rename from install1/install1/images/tick.png rename to install/install/install1/images/tick.png diff --git a/install1/install1/install.js b/install/install/install1/install.js similarity index 100% rename from install1/install1/install.js rename to install/install/install1/install.js diff --git a/install1/install1/install.php b/install/install/install1/install.php similarity index 100% rename from install1/install1/install.php rename to install/install/install1/install.php diff --git a/install1/install1/install.queries.php b/install/install/install1/install.queries.php similarity index 100% rename from install1/install1/install.queries.php rename to install/install/install1/install.queries.php diff --git a/install1/install1/js/aes.min.js b/install/install/install1/js/aes.min.js similarity index 100% rename from install1/install1/js/aes.min.js rename to install/install/install1/js/aes.min.js diff --git a/install1/install1/js/crypt/aes.class.php b/install/install/install1/js/crypt/aes.class.php similarity index 100% rename from install1/install1/js/crypt/aes.class.php rename to install/install/install1/js/crypt/aes.class.php diff --git a/install1/install1/js/crypt/aes.min.js b/install/install/install1/js/crypt/aes.min.js similarity index 100% rename from install1/install1/js/crypt/aes.min.js rename to install/install/install1/js/crypt/aes.min.js diff --git a/install1/install1/js/crypt/aesctr.class.php b/install/install/install1/js/crypt/aesctr.class.php similarity index 100% rename from install1/install1/js/crypt/aesctr.class.php rename to install/install/install1/js/crypt/aesctr.class.php diff --git a/install1/install1/js/jquery-ui.min.js b/install/install/install1/js/jquery-ui.min.js similarity index 100% rename from install1/install1/js/jquery-ui.min.js rename to install/install/install1/js/jquery-ui.min.js diff --git a/install1/install1/js/jquery.min.js b/install/install/install1/js/jquery.min.js similarity index 100% rename from install1/install1/js/jquery.min.js rename to install/install/install1/js/jquery.min.js diff --git a/install1/install1/libs/SecureHandler.php b/install/install/install1/libs/SecureHandler.php similarity index 100% rename from install1/install1/libs/SecureHandler.php rename to install/install/install1/libs/SecureHandler.php diff --git a/install1/install1/libs/SplClassLoader.php b/install/install/install1/libs/SplClassLoader.php similarity index 100% rename from install1/install1/libs/SplClassLoader.php rename to install/install/install1/libs/SplClassLoader.php diff --git a/install1/install1/libs/aesctr.php b/install/install/install1/libs/aesctr.php similarity index 100% rename from install1/install1/libs/aesctr.php rename to install/install/install1/libs/aesctr.php diff --git a/install1/install1/migrate_users_to_v3.php b/install/install/install1/migrate_users_to_v3.php similarity index 100% rename from install1/install1/migrate_users_to_v3.php rename to install/install/install1/migrate_users_to_v3.php diff --git a/install1/install1/tp.functions.php b/install/install/install1/tp.functions.php similarity index 100% rename from install1/install1/tp.functions.php rename to install/install/install1/tp.functions.php diff --git a/install1/install1/upgrade.php b/install/install/install1/upgrade.php similarity index 100% rename from install1/install1/upgrade.php rename to install/install/install1/upgrade.php diff --git a/install1/install1/upgrade_ajax.php b/install/install/install1/upgrade_ajax.php similarity index 100% rename from install1/install1/upgrade_ajax.php rename to install/install/install1/upgrade_ajax.php diff --git a/install1/install1/upgrade_operations.php b/install/install/install1/upgrade_operations.php similarity index 100% rename from install1/install1/upgrade_operations.php rename to install/install/install1/upgrade_operations.php diff --git a/install1/install1/upgrade_run_3.0.0.php b/install/install/install1/upgrade_run_3.0.0.php similarity index 100% rename from install1/install1/upgrade_run_3.0.0.php rename to install/install/install1/upgrade_run_3.0.0.php diff --git a/install1/install1/upgrade_run_3.0.0_fields.php b/install/install/install1/upgrade_run_3.0.0_fields.php similarity index 100% rename from install1/install1/upgrade_run_3.0.0_fields.php rename to install/install/install1/upgrade_run_3.0.0_fields.php diff --git a/install1/install1/upgrade_run_3.0.0_files.php b/install/install/install1/upgrade_run_3.0.0_files.php similarity index 100% rename from install1/install1/upgrade_run_3.0.0_files.php rename to install/install/install1/upgrade_run_3.0.0_files.php diff --git a/install1/install1/upgrade_run_3.0.0_logs.php b/install/install/install1/upgrade_run_3.0.0_logs.php similarity index 100% rename from install1/install1/upgrade_run_3.0.0_logs.php rename to install/install/install1/upgrade_run_3.0.0_logs.php diff --git a/install1/install1/upgrade_run_3.0.0_passwords.php b/install/install/install1/upgrade_run_3.0.0_passwords.php similarity index 100% rename from install1/install1/upgrade_run_3.0.0_passwords.php rename to install/install/install1/upgrade_run_3.0.0_passwords.php diff --git a/install1/install1/upgrade_run_3.0.0_suggestions.php b/install/install/install1/upgrade_run_3.0.0_suggestions.php similarity index 100% rename from install1/install1/upgrade_run_3.0.0_suggestions.php rename to install/install/install1/upgrade_run_3.0.0_suggestions.php diff --git a/install1/install1/upgrade_run_3.0.0_users.php b/install/install/install1/upgrade_run_3.0.0_users.php similarity index 100% rename from install1/install1/upgrade_run_3.0.0_users.php rename to install/install/install1/upgrade_run_3.0.0_users.php diff --git a/install1/install1/upgrade_run_3.0.php b/install/install/install1/upgrade_run_3.0.php similarity index 100% rename from install1/install1/upgrade_run_3.0.php rename to install/install/install1/upgrade_run_3.0.php diff --git a/install1/install1/upgrade_run_3.1.php b/install/install/install1/upgrade_run_3.1.php similarity index 100% rename from install1/install1/upgrade_run_3.1.php rename to install/install/install1/upgrade_run_3.1.php diff --git a/install1/install1/upgrade_scripts_manager.php b/install/install/install1/upgrade_scripts_manager.php similarity index 100% rename from install1/install1/upgrade_scripts_manager.php rename to install/install/install1/upgrade_scripts_manager.php diff --git a/install1/js/aes.min.js b/install/install/js/aes.min.js similarity index 100% rename from install1/js/aes.min.js rename to install/install/js/aes.min.js diff --git a/install1/js/crypt/aes.class.php b/install/install/js/crypt/aes.class.php similarity index 100% rename from install1/js/crypt/aes.class.php rename to install/install/js/crypt/aes.class.php diff --git a/install1/js/crypt/aes.min.js b/install/install/js/crypt/aes.min.js similarity index 100% rename from install1/js/crypt/aes.min.js rename to install/install/js/crypt/aes.min.js diff --git a/install1/js/crypt/aesctr.class.php b/install/install/js/crypt/aesctr.class.php similarity index 100% rename from install1/js/crypt/aesctr.class.php rename to install/install/js/crypt/aesctr.class.php diff --git a/install1/js/jquery-ui.min.js b/install/install/js/jquery-ui.min.js similarity index 100% rename from install1/js/jquery-ui.min.js rename to install/install/js/jquery-ui.min.js diff --git a/install1/js/jquery.min.js b/install/install/js/jquery.min.js similarity index 100% rename from install1/js/jquery.min.js rename to install/install/js/jquery.min.js diff --git a/install1/libs/SecureHandler.php b/install/install/libs/SecureHandler.php similarity index 100% rename from install1/libs/SecureHandler.php rename to install/install/libs/SecureHandler.php diff --git a/install1/libs/SplClassLoader.php b/install/install/libs/SplClassLoader.php similarity index 100% rename from install1/libs/SplClassLoader.php rename to install/install/libs/SplClassLoader.php diff --git a/install1/libs/aesctr.php b/install/install/libs/aesctr.php similarity index 100% rename from install1/libs/aesctr.php rename to install/install/libs/aesctr.php diff --git a/install1/migrate_users_to_v3.php b/install/install/migrate_users_to_v3.php similarity index 100% rename from install1/migrate_users_to_v3.php rename to install/install/migrate_users_to_v3.php diff --git a/install1/tp.functions.php b/install/install/tp.functions.php similarity index 100% rename from install1/tp.functions.php rename to install/install/tp.functions.php diff --git a/install1/upgrade.php b/install/install/upgrade.php similarity index 100% rename from install1/upgrade.php rename to install/install/upgrade.php diff --git a/install1/upgrade_ajax.php b/install/install/upgrade_ajax.php similarity index 100% rename from install1/upgrade_ajax.php rename to install/install/upgrade_ajax.php diff --git a/install1/upgrade_operations.php b/install/install/upgrade_operations.php similarity index 100% rename from install1/upgrade_operations.php rename to install/install/upgrade_operations.php diff --git a/install1/upgrade_run_3.0.0.php b/install/install/upgrade_run_3.0.0.php similarity index 100% rename from install1/upgrade_run_3.0.0.php rename to install/install/upgrade_run_3.0.0.php diff --git a/install1/upgrade_run_3.0.0_fields.php b/install/install/upgrade_run_3.0.0_fields.php similarity index 100% rename from install1/upgrade_run_3.0.0_fields.php rename to install/install/upgrade_run_3.0.0_fields.php diff --git a/install1/upgrade_run_3.0.0_files.php b/install/install/upgrade_run_3.0.0_files.php similarity index 100% rename from install1/upgrade_run_3.0.0_files.php rename to install/install/upgrade_run_3.0.0_files.php diff --git a/install1/upgrade_run_3.0.0_logs.php b/install/install/upgrade_run_3.0.0_logs.php similarity index 100% rename from install1/upgrade_run_3.0.0_logs.php rename to install/install/upgrade_run_3.0.0_logs.php diff --git a/install1/upgrade_run_3.0.0_passwords.php b/install/install/upgrade_run_3.0.0_passwords.php similarity index 100% rename from install1/upgrade_run_3.0.0_passwords.php rename to install/install/upgrade_run_3.0.0_passwords.php diff --git a/install1/upgrade_run_3.0.0_suggestions.php b/install/install/upgrade_run_3.0.0_suggestions.php similarity index 100% rename from install1/upgrade_run_3.0.0_suggestions.php rename to install/install/upgrade_run_3.0.0_suggestions.php diff --git a/install1/upgrade_run_3.0.0_users.php b/install/install/upgrade_run_3.0.0_users.php similarity index 100% rename from install1/upgrade_run_3.0.0_users.php rename to install/install/upgrade_run_3.0.0_users.php diff --git a/install1/upgrade_run_3.0.php b/install/install/upgrade_run_3.0.php similarity index 100% rename from install1/upgrade_run_3.0.php rename to install/install/upgrade_run_3.0.php diff --git a/install1/upgrade_run_3.1.php b/install/install/upgrade_run_3.1.php similarity index 100% rename from install1/upgrade_run_3.1.php rename to install/install/upgrade_run_3.1.php diff --git a/install1/upgrade_scripts_manager.php b/install/install/upgrade_scripts_manager.php similarity index 100% rename from install1/upgrade_scripts_manager.php rename to install/install/upgrade_scripts_manager.php diff --git a/pages/items.js.php b/pages/items.js.php index 174134d46..9e1b75e64 100755 --- a/pages/items.js.php +++ b/pages/items.js.php @@ -5714,6 +5714,7 @@ function(data) { //decrypt data data = prepareExchangedData(data, 'decode', 'get('key'); ?>', 'items.queries.php', 'image_preview_preparation'); if (debugJavascript === true) { + console.log('DEBUG : image preview'); console.log(data); } diff --git a/pages/profile.php b/pages/profile.php index 3b52c93ad..82b0b3977 100755 --- a/pages/profile.php +++ b/pages/profile.php @@ -283,7 +283,7 @@
  • get('tree_load_strategy'); ?> - get('user-tree_load_strategy') ? $session->get('user-tree_load_strategy') : ''; ?> + get('user-tree_load_strategy') ? $session->get('user-tree_load_strategy') : ''; ?>
    • get('user-private_key')) ); // Set the filename of the download - //$filename = base64_decode(basename($file_info['name'], '.'.$file_info['extension'])); - // Décoder si les valeurs sont encodées en base64 - $decoded_name = isBase64Encoded($file_info['name']) ? base64_decode($file_info['name']) : $file_info['name']; - $decoded_extension = isBase64Encoded($file_info['extension']) ? base64_decode($file_info['extension']) : $file_info['extension']; - - // Utilisation de basename pour retirer l'extension du nom de fichier décodé - $filename = basename($decoded_name, '.'.$decoded_extension); + $filename = basename($file_info['name'], '.' . $file_info['extension']); + $filename = isBase64($filename) === true ? base64_decode($filename) : $filename; // Output CSV-specific headers diff --git a/sources/items.queries.php b/sources/items.queries.php index a7d81fcef..bf80fddaa 100755 --- a/sources/items.queries.php +++ b/sources/items.queries.php @@ -3117,16 +3117,20 @@ $inputData['id'] ); foreach ($rows as $record) { + $filename = basename($record['name'], '.' . $record['extension']); + $filename = isBase64($filename) === true ? base64_decode($filename) : $filename; + array_push( $attachments, array( 'icon' => fileFormatImage(strtolower($record['extension'])), - 'filename' => basename($record['name'], '.' . $record['extension']), + 'filename' => $filename, 'extension' => $record['extension'], 'size' => formatSizeUnits((int) $record['size']), 'is_image' => in_array(strtolower($record['extension']), TP_IMAGE_FILE_EXT) === true ? 1 : 0, 'id' => $record['id'], 'key' => $session->get('user-key_tmp'), + 'internalFilename' => basename($record['name'], '.' . $record['extension']), ) ); } @@ -6111,14 +6115,11 @@ // prepare image info $post_title = basename($file_info['name'], '.' . $file_info['extension']); - $post_title = isBase64($post_title) === true ? - base64_decode($post_title) : $post_title; - $image_code = $file_info['file']; - //$extension = $file_info['extension']; - + $post_title = isBase64($post_title) === true ? base64_decode($post_title) : $post_title; + // Get image content $fileContent = decryptFile( - $image_code, + $file_info['file'], $SETTINGS['path_to_upload_folder'], decryptUserObjectKey($file_info['share_key'], $session->get('user-private_key')) ); diff --git a/sources/main.functions.php b/sources/main.functions.php index bb6ba0a07..2260f3d7a 100755 --- a/sources/main.functions.php +++ b/sources/main.functions.php @@ -2568,7 +2568,6 @@ function encryptFile(string $fileInName, string $fileInPath): array // Load classes $cipher = new Crypt_AES(); - $antiXSS = new AntiXSS(); // Generate an object key $objectKey = uniqidReal(32); @@ -2580,7 +2579,7 @@ function encryptFile(string $fileInName, string $fileInPath): array // Encrypt the file content $filePath = filter_var($fileInPath . '/' . $fileInName, FILTER_SANITIZE_URL); $fileContent = file_get_contents($filePath); - $plaintext = $antiXSS->xss_clean($fileContent); + $plaintext = $fileContent; $ciphertext = $cipher->encrypt($plaintext); // Save new file @@ -2625,6 +2624,8 @@ function decryptFile(string $fileName, string $filePath, string $key): string $safeFilePath = $filePath . '/' . TP_FILE_PREFIX . $safeFileName; $ciphertext = file_get_contents(filter_var($safeFilePath, FILTER_SANITIZE_URL)); + if (WIP) error_log('DEBUG: File image url -> '.filter_var($safeFilePath, FILTER_SANITIZE_URL)); + // Decrypt file content and return return base64_encode($cipher->decrypt($ciphertext)); }