From 9d20eb01b3a6abbfadaba679feeff2f6bb2bf55b Mon Sep 17 00:00:00 2001 From: Tanguy Pruvot Date: Wed, 27 Apr 2016 05:16:14 +0200 Subject: [PATCH] backups: prefer xz if available --- web/yaamp/core/backend/system.php | 15 +++++++++++---- web/yaamp/modules/site/admin_results.php | 10 +++++----- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/web/yaamp/core/backend/system.php b/web/yaamp/core/backend/system.php index 37f951e..576d84e 100644 --- a/web/yaamp/core/backend/system.php +++ b/web/yaamp/core/backend/system.php @@ -3,16 +3,23 @@ function BackendDoBackup() { $d = date('Y-m-d-H', time()); - $filename = "/root/backup/yaamp-$d.sql.gz"; + $filename = "/root/backup/yaamp-$d.sql"; + + if (is_readable("/usr/bin/xz")) { + $ziptool = "xz"; $filename .= ".xz"; + } else { + $ziptool = "gzip"; $filename .= ".gz"; + } include_once("/etc/yiimp/keys.php"); - $host = YAAMP_DBHOST; - $db = YAAMP_DBNAME; + $host = YAAMP_DBHOST; + $db = YAAMP_DBNAME; + $user = YIIMP_MYSQLDUMP_USER; $pass = YIIMP_MYSQLDUMP_PASS; - system("mysqldump -h $host -u$user -p$pass --skip-extended-insert $db | gzip > $filename"); + system("mysqldump -h $host -u$user -p$pass --skip-extended-insert $db | $ziptool > $filename"); } function BackendQuickClean() diff --git a/web/yaamp/modules/site/admin_results.php b/web/yaamp/modules/site/admin_results.php index 9249996..86125d9 100644 --- a/web/yaamp/modules/site/admin_results.php +++ b/web/yaamp/modules/site/admin_results.php @@ -71,16 +71,16 @@ foreach($coins as $coin) echo ''; $lowsymbol = strtolower($coin->symbol); - echo ""; + echo ''; $algo_color = getAlgoColors($coin->algo); - echo ""; + echo ''; if($coin->enable) { echo "u"; - if($coin->auto_ready) echo " a"; - else echo " d"; + if($coin->auto_ready) echo ' a'; + else echo ' d'; echo '
'; @@ -92,7 +92,7 @@ foreach($coins as $coin) if($coin->block_height < $coin->target_height) { $percent = round($coin->block_height*100/$coin->target_height, 2); - echo "
$percent%"; + echo '
'.$percent.'%'; } }