Skip to content

Commit

Permalink
MyOOSDumper 2.4.18 improvement: option for binary container
Browse files Browse the repository at this point in the history
* The export of binary data in a binary container (hex format) is now optional and deactivated by default. Thus MOD behaves as before by default. With a new installation the switch is in a defined state. When updating MOD, the switch is in an undefined state until the switch state has been explicitly selected.
* Two new language variables have also been added for this. The languages en, de and de (formal) have been adapted. For all other languages, the new language variables with English texts have been added.
  • Loading branch information
LukeWCS committed Feb 14, 2021
1 parent c0275f9 commit 068e246
Show file tree
Hide file tree
Showing 17 changed files with 58 additions and 24 deletions.
17 changes: 9 additions & 8 deletions msd/config.php
Expand Up @@ -43,6 +43,7 @@

$config['empty_db_before_restore']=0;
$config['optimize_tables_beforedump']=1;
$config['use_binary_container']=0;
$config['stop_with_error']=1;

// For sending a mail after backup set send_mail to 1, otherless set to 0
Expand Down Expand Up @@ -75,20 +76,20 @@
$config['ftp_useSSL'][1]=0;
$config['ftp_mode'][1]=0;
$config['ftp_server'][1]='';
$config['ftp_port'][1]='21';
$config['ftp_user'][1]='';
$config['ftp_pass'][1]='';
$config['ftp_port'][1]='21';
$config['ftp_user'][1]='';
$config['ftp_pass'][1]='';
$config['ftp_dir'][1]='';

$config['ftp_transfer'][2]=0;
$config['ftp_timeout'][2]=30;
$config['ftp_useSSL'][2]=0;
$config['ftp_mode'][2]=0;
$config['ftp_server'][2]='';
$config['ftp_port'][2]='21';
$config['ftp_user'][2]='';
$config['ftp_pass'][2]='';
$config['ftp_dir'][2]='';
$config['ftp_port'][2]='21';
$config['ftp_user'][2]='';
$config['ftp_pass'][2]='';
$config['ftp_dir'][2]='';

//Multipart 0=off 1=on
$config['multi_part']=0;
Expand Down Expand Up @@ -123,4 +124,4 @@
$config['logcompression']=1;
$config['log_maxsize1']=1;
$config['log_maxsize2']=2;
$config['log_maxsize']=1048576;
$config['log_maxsize']=1048576;
5 changes: 5 additions & 0 deletions msd/config_overview.php
Expand Up @@ -220,6 +220,7 @@ function print_save_button()

if (isset($_POST['empty_db_before_restore'])) $config['empty_db_before_restore']=$_POST['empty_db_before_restore'];
if (isset($_POST['optimize_tables'])) $config['optimize_tables_beforedump']=$_POST['optimize_tables'];
if (isset($_POST['binary_container'])) $config['use_binary_container']=$_POST['binary_container'];
if (isset($_POST['cron_dbindex'])) $config['cron_dbindex']=$_POST['cron_dbindex'];
if (isset($_POST['cron_comment'])) $config['cron_comment']=$_POST['cron_comment'];

Expand Down Expand Up @@ -838,6 +839,10 @@ function WriteMem()
$aus['global1'].='<td><input type="radio" class="radio" value="1" name="optimize_tables" ' . ( (isset($config['optimize_tables_beforedump']) && ( $config['optimize_tables_beforedump'] == 1 )) ? " checked" : "" ) . '>&nbsp;' . $lang['L_ACTIVATED'];
$aus['global1'].='&nbsp;&nbsp;&nbsp;<input type="radio" class="radio" value="0" name="optimize_tables" ' . ( (isset($config['optimize_tables_beforedump']) && ( $config['optimize_tables_beforedump'] == 0 )) ? " checked" : "" ) . '>&nbsp;' . $lang['L_NOT_ACTIVATED'] . '</td></tr>';

$aus['global1'].='<tr><td>' . Help($lang['L_HELP_BINARY'],"") . $lang['L_BINARY'] . ':</td>';
$aus['global1'].='<td><input type="radio" class="radio" value="1" name="binary_container" ' . ( (isset($config['use_binary_container']) && ( $config['use_binary_container'] == 1 )) ? " checked" : "" ) . '>&nbsp;' . $lang['L_ACTIVATED'];
$aus['global1'].='&nbsp;&nbsp;&nbsp;<input type="radio" class="radio" value="0" name="binary_container" ' . ( (isset($config['use_binary_container']) && ( $config['use_binary_container'] == 0 )) ? " checked" : "" ) . '>&nbsp;' . $lang['L_NOT_ACTIVATED'] . '</td></tr>';

