yolinlin/aowow
1
0
Fork 0
mirror of https://github.com/Sarjuuk/aowow.git synced 2025-11-29 15:58:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Admin/WeightPresets

Browse Source 
* removed redundant code
 * fixed empty scales not being written to dataset as expected
This commit is contained in:
Sarjuuk
2018-05-13 12:39:10 +02:00
parent 37652ce011
commit 45f325a0fa
1 changed files with 4 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
includes/ajaxHandler/admin.class.php
View File

@@ -349,26 +349,6 @@ class AjaxAdmin extends AjaxHandler
if (!$this->_post['id'] || !$this->_post['__icon']) if (!$this->_post['id'] || !$this->_post['__icon'])
return 3; return 3;
$writeFile = function($file, $content)
{
$success = false;
if ($handle = @fOpen($file, "w"))
{
if (fWrite($handle, $content))
$success = true;
fClose($handle);
}
else
die('me no file');
if ($success)
@chmod($file, Util::FILE_ACCESS);
return $success;
};
// save to db // save to db
DB::Aowow()->query('DELETE FROM ?_account_weightscale_data WHERE id = ?d', $this->_post['id']); DB::Aowow()->query('DELETE FROM ?_account_weightscale_data WHERE id = ?d', $this->_post['id']);
@@ -388,23 +368,10 @@ class AjaxAdmin extends AjaxHandler
// write dataset // write dataset
$wtPresets = []; exec('php aowow --build=weightPresets', $out);
$scales = DB::Aowow()->select('SELECT id, name, icon, class FROM ?_account_weightscales WHERE userId = 0 ORDER BY class, id ASC'); foreach ($out as $o)
if (strstr($o, 'ERR'))
foreach ($scales as $s) return 2;
{
$weights = DB::Aowow()->selectCol('SELECT field AS ARRAY_KEY, val FROM ?_account_weightscale_data WHERE id = ?d', $s['id']);
if (!$weights)
continue;
$wtPresets[$s['class']]['pve'][$s['name']] = array_merge(['__icon' => $s['icon']], $weights);
}
$toFile = "var wt_presets = ".Util::toJSON($wtPresets).";";
$file = 'datasets/weight-presets';
if (!$writeFile($file, $toFile))
return 2;
// all done // all done