Weight Scales/Presets:

* moved wt_presets to DB
 * scales are now saved sensibly instead of just being dumped as is (also, tables have now constrains)
 * added admin=weight-presets to edit presets
 * added an internal user on id:0 who 'owns' the wt-presets and the +1 rates on new comments
 * consequently added constraints to comment-related tables

Misc:
 * Util::toJSON() priorizes its flags over CFG_DEBUG, wich fixes the modelviewer-redButton
 * moved terrible javascript-dump from admin-page to template

includes/ajaxHandler/account.class.php

@@ -50,19 +50,34 @@ class AjaxAccount extends AjaxHandler
             if (!$this->_post['scale'])
                 return 0;
 
-            if (!$this->_post['id'])
+            $id = 0;
+
+            if ($id = $this->_post['id'])
             {
-                $res = DB::Aowow()->selectRow('SELECT MAX(id) AS max, count(id) AS num FROM ?_account_weightscales WHERE userId = ?d', User::$id);
-                if ($res['num'] < 5)            // more or less hard-defined in LANG.message_weightscalesaveerror
-                    $this->_post['id'] = ++$res['max'];
-                else
+                if (!DB::Aowow()->selectCell('SELECT 1 FROM ?_account_weightscales WHERE userId = ?d AND id = ?d', User::$id, $id))
                     return 0;
             }
-
-            if (DB::Aowow()->query('REPLACE INTO ?_account_weightscales VALUES (?d, ?d, ?, ?)', $this->_post['id'], User::$id, $this->_post['name'], $this->_post['scale']))
-                return $this->_post['id'];
             else
-                return 0;
+            {
+                $nScales = DB::Aowow()->selectCell('SELECT COUNT(id) FROM ?_account_weightscales WHERE userId = ?d', User::$id);
+                if ($nScales >= 5)                          // more or less hard-defined in LANG.message_weightscalesaveerror
+                    return 0;
+
+                $id = DB::Aowow()->query('INSERT INTO ?_account_weightscales (`userId`, `name`) VALUES (?d, ?)', User::$id, $this->_post['name']);
+            }
+
+            DB::Aowow()->query('DELETE FROM ?_account_weightscale_data WHERE id = ?d', $id);
+
+            foreach (explode(',', $this->_post['scale']) as $s)
+            {
+                list($k, $v) = explode(':', $s);
+                if (!in_array($k, Util::$weightScales) || $v < 1)
+                    continue;
+
+                DB::Aowow()->query('INSERT INTO ?_account_weightscale_data VALUES (?d, ?, ?d)', $id, $k, $v);
+            }
+
+            return $id;
         }
         else if ($this->_post['delete'] && $this->_post['id'])
             DB::Aowow()->query('DELETE FROM ?_account_weightscales WHERE id = ?d AND userId = ?d', $this->_post['id'], User::$id);
@@ -77,4 +92,4 @@ class AjaxAccount extends AjaxHandler
 
         return null;
     }
-}
+}

includes/ajaxHandler/admin.class.php

@@ -5,7 +5,7 @@ if (!defined('AOWOW_REVISION'))
 
 class AjaxAdmin extends AjaxHandler
 {
-    protected $validParams = ['screenshots', 'siteconfig'];
+    protected $validParams = ['screenshots', 'siteconfig', 'weight-presets'];
     protected $_get        = array(
         'action' => [FILTER_SANITIZE_STRING,     0xC],          // FILTER_FLAG_STRIP_LOW | *_HIGH
         'id'     => [FILTER_CALLBACK,            ['options' => 'AjaxAdmin::checkId']],
@@ -17,7 +17,10 @@ class AjaxAdmin extends AjaxHandler
         'val'    => [FILTER_UNSAFE_RAW,          null]
     );
     protected $_post       = array(
-        'alt' => [FILTER_SANITIZE_STRING, FILTER_FLAG_STRIP_LOW],
+        'alt'    => [FILTER_SANITIZE_STRING,     FILTER_FLAG_STRIP_LOW],
+        'id'     => [FILTER_SANITIZE_NUMBER_INT, null],
+        'scale'  => [FILTER_CALLBACK,            ['options' => 'AjaxAccount::checkScale']],
+        '__icon' => [FILTER_CALLBACK,            ['options' => 'AjaxAdmin::checkKey']],
     );
 
     public function __construct(array $params)
@@ -30,7 +33,7 @@ class AjaxAdmin extends AjaxHandler
 
         if ($this->params[0] == 'screenshots')
         {
-            if (!User::isInGroup(U_GROUP_STAFF | U_GROUP_SCREENSHOT))  // comment_mod, handleSSmod, vi_mod ?
+            if (!User::isInGroup(U_GROUP_ADMIN | U_GROUP_BUREAU | U_GROUP_SCREENSHOT))
                 return;
 
             if ($this->_get['action'] == 'list')
@@ -60,6 +63,14 @@ class AjaxAdmin extends AjaxHandler
             else if ($this->_get['action'] == 'update')
                 $this->handler = 'confUpdate';
         }
+        else if ($this->params[0] == 'weight-presets')
+        {
+            if (!User::isInGroup(U_GROUP_DEV | U_GROUP_ADMIN | U_GROUP_BUREAU))
+                return;
+
+            if ($this->_get['action'] == 'save')
+                $this->handler = 'wtSave';
+        }
     }
 
     // get all => null (optional)
@@ -304,6 +315,74 @@ class AjaxAdmin extends AjaxHandler
         return '';
     }
 
+    protected function wtSave()
+    {
+        if (!$this->_post['id'] || !$this->_post['__icon'])
+            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
+
+        DB::Aowow()->query('DELETE FROM ?_account_weightscale_data WHERE id = ?d', $this->_post['id']);
+        DB::Aowow()->query('UPDATE ?_account_weightscales SET `icon`= ? WHERE `id` = ?d', $this->_post['__icon'], $this->_post['id']);
+
+        foreach (explode(',', $this->_post['scale']) as $s)
+        {
+            list($k, $v) = explode(':', $s);
+
+            if (!in_array($k, Util::$weightScales) || $v < 1)
+                continue;
+
+            if (DB::Aowow()->query('INSERT INTO ?_account_weightscale_data VALUES (?d, ?, ?d)', $this->_post['id'], $k, $v) === null)
+                return 1;
+        }
+
+
+        // write dataset
+
+        $wtPresets = [];
+        $scales    = DB::Aowow()->select('SELECT id, name, icon, class FROM ?_account_weightscales WHERE userId = 0 ORDER BY class, id ASC');
+
+        foreach ($scales as $s)
+        {
+            $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
+
+        return 0;
+    }
+
     protected function checkId($val)
     {
         // expecting id-list
@@ -331,4 +410,12 @@ class AjaxAdmin extends AjaxHandler
 
         return null;
     }
+
+    protected function checkScale($val)
+    {
+        if (preg_match('/^((\w+:\d+)(,\w+:\d+)*)$/', $val))
+            return $val;
+
+        return null;
+    }
 }