Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Fix typo.

Browse Source
This commit is contained in:
dingguodong
2024-06-12 10:10:46 +08:00
committed by caoyanyi
parent d691f2f89f
commit c6ea565c1b
20 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/backup/control.php
+4 -4
View File
@@ -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);
}
module/backup/js/index.js
+12 -12
View File
@@ -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("<p class='text-danger'>" + backupTimeout + '</p>');
if (textstatus == 'timeout') $('#waiting .modal-body #message').append("<p class='text-danger'>" + backupTimeout + '</p>');
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);
}
module/backup/lang/de.php
+1 -1
View File
@@ -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 = '<span id="backupType"></span> In Arbeit. Bitte warten...';
$lang->backup->waiting = '<span id="backupType"></span> In Arbeit. Bitte warten...';
$lang->backup->progressSQL = '<p>SQL backup: %s is backed up.</p>';
$lang->backup->progressAttach = '<p>SQL backup is completed.</p><p>Attachment backing up.</p>';
$lang->backup->progressCode = '<p>SQL backup is completed.</p><p>Attachment backup is completed.</p><p>Code backing up.</p>';
module/backup/lang/en.php
+1 -1
View File
@@ -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 = '<span id="backupType"></span> is ongoing. Please wait...';
$lang->backup->waiting = '<span id="backupType"></span> is ongoing. Please wait...';
$lang->backup->progressSQL = '<p>SQL backup: %s is backed up.</p>';
$lang->backup->progressAttach = '<p>SQL backup is completed.</p><p>Attachment backing up.</p>';
$lang->backup->progressCode = '<p>SQL backup is completed.</p><p>Attachment backup is completed.</p><p>Code backing up.</p>';
module/backup/lang/fr.php
+1 -1
View File
@@ -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 = '<span id="backupType"></span> est en cours. Patientez s´il vous plait...';
$lang->backup->waiting = '<span id="backupType"></span> est en cours. Patientez s´il vous plait...';
$lang->backup->progressSQL = '<p>SQL backup: %s est sauvegardé.</p>';
$lang->backup->progressAttach = '<p>SQL backup est terminé.</p><p>Les fichiers sont en cours de sauvegarde.</p>';
$lang->backup->progressCode = '<p>SQL backup est terminé.</p><p>Sauvegarde des fichiers terminée.</p><p>Sauvegarde du code en cours.</p>';
module/backup/lang/zh-cn.php
+1 -1
View File
@@ -30,7 +30,7 @@ $lang->backup->settingList['nosafe'] = '不需要防下载PHP文件头';
global $config;
if($config->inContainer) $lang->backup->settingList['nofile'] = '不备份附件';
$lang->backup->waitting = '<span id="backupType"></span>正在进行中，请稍候...';
$lang->backup->waiting = '<span id="backupType"></span>正在进行中，请稍候...';
$lang->backup->progressSQL = '<p>SQL备份中，已备份%s</p>';
$lang->backup->progressAttach = '<p>SQL备份完成</p><p>附件备份中，共有%s个文件，已经备份%s个</p>';
$lang->backup->progressCode = '<p>SQL备份完成</p><p>附件备份完成</p><p>代码备份中，共有%s个文件，已经备份%s个</p>';
module/backup/lang/zh-tw.php
+1 -1
View File
@@ -29,7 +29,7 @@ $lang->backup->settingList['nosafe'] = '不需要防下載PHP檔案頭';
global $config;
if($config->inContainer) $lang->backup->settingList['nofile'] = '不備份附件';
$lang->backup->waitting = '<span id="backupType"></span>正在進行中，請稍候...';
$lang->backup->waiting = '<span id="backupType"></span>正在進行中，請稍候...';
$lang->backup->progressSQL = '<p>SQL備份中，已備份%s</p>';
$lang->backup->progressAttach = '<p>SQL備份完成</p><p>附件備份中，共有%s個檔案，已經備份%s個</p>';
$lang->backup->progressCode = '<p>SQL備份完成</p><p>附件備份完成</p><p>代碼備份中，共有%s個檔案，已經備份%s個</p>';
module/backup/ui/index.html.php
+1 -1
View File
@@ -118,7 +118,7 @@ dtable
modal
(
setID('waiting'),
html($lang->backup->waitting),
html($lang->backup->waiting),
set::closeBtn(false),
div
(
module/backup/view/index.html.php
+2 -2
View File
@@ -106,11 +106,11 @@
</h2>
</div>
</div>
<div class="modal fade" id="waitting" tabindex="-1" role="dialog" aria-hidden="true">
<div class="modal fade" id="waiting" tabindex="-1" role="dialog" aria-hidden="true">
<div class="modal-dialog w-400px">
<div class="modal-content">
<div class="modal-body">
<p><?php echo $lang->backup->waitting?></p>
<p><?php echo $lang->backup->waiting?></p>
<div id='message'><?php echo sprintf($lang->backup->progressSQL, 0);?></div>
</div>
</div>
module/execution/lang/de.php
+1 -1
View File
@@ -587,7 +587,7 @@ $lang->execution->action->managed = '$date, managed by <strong>$act
$lang->execution->action->edited = '$date, edited by <strong>$actor</strong>. $extra' . "\n";
$lang->execution->action->extra = "Linked {$lang->productCommon}s is %s.";
$lang->execution->action->startbychildactivate = '$date, activating the sub stage sets the execution status as Ongoing.' . "\n";
$lang->execution->action->waitbychilddelete = '$date, deleting the sub stage sets the execution status as waitting.' . "\n";
$lang->execution->action->waitbychilddelete = '$date, deleting the sub stage sets the execution status as waiting.' . "\n";
$lang->execution->action->closebychilddelete = '$date, deleting the sub stage sets the execution status as closing.' . "\n";
$lang->execution->action->closebychildclose = '$date, closing the sub stage sets the execution status as closing.' . "\n";
$lang->execution->action->waitbychild = '$date, the stage status is <strong>Wait</strong> as the system judges that all its sub-stages statuses are <strong>Wait</strong>.';
module/execution/lang/en.php
+1 -1
View File
@@ -587,7 +587,7 @@ $lang->execution->action->managed = '$date, managed by <strong>$act
$lang->execution->action->edited = '$date, edited by <strong>$actor</strong>. $extra' . "\n";
$lang->execution->action->extra = "Linked {$lang->productCommon}s is %s.";
$lang->execution->action->startbychildactivate = '$date, activating the sub stage sets the execution status as Ongoing.' . "\n";
$lang->execution->action->waitbychilddelete = '$date, deleting the sub stage sets the execution status as waitting.' . "\n";
$lang->execution->action->waitbychilddelete = '$date, deleting the sub stage sets the execution status as waiting.' . "\n";
$lang->execution->action->closebychilddelete = '$date, deleting the sub stage sets the execution status as closing.' . "\n";
$lang->execution->action->closebychildclose = '$date, closing the sub stage sets the execution status as closing.' . "\n";
$lang->execution->action->waitbychild = '$date, the stage status is <strong>Wait</strong> as the system judges that all its sub-stages statuses are <strong>Wait</strong>.';
module/execution/lang/fr.php
+1 -1
View File
@@ -587,7 +587,7 @@ $lang->execution->action->managed = '$date, managed by <strong>$act
$lang->execution->action->edited = '$date, edited by <strong>$actor</strong>. $extra' . "\n";
$lang->execution->action->extra = "Linked {$lang->productCommon}s is %s.";
$lang->execution->action->startbychildactivate = '$date, activating the sub stage sets the execution status as Ongoing.' . "\n";
$lang->execution->action->waitbychilddelete = '$date, deleting the sub stage sets the execution status as waitting.' . "\n";
$lang->execution->action->waitbychilddelete = '$date, deleting the sub stage sets the execution status as waiting.' . "\n";
$lang->execution->action->closebychilddelete = '$date, deleting the sub stage sets the execution status as closing.' . "\n";
$lang->execution->action->closebychildclose = '$date, closing the sub stage sets the execution status as closing.' . "\n";
$lang->execution->action->waitbychild = '$date, the stage status is <strong>Wait</strong> as the system judges that all its sub-stages statuses are <strong>Wait</strong>.';
module/system/js/backupplatform.ui.js
+1 -1
View File
@@ -18,7 +18,7 @@ function startBackup()
{
if(response.result == 'success')
{
$('.modal-content .panel-body').html(waitting);
$('.modal-content .panel-body').html(waiting);
backupName = response.name;
backupInterval = setInterval(checkBackup, 2000);
}
module/system/lang/de.php
+3 -3
View File
@@ -32,7 +32,7 @@ $lang->system->memUsage = 'Memory（GB）';
/* LDAP */
$lang->system->LDAP = new stdclass;
$lang->system->LDAP->info = 'LDAP infomation';
$lang->system->LDAP->info = 'LDAP information';
$lang->system->LDAP->ldapEnabled = 'Enable LDAP';
$lang->system->LDAP->ldapQucheng = 'Built in Qucheng';
$lang->system->LDAP->ldapSource = 'Source';
@@ -227,8 +227,8 @@ $lang->system->backup->typeList['manual'] = 'Manual backup';
$lang->system->backup->typeList['upgrade'] = 'Automatic backup before upgrade';
$lang->system->backup->typeList['restore'] = 'Automatic backup before rollback';
$lang->system->backup->waitting = 'Backup is in progress, please wait...';
$lang->system->backup->waittingStore = 'Restoring app data, please wait...';
$lang->system->backup->waiting = 'Backup is in progress, please wait...';
$lang->system->backup->waitingStore = 'Restoring app data, please wait...';
$lang->system->backup->progress = 'Backup in progress（%d/%d）';
$lang->system->backup->progressStore = 'Restoring, progress(%d/%d)';
$lang->system->backup->progressSQL = 'In backup，%s has been backed up';
module/system/lang/en.php
+3 -3
View File
@@ -32,7 +32,7 @@ $lang->system->memUsage = 'Memory（GB）';
/* LDAP */
$lang->system->LDAP = new stdclass;
$lang->system->LDAP->info = 'LDAP infomation';
$lang->system->LDAP->info = 'LDAP information';
$lang->system->LDAP->ldapEnabled = 'Enable LDAP';
$lang->system->LDAP->ldapQucheng = 'Built in Qucheng';
$lang->system->LDAP->ldapSource = 'Source';
@@ -227,8 +227,8 @@ $lang->system->backup->typeList['manual'] = 'Manual backup';
$lang->system->backup->typeList['upgrade'] = 'Automatic backup before upgrade';
$lang->system->backup->typeList['restore'] = 'Automatic backup before rollback';
$lang->system->backup->waitting = 'Backup is in progress, please wait...';
$lang->system->backup->waittingStore = 'Restoring app data, please wait...';
$lang->system->backup->waiting = 'Backup is in progress, please wait...';
$lang->system->backup->waitingStore = 'Restoring app data, please wait...';
$lang->system->backup->progress = 'Backup in progress（%d/%d）';
$lang->system->backup->progressStore = 'Restoring, progress(%d/%d)';
$lang->system->backup->progressSQL = 'In backup，%s has been backed up';
module/system/lang/fr.php
+3 -3
View File
@@ -32,7 +32,7 @@ $lang->system->memUsage = 'Memory（GB）';
/* LDAP */
$lang->system->LDAP = new stdclass;
$lang->system->LDAP->info = 'LDAP infomation';
$lang->system->LDAP->info = 'LDAP information';
$lang->system->LDAP->ldapEnabled = 'Enable LDAP';
$lang->system->LDAP->ldapQucheng = 'Built in Qucheng';
$lang->system->LDAP->ldapSource = 'Source';
@@ -227,8 +227,8 @@ $lang->system->backup->typeList['manual'] = 'Manual backup';
$lang->system->backup->typeList['upgrade'] = 'Automatic backup before upgrade';
$lang->system->backup->typeList['restore'] = 'Automatic backup before rollback';
$lang->system->backup->waitting = 'Backup is in progress, please wait...';
$lang->system->backup->waittingStore = 'Restoring app data, please wait...';
$lang->system->backup->waiting = 'Backup is in progress, please wait...';
$lang->system->backup->waitingStore = 'Restoring app data, please wait...';
$lang->system->backup->progress = 'Backup in progress（%d/%d）';
$lang->system->backup->progressStore = 'Restoring, progress(%d/%d)';
$lang->system->backup->progressSQL = 'In backup，%s has been backed up';
module/system/lang/zh-cn.php
+2 -2
View File
@@ -227,8 +227,8 @@ $lang->system->backup->typeList['manual'] = '手动备份';
$lang->system->backup->typeList['upgrade'] = '升级前自动备份';
$lang->system->backup->typeList['restore'] = '回滚前自动备份';
$lang->system->backup->waitting = '备份正在进行中，请稍候...';
$lang->system->backup->waittingStore = '正在还原应用数据，请稍候...';
$lang->system->backup->waiting = '备份正在进行中，请稍候...';
$lang->system->backup->waitingStore = '正在还原应用数据，请稍候...';
$lang->system->backup->progress = '备份中，进度（%d/%d）';
$lang->system->backup->progressStore = '还原中，进度（%d/%d）';
$lang->system->backup->progressSQL = '备份中，已备份%s';
module/system/model.php
+1 -1
View File
@@ -44,7 +44,7 @@ class systemModel extends model
/**
* 保存自定义的域名设置。
* Save customized somain settings.
* Save customized domain settings.
*
* @param object $setting
* @access public
module/system/ui/backupplatform.html.php
+1 -1
View File
@@ -10,7 +10,7 @@ declare(strict_types=1);
*/
namespace zin;
jsVar('waitting', $lang->system->backup->waitting);
jsVar('waiting', $lang->system->backup->waiting);
modalHeader(set::title($lang->system->backup->backup));
formPanel
module/system/ui/restorebackup.html.php
+1 -1
View File
@@ -16,7 +16,7 @@ jsVar('error', $error);
div
(
setClass('restoreProgress text-3xl'),
$lang->system->backup->waittingStore
$lang->system->backup->waitingStore
);
render();