move function formatBytes to lib/classes/functions.inc.php

Florian Schaal

2013-12-27 5561eb82b5e9c6395c6919c29dbda66fe63ec422

move function formatBytes to lib/classes/functions.inc.php

 interface/lib/classes/functions.inc.php

@@ -309,11 +309,9 @@
     * @param int precicion - after-comma-numbers (default: 2)
     * @return string - formated bytes
     */


    public function formatBytes($size, $precision = 2) {
        $base=log($size)/log(1024);
        $suffixes=array('', 'k', 'M', 'G', 'T');
        $suffixes=array('', ' kB', ' MB', ' GB', ' TB');
        return round(pow(1024, $base-floor($base)), $precision).$suffixes[floor($base)];
    }


 server/lib/classes/cron.d/500-backup.inc.php

@@ -50,15 +50,6 @@
    public function onRunJob() {
        global $app, $conf;

        //######################################################################################################
        // 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'];
@@ -121,7 +112,7 @@
                            //* 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))."')";
                            $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)."','".$app->functions->formatBytes(filesize($web_backup_dir.'/'.$web_backup_file))."')";
                            $app->db->query($sql);
                            if($app->db->dbHost != $app->dbmaster->dbHost) $app->dbmaster->query($sql);
                        } else {
@@ -227,7 +218,7 @@
                                //* 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,'mysql','sqlgz',".time().",'".$app->db->quote($db_backup_file).".gz')";
                                //$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,'mysql','sqlgz',".time().",'".$app->db->quote($db_backup_file).".gz','".formatBytes(filesize($db_backup_dir.'/'.$db_backup_file))."')";
                                $sql = "INSERT INTO web_backup (server_id,parent_domain_id,backup_type,backup_mode,tstamp,filename,filesize) VALUES (".$conf['server_id'].",$web_id,'mysql','sqlgz',".time().",'".$app->db->quote($db_backup_file).".gz','".$app->functions->formatBytes(filesize($db_backup_dir.'/'.$db_backup_file))."')";
                                $app->db->query($sql);
                                if($app->db->dbHost != $app->dbmaster->dbHost) $app->dbmaster->query($sql);


 server/lib/classes/functions.inc.php

@@ -129,6 +129,18 @@
        return number_format((double)$number, $number_format_decimals, $number_format_dec_point, $number_format_thousands_sep);
    }

    /**
    * Function to change bytes to kB, MB, GB or TB
    * @param int $size - size in bytes
    * @param int precicion - after-comma-numbers (default: 2)
    * @return string - formated bytes
    */
    public function formatBytes($size, $precision = 2) {
        $base=log($size)/log(1024);
        $suffixes=array('', ' kB', ' MB', ' GB', ' TB');
        return round(pow(1024, $base-floor($base)), $precision).$suffixes[floor($base)];
    }

    public function get_ispconfig_url() {
        global $app;