* Fixed reload on backup completion.

nuxsmin · Aug 3, 2014 · dc9537c · dc9537c
1 parent 668343f
commit dc9537c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/ajax/ajax_backup.php b/ajax/ajax_backup.php
@@ -39,6 +39,10 @@
 }
 
 $doBackup = SP_Common::parseParams('p', 'backup', 0);
+$frmOnCloseAction = SP_Common::parseParams('p', 'onCloseAction');
+$frmActiveTab = SP_Common::parseParams('p', 'activeTab', 0);
+
+$doActionOnClose = "doAction('$frmOnCloseAction','',$frmActiveTab);";
 
 if ($doBackup) {
     if (!SP_Backup::doBackup()) {
@@ -51,5 +55,5 @@
     SP_Log::wrLogInfo($message);
     SP_Common::sendEmail($message);
 
-    SP_Common::printJSON(_('Proceso de backup finalizado'), 0);
+    SP_Common::printJSON(_('Proceso de backup finalizado'), 0, $doActionOnClose);
 }
diff --git a/inc/tpl/backup.php b/inc/tpl/backup.php
@@ -27,6 +27,7 @@
 
 $action = $data['action'];
 $activeTab = $data['activeTab'];
+$onCloseAction = $data['onCloseAction'];
 
 SP_ACL::checkUserAccess($action) || SP_Html::showCommonError('unavailable');
 
@@ -38,7 +39,7 @@
 );
 $backupDbFile = array('absolute' => $backupDir . DIRECTORY_SEPARATOR . $siteName . '_db.sql', 'relative' => $backupPath . '/' . $siteName . '_db.sql');
 
-$lastBackupTime = (file_exists($backupFile['absolute'])) ? _('Último backup') . ": " . date("F d Y H:i:s.", filemtime($backupFile['absolute'])) : _('No se encontraron backups');
+$lastBackupTime = (file_exists($backupFile['absolute'])) ? _('Último backup') . ": " . date("r", filemtime($backupFile['absolute'])) : _('No se encontraron backups');
 ?>
 
 <table class="data round">
@@ -67,6 +68,7 @@
 </table>
 
 <form method="post" name="frmBackup" id="frmBackup">
+    <input type="hidden" name="onCloseAction" value="<?php echo $onCloseAction ?>" />
     <input type="hidden" name="activeTab" value="<?php echo $activeTab ?>"/>
     <input type="hidden" name="backup" value="1"/>
     <input type="hidden" name="isAjax" value="1"/>

diff --git a/inc/util.class.php b/inc/util.class.php
@@ -254,7 +254,7 @@ public static function checkUpdates()
      */
     public static function getVersion($retBuild = false)
     {
-        $build = 12;
+        $build = 13;
         $version = array(1, 1, 2);
 
         if ($retBuild) {