diff --git a/extra-functions.c b/extra-functions.c index b00f2dea..763098da 100644 --- a/extra-functions.c +++ b/extra-functions.c @@ -23,7 +23,6 @@ #include #include #include - #include #include "bootloader.h" @@ -93,11 +92,12 @@ int check_backup_name(int show_error) { return 0; // A "0" (zero) means to use the current timestamp for the backup name for (index=0; index= 48 && cur_char <= 57) || (cur_char >= 65 && cur_char <= 91) || cur_char == 93 || cur_char == 95 || (cur_char >= 97 && cur_char <= 123) || cur_char == 125 || cur_char == 45 || cur_char == 46) { + if (cur_char == 32 || (cur_char >= 48 && cur_char <= 57) || (cur_char >= 65 && cur_char <= 91) || cur_char == 93 || cur_char == 95 || (cur_char >= 97 && cur_char <= 123) || cur_char == 125 || cur_char == 45 || cur_char == 46) { // These are valid characters // Numbers // Upper case letters // Lower case letters + // Space // and -_.{}[] } else { if (show_error) diff --git a/gui/devices/1024x600/res/ui.xml b/gui/devices/1024x600/res/ui.xml index bb1b0daa..4cfac6d2 100755 --- a/gui/devices/1024x600/res/ui.xml +++ b/gui/devices/1024x600/res/ui.xml @@ -1859,7 +1859,7 @@ %tw_backup_name% - + tw_filecheck=%tw_backups_folder%/%tw_backup_name% tw_existpage=backupname2 @@ -2200,7 +2200,7 @@ %tw_backup_rename% - + tw_back=restore tw_action=cmd diff --git a/gui/devices/1024x768/res/ui.xml b/gui/devices/1024x768/res/ui.xml index 2f1eec1c..35e6ab37 100644 --- a/gui/devices/1024x768/res/ui.xml +++ b/gui/devices/1024x768/res/ui.xml @@ -1859,7 +1859,7 @@ %tw_backup_name% - + tw_filecheck=%tw_backups_folder%/%tw_backup_name% tw_existpage=backupname2 @@ -2200,7 +2200,7 @@ %tw_backup_rename% - + tw_back=restore tw_action=cmd diff --git a/gui/devices/1280x800/res/ui.xml b/gui/devices/1280x800/res/ui.xml index cfe93359..f2808c28 100644 --- a/gui/devices/1280x800/res/ui.xml +++ b/gui/devices/1280x800/res/ui.xml @@ -1859,7 +1859,7 @@ %tw_backup_name% - + tw_filecheck=%tw_backups_folder%/%tw_backup_name% tw_existpage=backupname2 @@ -2200,7 +2200,7 @@ %tw_backup_rename% - + tw_back=restore tw_action=cmd diff --git a/gui/devices/1920x1200/res/ui.xml b/gui/devices/1920x1200/res/ui.xml index 2da3f7d0..13b0eb27 100644 --- a/gui/devices/1920x1200/res/ui.xml +++ b/gui/devices/1920x1200/res/ui.xml @@ -1859,7 +1859,7 @@ %tw_backup_name% - + tw_filecheck=%tw_backups_folder%/%tw_backup_name% tw_existpage=backupname2 @@ -2200,7 +2200,7 @@ %tw_backup_rename% - + tw_back=restore tw_action=cmd diff --git a/gui/devices/320x480/res/ui.xml b/gui/devices/320x480/res/ui.xml index e43ec691..b5ff423c 100644 --- a/gui/devices/320x480/res/ui.xml +++ b/gui/devices/320x480/res/ui.xml @@ -1438,7 +1438,7 @@ %tw_backup_name% - + tw_filecheck=%tw_backups_folder%/%tw_backup_name% tw_existpage=backupname2 @@ -1777,7 +1777,7 @@ %tw_backup_rename% - + tw_back=restore tw_action=cmd diff --git a/gui/devices/480x800/res/ui.xml b/gui/devices/480x800/res/ui.xml index de7304a3..c63b44b6 100644 --- a/gui/devices/480x800/res/ui.xml +++ b/gui/devices/480x800/res/ui.xml @@ -1437,7 +1437,7 @@ %tw_backup_name% - + tw_filecheck=%tw_backups_folder%/%tw_backup_name% tw_existpage=backupname2 @@ -1776,7 +1776,7 @@ %tw_backup_rename% - + tw_back=restore tw_action=cmd diff --git a/gui/devices/480x854/res/ui.xml b/gui/devices/480x854/res/ui.xml index c13ce5c5..ff2eea95 100644 --- a/gui/devices/480x854/res/ui.xml +++ b/gui/devices/480x854/res/ui.xml @@ -1436,7 +1436,7 @@ %tw_backup_name% - + tw_filecheck=%tw_backups_folder%/%tw_backup_name% tw_existpage=backupname2 @@ -1775,7 +1775,7 @@ %tw_backup_rename% - + tw_back=restore tw_action=cmd diff --git a/gui/devices/540x960/res/ui.xml b/gui/devices/540x960/res/ui.xml index 43268111..1e3814d8 100644 --- a/gui/devices/540x960/res/ui.xml +++ b/gui/devices/540x960/res/ui.xml @@ -1437,7 +1437,7 @@ %tw_backup_name% - + tw_filecheck=%tw_backups_folder%/%tw_backup_name% tw_existpage=backupname2 @@ -1776,7 +1776,7 @@ %tw_backup_rename% - + tw_back=restore tw_action=cmd diff --git a/gui/devices/720x1280/res/ui.xml b/gui/devices/720x1280/res/ui.xml index 13a52ba6..9d073260 100644 --- a/gui/devices/720x1280/res/ui.xml +++ b/gui/devices/720x1280/res/ui.xml @@ -1442,7 +1442,7 @@ %tw_backup_name% - + tw_filecheck=%tw_backups_folder%/%tw_backup_name% tw_existpage=backupname2 @@ -1781,7 +1781,7 @@ %tw_backup_rename% - + tw_back=restore tw_action=cmd diff --git a/gui/devices/800x1280/res/ui.xml b/gui/devices/800x1280/res/ui.xml index 552a12c0..f9ea3115 100755 --- a/gui/devices/800x1280/res/ui.xml +++ b/gui/devices/800x1280/res/ui.xml @@ -1438,7 +1438,7 @@ %tw_backup_name% - + tw_filecheck=%tw_backups_folder%/%tw_backup_name% tw_existpage=backupname2 @@ -1777,7 +1777,7 @@ %tw_backup_rename% - + tw_back=restore tw_action=cmd diff --git a/gui/devices/800x480/res/ui.xml b/gui/devices/800x480/res/ui.xml index 798b08db..0400f55e 100755 --- a/gui/devices/800x480/res/ui.xml +++ b/gui/devices/800x480/res/ui.xml @@ -1859,7 +1859,7 @@ %tw_backup_name% - + tw_filecheck=%tw_backups_folder%/%tw_backup_name% tw_existpage=backupname2 @@ -2200,7 +2200,7 @@ %tw_backup_rename% - + tw_back=restore tw_action=cmd