Add web backup size in backup list.

tbrehm

2013-04-19 209f8ae15c1b2fb02f38d6ed5f9df3b13292d1d9

Add web backup size in backup list.

 install/sql/incremental/upd_0049.sql

@@ -1 +1,2 @@
ALTER TABLE `client_template` CHANGE `limit_aps` `limit_aps` INT( 11 ) NOT NULL DEFAULT '-1';
ALTER TABLE `client_template` CHANGE `limit_aps` `limit_aps` INT( 11 ) NOT NULL DEFAULT '-1';

ALTER TABLE `web_backup` ADD `filesize` VARCHAR(10) NOT NULL AFTER `filename`;


 install/sql/ispconfig3.sql

@@ -1628,12 +1628,13 @@
  `server_id` int(10) unsigned NOT NULL,
  `parent_domain_id` int(10) unsigned NOT NULL,
  `backup_type` enum('web','mysql') NOT NULL DEFAULT 'web',
  `backup_mode` varchar(64) NOT NULL DEFAULT  '',
  `tstamp` int(10) unsigned NOT NULL,
  `filename` varchar(255) NOT NULL,
  PRIMARY KEY (`backup_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;

  `backup_mode` varchar(64) NOT NULL DEFAULT  '',

  `tstamp` int(10) unsigned NOT NULL,

  `filename` varchar(255) NOT NULL,

  `filesize` VARCHAR(10) NOT NULL,

  PRIMARY KEY (`backup_id`)

) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;



-- --------------------------------------------------------

--

 interface/web/sites/lib/lang/en_web_backup_list.lng

@@ -1,16 +1,17 @@
<?php
$wb['list_head_txt'] = 'Existing backups';
$wb['date_txt'] = 'Date';
$wb['backup_type_txt'] = 'Type';
$wb['filename_txt'] = 'Backup file';
$wb['restore_backup_txt'] = 'Restore';
$wb['download_backup_txt'] = 'Download';
$wb['download_info_txt'] = 'The backup file will be available for download in the backup folder of the website in a few minutes.';
$wb['date_txt'] = 'Date';

$wb['backup_type_txt'] = 'Type';

$wb['filename_txt'] = 'Backup file';

$wb['filesize_txt'] = 'Filesize';

$wb['restore_backup_txt'] = 'Restore';

$wb['download_backup_txt'] = 'Download';

$wb['download_info_txt'] = 'The backup file will be available for download in the backup folder of the website in a few minutes.';

$wb['restore_info_txt'] = 'Restore of the backup has been started. This action takes several minutes to be completed.';
$wb['restore_confirm_txt'] = 'Restoring will overwrite existing files in your website. Do you really want to restore this backup?';
$wb['download_pending_txt'] = 'There is already a pending backup download job.';
$wb['restore_pending_txt'] = 'There is already a pending backup restore job.';
$wb['backup_type_mysql'] = 'MySQL Database';
$wb['backup_type_web'] = 'Website files';

?>
$wb['backup_type_mysql'] = 'MySQL Database';

$wb['backup_type_web'] = 'Website files';



?>


 interface/web/sites/templates/web_backup_list.htm

@@ -13,21 +13,23 @@
            <table class="list">
                <thead>
                    <tr class="caption">
                        <th class="tbl_col_date" scope="col"><tmpl_var name="date_txt"></th>
                        <th class="tbl_col_date" scope="col"><tmpl_var name="backup_type_txt"></th>
                        <th class="tbl_col_filename" scope="col"><tmpl_var name="filename_txt"></th>
                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                    </tr>
                </thead>
                        <th class="tbl_col_date" scope="col"><tmpl_var name="date_txt"></th>

                        <th class="tbl_col_date" scope="col"><tmpl_var name="backup_type_txt"></th>

                        <th class="tbl_col_filename" scope="col"><tmpl_var name="filename_txt"></th>

                        <th class="tbl_col_filename" scope="col"><tmpl_var name="filesize_txt"></th>

                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>

                    </tr>

                </thead>

                <tbody>
                    <tmpl_loop name="records">
                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
                            <td class="tbl_col_date">{tmpl_var name="date"}</td>
                            <td class="tbl_col_date">{tmpl_var name="backup_type"}</td>
                            <td class="tbl_col_filename">{tmpl_var name="filename"}</td>
                            <td class="tbl_col_buttons">
                                <div class="buttons">
                                    <button class="button iconstxt icoRestore" type="button" onclick="confirm_action('sites/web_domain_edit.php?id={tmpl_var name='parent_id'}&next_tab=backup&backup_action=restore&backup_id={tmpl_var name='backup_id'}','{tmpl_var name='restore_confirm_txt'}');"><span>{tmpl_var name="restore_backup_txt"}</span></button>
                            <td class="tbl_col_date">{tmpl_var name="date"}</td>

                            <td class="tbl_col_date">{tmpl_var name="backup_type"}</td>

                            <td class="tbl_col_filename">{tmpl_var name="filename"}</td>

                            <td class="tbl_col_filesize">{tmpl_var name="filesize"}</td>

                            <td class="tbl_col_buttons">

                                <div class="buttons">

                                    <button class="button iconstxt icoRestore" type="button" onclick="confirm_action('sites/web_domain_edit.php?id={tmpl_var name='parent_id'}&next_tab=backup&backup_action=restore&backup_id={tmpl_var name='backup_id'}','{tmpl_var name='restore_confirm_txt'}');"><span>{tmpl_var name="restore_backup_txt"}</span></button>

                                    <button class="button iconstxt icoDownload" type="button" onclick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='parent_id'}&next_tab=backup&backup_action=download&backup_id={tmpl_var name='backup_id'}');"><span>{tmpl_var name="download_backup_txt"}</span></button>
                                </div>
                            </td>
@@ -40,7 +42,7 @@
                    </tmpl_unless>
                </tbody>
            </table>
        </fieldset>
    </div>
    
</div>
        </fieldset>

    </div>

    
</div>


 server/cron_daily.php

@@ -766,12 +766,17 @@

}

#######################################################################################################
// Create website backups
#######################################################################################################

$server_config = $app->getconf->get_server_config($conf['server_id'], 'server');
$backup_dir = $server_config['backup_dir'];
#######################################################################################################

// Create website backups

#######################################################################################################

function formatBytes($size, $precision = 2) {

    $base=log($size)/log(1024);

    $suffixes=array('','k','M','G','T');   
        return round(pow(1024,$base-floor($base)),$precision).$suffixes[floor($base)];

}



$server_config = $app->getconf->get_server_config($conf['server_id'], 'server');

$backup_dir = $server_config['backup_dir'];

$backup_mode = $server_config['backup_mode'];
if($backup_mode == '') $backup_mode = 'userzip';

@@ -828,13 +833,14 @@
                chgrp($web_backup_dir.'/'.$web_backup_file, 'root');
                chmod($web_backup_dir.'/'.$web_backup_file, 0750);

                //* Insert web backup record in database
                //$insert_data = "(server_id,parent_domain_id,backup_type,backup_mode,tstamp,filename) VALUES (".$conf['server_id'].",".$web_id.",'web','".$backup_mode."',".time().",'".$app->db->quote($web_backup_file)."')";
                //$app->dbmaster->datalogInsert('web_backup', $insert_data, 'backup_id');
                $sql = "INSERT INTO web_backup (server_id,parent_domain_id,backup_type,backup_mode,tstamp,filename) VALUES (".$conf['server_id'].",".$web_id.",'web','".$backup_mode."',".time().",'".$app->db->quote($web_backup_file)."')";
                $app->db->query($sql);
                if($app->db->dbHost != $app->dbmaster->dbHost) $app->dbmaster->query($sql);
				
                //* Insert web backup record in database

                //$insert_data = "(server_id,parent_domain_id,backup_type,backup_mode,tstamp,filename) VALUES (".$conf['server_id'].",".$web_id.",'web','".$backup_mode."',".time().",'".$app->db->quote($web_backup_file)."')";

                //$app->dbmaster->datalogInsert('web_backup', $insert_data, 'backup_id');



                $sql = "INSERT INTO web_backup (server_id,parent_domain_id,backup_type,backup_mode,tstamp,filename,filesize) VALUES (".$conf['server_id'].",".$web_id.",'web','".$backup_mode."',".time().",'".$app->db->quote($web_backup_file)."','".formatBytes(filesize($web_backup_dir.'/'.$web_backup_file))."')";

                $app->db->query($sql);

                if($app->db->dbHost != $app->dbmaster->dbHost) $app->dbmaster->query($sql);

				
                //* Remove old backups
                $backup_copies = intval($rec['backup_copies']);