$aus['global1'].='</table></fieldset><fieldset><legend>' . $lang['L_RESTORE'] . '</legend><table>';
$aus['global1'].='<tr><td>' . Help($lang['L_HELP_EMPTY_DB_BEFORE_RESTORE'],"conf4") . $lang['L_EMPTY_DB_BEFORE_RESTORE'] . ':&nbsp;</td><td>';
$aus['global1'].='<input type="radio" class="radio" value="1" name="empty_db_before_restore" ' . ( (isset($config['empty_db_before_restore']) && ( $config['empty_db_before_restore'] == 1 )) ? " checked" : "" ) . '>&nbsp;' . $lang['L_YES'];
Expand Down
2 changes: 1 addition & 1 deletion msd/inc/functions_dump.php
Expand Up @@ -212,7 +212,7 @@ function get_content($db,$table)
else
{
$fieldinfo = mysqli_fetch_field_direct($result, $j);
if (($fieldinfo->flags & 128) == true)
if (($fieldinfo->flags & 128) == true && isset($config['use_binary_container']) && $config['use_binary_container'] == 1)
if ($row[$j] != '')
$insert .= '_binary 0x' . bin2hex($row[$j]) . ',';
else
Expand Down
4 changes: 3 additions & 1 deletion msd/language/ar/lang_config_overview.php
Expand Up @@ -18,6 +18,8 @@
$lang['L_CRON_MAILPRG']="برنامج البريد";
$lang['L_OPTIMIZE']="تحسين الجداول قبل عملية النسخ الاحتياطي";
$lang['L_HELP_OPTIMIZE']="وإذا قمت بتفعيل هذا الخيار ، كل الجداول كل الجداول سوف يتم تحسينها قبل بدء عملية النسخ الاحتياطي";
$lang['L_BINARY']="Export binary data in hex format";
$lang['L_HELP_BINARY']="If this option is activated, binary data are exported in hex format to avoid coding problems.";
$lang['L_HELP_FTPTIMEOUT']="سوف يتم اعادة الاعدادات الافتراضية خلال 90 ثانية.";
$lang['L_FTP_TIMEOUT']="انتهاء الفترة الزمنية";
$lang['L_HELP_FTPSSL']="اختر الاتصال الذي تم تأسيسه بواسطة via SSL.";
Expand Down Expand Up @@ -108,4 +110,4 @@
$lang['L_AUTODETECT']="auto detect";


?>
?>
4 changes: 3 additions & 1 deletion msd/language/ch/lang_config_overview.php
Expand Up @@ -17,6 +17,8 @@
$lang['L_CONFIG_CRONPERL']="Crondump-Iischtellige fürs Perlscript";
$lang['L_CRON_MAILPRG']="Mailprogramm";
$lang['L_OPTIMIZE']="Tabälle vorem Backup optimiere";
$lang['L_BINARY']="Export binary data in hex format";
$lang['L_HELP_BINARY']="If this option is activated, binary data are exported in hex format to avoid coding problems.";
$lang['L_HELP_OPTIMIZE']="Wänn die Option aktiviert isch, wärdet vor jedem Backup ali Tabälle optimiert.";
$lang['L_HELP_FTPTIMEOUT']="D Ziit, wo bi keiner Überträgig zum Timeout füert, Default = 90 Sekunde";
$lang['L_FTP_TIMEOUT']="Verbindigs-Timeout";
Expand Down Expand Up @@ -106,4 +108,4 @@
$lang['L_AUTODETECT']="auto detect";


?>
?>
4 changes: 3 additions & 1 deletion msd/language/da/lang_config_overview.php
Expand Up @@ -18,6 +18,8 @@
$lang['L_CRON_MAILPRG']="Mailprogram";
$lang['L_OPTIMIZE']="Optimér tabeller før backup";
$lang['L_HELP_OPTIMIZE']="Hvis denne indstilling er aktiveret, optimeres alle tabeller før backup";
$lang['L_BINARY']="Export binary data in hex format";
$lang['L_HELP_BINARY']="If this option is activated, binary data are exported in hex format to avoid coding problems.";
$lang['L_HELP_FTPTIMEOUT']="Standardindstilling for Timeout er 90 sekunder.";
$lang['L_FTP_TIMEOUT']="Forbindelses Timeout";
$lang['L_HELP_FTPSSL']="Vælg om forbindelsen skal etableres via SSL.";
Expand Down Expand Up @@ -107,4 +109,4 @@
$lang['L_AUTODETECT']="auto detect";


?>
?>
4 changes: 3 additions & 1 deletion msd/language/de/lang_config_overview.php
Expand Up @@ -18,6 +18,8 @@
$lang['L_CRON_MAILPRG']="Mailprogramm";
$lang['L_OPTIMIZE']="Tabellen vor dem Backup optimieren";
$lang['L_HELP_OPTIMIZE']="Wenn die Option aktiviert ist, werden vor jedem Backup alle Tabellen optimiert";
$lang['L_BINARY']="Exportiere binäre Daten im Hex-Format";
$lang['L_HELP_BINARY']="Bei aktivierter Option werden binäre Daten im Hex-Format exportiert um Kodierungsprobleme zu vermeiden.";
$lang['L_HELP_FTPTIMEOUT']="Die Zeit, die bei keiner Übertragung zum Timeout führt, Default = 90 Sekunden.";
$lang['L_FTP_TIMEOUT']="Verbindungs-Timeout";
$lang['L_HELP_FTPSSL']="Gibt an, ob eine sichere SSL-Verbindung für die Übertragung benutzt werden soll.";
Expand Down Expand Up @@ -108,4 +110,4 @@
$lang['L_AUTODETECT']="automatisch ermitteln";


?>
?>
4 changes: 3 additions & 1 deletion msd/language/de_du/lang_config_overview.php
Expand Up @@ -18,6 +18,8 @@
$lang['L_CRON_MAILPRG']="Mailprogramm";
$lang['L_OPTIMIZE']="Tabellen vor dem Backup optimieren";
$lang['L_HELP_OPTIMIZE']="Wenn die Option aktiviert ist, werden vor jedem Backup alle Tabellen optimiert";
$lang['L_BINARY']="Exportiere binäre Daten im Hex-Format";
$lang['L_HELP_BINARY']="If this option is activated, binary data are exported in hex format to avoid coding problems.";
$lang['L_HELP_FTPTIMEOUT']="Die Zeit, die bei keiner Übertragung zum Timeout führt, Default = 90 Sekunden.";
$lang['L_FTP_TIMEOUT']="Verbindungs-Timeout";
$lang['L_HELP_FTPSSL']="Gibt an, ob eine sichere SSL-Verbindung für die Übertragung benutzt werden soll.";
Expand Down Expand Up @@ -108,4 +110,4 @@
$lang['L_AUTODETECT']="automatisch ermitteln";


?>
?>
4 changes: 3 additions & 1 deletion msd/language/el/lang_config_overview.php
Expand Up @@ -18,6 +18,8 @@
$lang['L_CRON_MAILPRG']="Πρόγραμμα Mail";
$lang['L_OPTIMIZE']="βελτιστοποίηση πινάκων πριν το Αντίγραφο ασφαλείας";
$lang['L_HELP_OPTIMIZE']="Εαν αυτό είναι ενεργό, όλοι οι πίνακες θα βελτιστοποιηθούν πριν γίνει αντίγραφο ασφαλείας";
$lang['L_BINARY']="Export binary data in hex format";
$lang['L_HELP_BINARY']="If this option is activated, binary data are exported in hex format to avoid coding problems.";
$lang['L_HELP_FTPTIMEOUT']="προεπιλεγμένη ρύθμιση για υπέρβαση χρόνου είναι τα 90 δευτ.";
$lang['L_FTP_TIMEOUT']="Υπέρβαση χρόνου σύνδεσης";
$lang['L_HELP_FTPSSL']="Επιλέξτε εάν η σύνδεση θα γίνει μέσω SSL.";
Expand Down Expand Up @@ -108,4 +110,4 @@
$lang['L_AUTODETECT']="αυτόματος εντοπισμός";


?>
?>
6 changes: 4 additions & 2 deletions msd/language/en/lang_config_overview.php
Expand Up @@ -6,7 +6,7 @@
$lang['L_CONFIG_EMAIL']="Email Notification";
$lang['L_CONFIG_AUTODELETE']="Autodelete";
$lang['L_CONFIG_INTERFACE']="Interface";
$lang['L_MULTI_PART_GROESSE']="maximum File size";
$lang['L_MULTI_PART_GROESSE']="Maximum File size";
$lang['L_HELP_MULTIPART']="If Multipart is switched on, Backup creates multiple Backup files, with the maximum size determined by the configuration below";
$lang['L_HELP_MULTIPARTGROESSE']="The maximum size of Backup files is set here, if Multipart is switched on";
$lang['L_EMPTY_DB_BEFORE_RESTORE']="Delete tables before restoring";
Expand All @@ -18,6 +18,8 @@
$lang['L_CRON_MAILPRG']="Mail program";
$lang['L_OPTIMIZE']="Optimize Tables before Backup";
$lang['L_HELP_OPTIMIZE']="If this option is activated, all tables will be optimized before the backup";
$lang['L_BINARY']="Export binary data in hex format";
$lang['L_HELP_BINARY']="If this option is activated, binary data are exported in hex format to avoid coding problems.";
$lang['L_HELP_FTPTIMEOUT']="Default setting for Timeout is 90 seconds.";
$lang['L_FTP_TIMEOUT']="Connection Timeout";
$lang['L_HELP_FTPSSL']="Choose if the connection will be established via SSL.";
Expand Down Expand Up @@ -107,4 +109,4 @@
$lang['L_AUTODETECT']="auto detect";


?>
?>
4 changes: 3 additions & 1 deletion msd/language/es/lang_config_overview.php
Expand Up @@ -18,6 +18,8 @@
$lang['L_CRON_MAILPRG']="Programa de email";
$lang['L_OPTIMIZE']="Optimizar las tablas antes del backup";
$lang['L_HELP_OPTIMIZE']="Si esta opción está activada, se optimizarán todas las tablas antes de cada copia de seguridad";
$lang['L_BINARY']="Export binary data in hex format";
$lang['L_HELP_BINARY']="If this option is activated, binary data are exported in hex format to avoid coding problems.";
$lang['L_HELP_FTPTIMEOUT']="Tiempo de inactividad que tarda en cancelarse la conexión, 90 segundos por defecto.";
$lang['L_FTP_TIMEOUT']="Cancelación de la conexión";
$lang['L_HELP_FTPSSL']="Seleccione si la conexión debe ser establecida a través de SSL.";
Expand Down Expand Up @@ -108,4 +110,4 @@
$lang['L_AUTODETECT']="Identificar automáticamente";


?>
?>
4 changes: 3 additions & 1 deletion msd/language/fr/lang_config_overview.php
Expand Up @@ -18,6 +18,8 @@
$lang['L_CRON_MAILPRG']="Programme du courriel";
$lang['L_OPTIMIZE']="Optimiser les tables avant la sauvegarde";
$lang['L_HELP_OPTIMIZE']="Si cette option est activée, avant chaque sauvegarde les tables seront optimisées";
$lang['L_BINARY']="Export binary data in hex format";
$lang['L_HELP_BINARY']="If this option is activated, binary data are exported in hex format to avoid coding problems.";
$lang['L_HELP_FTPTIMEOUT']="Temps avant temporisation si aucun transfert n'est effectué, par défaut 90 sec.";
$lang['L_FTP_TIMEOUT']="Erreur de temporisation";
$lang['L_HELP_FTPSSL']="Choisir si la connexion doit être établie via SSL.";
Expand Down Expand Up @@ -110,4 +112,4 @@
$lang['L_AUTODETECT']="auto detect";


?>
?>
4 changes: 3 additions & 1 deletion msd/language/it/lang_config_overview.php
Expand Up @@ -18,6 +18,8 @@
$lang['L_CRON_MAILPRG']="Programma per le e-mail";
$lang['L_OPTIMIZE']="Ottimizza tabelle prima del backup";
$lang['L_HELP_OPTIMIZE']="Tutte le tabelle vengono ottimizzate prima del backup, se questa opzione è selezionata .";
$lang['L_BINARY']="Export binary data in hex format";
$lang['L_HELP_BINARY']="If this option is activated, binary data are exported in hex format to avoid coding problems.";
$lang['L_HELP_FTPTIMEOUT']="Il timeout per dichiarare fallita la connessione, Default 90 sec.";
$lang['L_FTP_TIMEOUT']="Timeout Connessione FTP";
$lang['L_HELP_FTPSSL']="Scegli se la connessione deve essere stabilita tramite SSL (connessione sicura).";
Expand Down Expand Up @@ -106,4 +108,4 @@
$lang['L_AUTODETECT']="riconoscimento automatico";


?>
?>
4 changes: 3 additions & 1 deletion msd/language/pt_br/lang_config_overview.php
Expand Up @@ -18,6 +18,8 @@
$lang['L_CRON_MAILPRG']="Programa de email";
$lang['L_OPTIMIZE']="Otimizar as tabelas antes do backup";
$lang['L_HELP_OPTIMIZE']="Se esta opção estiver ativada, todas as tabelas serão otimizadas antes do backup";
$lang['L_BINARY']="Export binary data in hex format";
$lang['L_HELP_BINARY']="If this option is activated, binary data are exported in hex format to avoid coding problems.";
$lang['L_HELP_FTPTIMEOUT']="O ajuste padrão para o Timeout é de 90 segundos.";
$lang['L_FTP_TIMEOUT']="Timeout da conexão";
$lang['L_HELP_FTPSSL']="Escolher se a conexão será estabelecida via SSL.";
Expand Down Expand Up @@ -108,4 +110,4 @@
$lang['L_AUTODETECT']="auto detect";


?>
?>
4 changes: 3 additions & 1 deletion msd/language/sw/lang_config_overview.php
Expand Up @@ -18,6 +18,8 @@
$lang['L_CRON_MAILPRG']="Epostprogram";
$lang['L_OPTIMIZE']="Optimera tabellerna före backup";
$lang['L_HELP_OPTIMIZE']="Aktivera denna option om alla tabeller skall optimeras före varje backup.";
$lang['L_BINARY']="Export binary data in hex format";
$lang['L_HELP_BINARY']="If this option is activated, binary data are exported in hex format to avoid coding problems.";
$lang['L_HELP_FTPTIMEOUT']="Den tid som leder till timeout om ingen överföring sker, standard 90 sekunder.";
$lang['L_FTP_TIMEOUT']="Förbindelse-timeout";
$lang['L_HELP_FTPSSL']="Anger om en säker SSL-förbindelse ska användas vid överföringen.";
Expand Down Expand Up @@ -106,4 +108,4 @@
$lang['L_AUTODETECT']="identifiera automatiskt";


?>
?>
4 changes: 3 additions & 1 deletion msd/language/tr/lang_config_overview.php
Expand Up @@ -18,6 +18,8 @@
$lang['L_CRON_MAILPRG']="Mail programı";
$lang['L_OPTIMIZE']="Tabloları yedeklemeden arındırma";
$lang['L_HELP_OPTIMIZE']="Aktiv durumda Tablolar yedeklemeden arındırılır";
$lang['L_BINARY']="Export binary data in hex format";
$lang['L_HELP_BINARY']="If this option is activated, binary data are exported in hex format to avoid coding problems.";
$lang['L_HELP_FTPTIMEOUT']="FTP sisteminin kapanmadan önceki hareketsizilik süresi, standart 90 saniyedir.";
$lang['L_FTP_TIMEOUT']="Bağlantı zaman aşımı";
$lang['L_HELP_FTPSSL']="Güvenli SSL bağlantısının kullanılmasını belirler";
Expand Down Expand Up @@ -107,4 +109,4 @@
$lang['L_AUTODETECT']="otomatik bul";


?>
?>
4 changes: 3 additions & 1 deletion msd/language/vn/lang_config_overview.php
Expand Up @@ -18,6 +18,8 @@
$lang['L_CRON_MAILPRG']="Chương trình Mail";
$lang['L_OPTIMIZE']="Tối ưu hóa những bảng trước khi Sao lưu";
$lang['L_HELP_OPTIMIZE']="Nếu tùy chọn này được kích hoạt, tất cả các bảng sẽ được tối ưu hóa trước khi sao lưu";
$lang['L_BINARY']="Export binary data in hex format";
$lang['L_HELP_BINARY']="If this option is activated, binary data are exported in hex format to avoid coding problems.";
$lang['L_HELP_FTPTIMEOUT']="Thiết đặt Mặc định cho thời gian ngắt kết nối (Timeout) là 90 giây.";
$lang['L_FTP_TIMEOUT']="Thời gian ngắt kết nối";
$lang['L_HELP_FTPSSL']="Hãy Chọn nếu kết nối sẽ được thiết lập qua SSL.";
Expand Down Expand Up @@ -109,4 +111,4 @@
$lang['L_AUTODETECT']="auto detect";


?>
?>

0 comments on commit 068e246

Please sign in to comment.