diff --git a/module/backup/control.php b/module/backup/control.php index e7581508b6..037ebb03af 100644 --- a/module/backup/control.php +++ b/module/backup/control.php @@ -73,12 +73,12 @@ class backup extends control { set_time_limit(0); session_write_close(); - $diskSapce = $this->backup->getDiskSpace($this->backupPath); - $diskSapce = explode(',', $diskSapce); + $diskSpace = $this->backup->getDiskSpace($this->backupPath); + $diskSpace = explode(',', $diskSpace); $space = new stdclass(); - $space->freeSpace = intval($diskSapce[0]); - $space->needSpace = intval($diskSapce[1]); + $space->freeSpace = intval($diskSpace[0]); + $space->needSpace = intval($diskSpace[1]); echo json_encode($space); } diff --git a/module/backup/js/index.js b/module/backup/js/index.js index c24b7dccf7..f60d964d97 100644 --- a/module/backup/js/index.js +++ b/module/backup/js/index.js @@ -32,9 +32,9 @@ $(function () }); $('.rmPHPHeader').click(function () { - $('#waitting .modal-body #backupType').html(rmPHPHeader); - $('#waitting .modal-content #message').hide(); - $('#waitting').modal('show'); + $('#waiting .modal-body #backupType').html(rmPHPHeader); + $('#waiting .modal-content #message').hide(); + $('#waiting').modal('show'); }); $('.restore').click(function () @@ -44,13 +44,13 @@ $(function () { if (result) { - $('#waitting .modal-body #backupType').html(restore); - $('#waitting .modal-content #message').hide(); - $('#waitting').modal('show'); + $('#waiting .modal-body #backupType').html(restore); + $('#waiting .modal-content #message').hide(); + $('#waiting').modal('show'); $.getJSON(url, function (response) { - $('#waitting').modal('hide'); + $('#waiting').modal('hide'); bootbox.alert(response.message); }); } @@ -70,22 +70,22 @@ function backupData() { url: $('.backup').attr('data-link'), success: function (data) { clearInterval(timeID); - $('#waitting .modal-body #message').append(data); + $('#waiting .modal-body #message').append(data); setTimeout(function () {return location.reload();}, 2000); }, error: function (request, textstatus, error) { clearInterval(timeID); - if (textstatus == 'timeout') $('#waitting .modal-body #message').append("

" + backupTimeout + '

'); + if (textstatus == 'timeout') $('#waiting .modal-body #message').append("

" + backupTimeout + '

'); setTimeout(function () {return location.reload();}, 2000); } }); - $('#waitting .modal-body #backupType').html(backup); - $('#waitting').modal('show'); + $('#waiting .modal-body #backupType').html(backup); + $('#waiting').modal('show'); timeID = setInterval(function () { $.get(createLink('backup', 'ajaxGetProgress'), function (data) { - $('#waitting .modal-content #message').html(data); + $('#waiting .modal-content #message').html(data); }); }, 1000); } diff --git a/module/backup/lang/de.php b/module/backup/lang/de.php index 78aa29eafd..f0a29950f7 100644 --- a/module/backup/lang/de.php +++ b/module/backup/lang/de.php @@ -30,7 +30,7 @@ $lang->backup->settingList['nosafe'] = 'Do not prevent downloading PHP file head global $config; if($config->inContainer) $lang->backup->settingList['nofile'] = 'Do not back up files.'; -$lang->backup->waitting = ' In Arbeit. Bitte warten...'; +$lang->backup->waiting = ' In Arbeit. Bitte warten...'; $lang->backup->progressSQL = '

SQL backup: %s is backed up.

'; $lang->backup->progressAttach = '

SQL backup is completed.

Attachment backing up.

'; $lang->backup->progressCode = '

SQL backup is completed.

Attachment backup is completed.

Code backing up.

'; diff --git a/module/backup/lang/en.php b/module/backup/lang/en.php index 0052887b55..e0ee9d7a93 100644 --- a/module/backup/lang/en.php +++ b/module/backup/lang/en.php @@ -30,7 +30,7 @@ $lang->backup->settingList['nosafe'] = 'Do not prevent downloading PHP file head global $config; if($config->inContainer) $lang->backup->settingList['nofile'] = 'Do not back up files.'; -$lang->backup->waitting = ' is ongoing. Please wait...'; +$lang->backup->waiting = ' is ongoing. Please wait...'; $lang->backup->progressSQL = '

SQL backup: %s is backed up.

'; $lang->backup->progressAttach = '

SQL backup is completed.

Attachment backing up.

'; $lang->backup->progressCode = '

SQL backup is completed.

Attachment backup is completed.

Code backing up.

'; diff --git a/module/backup/lang/fr.php b/module/backup/lang/fr.php index cf4f711df5..c9f0581f15 100644 --- a/module/backup/lang/fr.php +++ b/module/backup/lang/fr.php @@ -30,7 +30,7 @@ $lang->backup->settingList['nosafe'] = 'Ne pas prévenir du téléchargement par global $config; if($config->inContainer) $lang->backup->settingList['nofile'] = 'Ne pas archiver fichiers'; -$lang->backup->waitting = ' est en cours. Patientez s´il vous plait...'; +$lang->backup->waiting = ' est en cours. Patientez s´il vous plait...'; $lang->backup->progressSQL = '

SQL backup: %s est sauvegardé.

'; $lang->backup->progressAttach = '

SQL backup est terminé.

Les fichiers sont en cours de sauvegarde.

'; $lang->backup->progressCode = '

SQL backup est terminé.

Sauvegarde des fichiers terminée.

Sauvegarde du code en cours.

'; diff --git a/module/backup/lang/zh-cn.php b/module/backup/lang/zh-cn.php index 34af7bd650..c70372df5f 100644 --- a/module/backup/lang/zh-cn.php +++ b/module/backup/lang/zh-cn.php @@ -30,7 +30,7 @@ $lang->backup->settingList['nosafe'] = '不需要防下载PHP文件头'; global $config; if($config->inContainer) $lang->backup->settingList['nofile'] = '不备份附件'; -$lang->backup->waitting = '正在进行中,请稍候...'; +$lang->backup->waiting = '正在进行中,请稍候...'; $lang->backup->progressSQL = '

SQL备份中,已备份%s

'; $lang->backup->progressAttach = '

SQL备份完成

附件备份中,共有%s个文件,已经备份%s个

'; $lang->backup->progressCode = '

SQL备份完成

附件备份完成

代码备份中,共有%s个文件,已经备份%s个

'; diff --git a/module/backup/lang/zh-tw.php b/module/backup/lang/zh-tw.php index e4ac247956..5742b1d9bf 100644 --- a/module/backup/lang/zh-tw.php +++ b/module/backup/lang/zh-tw.php @@ -29,7 +29,7 @@ $lang->backup->settingList['nosafe'] = '不需要防下載PHP檔案頭'; global $config; if($config->inContainer) $lang->backup->settingList['nofile'] = '不備份附件'; -$lang->backup->waitting = '正在進行中,請稍候...'; +$lang->backup->waiting = '正在進行中,請稍候...'; $lang->backup->progressSQL = '

SQL備份中,已備份%s

'; $lang->backup->progressAttach = '

SQL備份完成

附件備份中,共有%s個檔案,已經備份%s個

'; $lang->backup->progressCode = '

SQL備份完成

附件備份完成

代碼備份中,共有%s個檔案,已經備份%s個

'; diff --git a/module/backup/ui/index.html.php b/module/backup/ui/index.html.php index 99cba34cd4..d4dcf8302e 100644 --- a/module/backup/ui/index.html.php +++ b/module/backup/ui/index.html.php @@ -118,7 +118,7 @@ dtable modal ( setID('waiting'), - html($lang->backup->waitting), + html($lang->backup->waiting), set::closeBtn(false), div ( diff --git a/module/backup/view/index.html.php b/module/backup/view/index.html.php index eda5520578..83f3968043 100644 --- a/module/backup/view/index.html.php +++ b/module/backup/view/index.html.php @@ -106,11 +106,11 @@ -