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/Config

Browse Source 
* fixed calling $this in static context (broke web-config)
This commit is contained in:
Sarjuuk
2016-01-31 22:35:27 +01:00
parent 63cd83c102
commit 7c1e61d843
2 changed files with 19 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,6 +9,7 @@ class AjaxAdmin extends AjaxHandler
protected $_get = array( protected $_get = array(
'action' => [FILTER_SANITIZE_STRING, 0xC], // FILTER_FLAG_STRIP_LOW | *_HIGH 'action' => [FILTER_SANITIZE_STRING, 0xC], // FILTER_FLAG_STRIP_LOW | *_HIGH
'id' => [FILTER_CALLBACK, ['options' => 'AjaxAdmin::checkId']], 'id' => [FILTER_CALLBACK, ['options' => 'AjaxAdmin::checkId']],
'key' => [FILTER_CALLBACK, ['options' => 'AjaxAdmin::checkKey']],
'all' => [FILTER_UNSAFE_RAW, null], 'all' => [FILTER_UNSAFE_RAW, null],
'type' => [FILTER_CALLBACK, ['options' => 'AjaxHandler::checkInt']], 'type' => [FILTER_CALLBACK, ['options' => 'AjaxHandler::checkInt']],
'typeid' => [FILTER_CALLBACK, ['options' => 'AjaxHandler::checkInt']], 'typeid' => [FILTER_CALLBACK, ['options' => 'AjaxHandler::checkInt']],
@@ -248,7 +249,7 @@ class AjaxAdmin extends AjaxHandler
protected function confAdd() protected function confAdd()
{ {
$key = $this->_get['id']; $key = $this->_get['key'];
$val = $this->_get['val']; $val = $this->_get['val'];
if ($key === null) if ($key === null)
@@ -269,10 +270,10 @@ class AjaxAdmin extends AjaxHandler
protected function confRemove() protected function confRemove()
{ {
if (!$this->_get['id']) if (!$this->_get['key'])
return 'invalid configuration option given'; return 'invalid configuration option given';
if (DB::Aowow()->query('DELETE FROM ?_config WHERE `key` = ? AND (`flags` & ?d) = 0', $this->_get['id'], CON_FLAG_PERSISTENT)) if (DB::Aowow()->query('DELETE FROM ?_config WHERE `key` = ? AND (`flags` & ?d) = 0', $this->_get['key'], CON_FLAG_PERSISTENT))
return ''; return '';
else else
return 'option name is either protected or was not found'; return 'option name is either protected or was not found';
@@ -280,7 +281,7 @@ class AjaxAdmin extends AjaxHandler
protected function confUpdate() protected function confUpdate()
{ {
$key = trim($this->_get['id']); $key = trim($this->_get['key']);
$val = trim($this->_get['val']); $val = trim($this->_get['val']);
if (!strlen($key)) if (!strlen($key))
@@ -305,30 +306,22 @@ class AjaxAdmin extends AjaxHandler
protected function checkId($val) protected function checkId($val)
{ {
if (!$this->params)
return null;
// expecting id-list // expecting id-list
if ($this->params[0] == 'screenshots')
{
if (preg_match('/\d+(,\d+)*/', $val)) if (preg_match('/\d+(,\d+)*/', $val))
return array_map('intVal', explode(',', $val)); return array_map('intVal', explode(',', $val));
return null; return null;
} }
// expecting string protected function checkKey($val)
if ($this->params[0] == 'siteconfig')
{ {
// expecting string
if (preg_match('/[^a-z0-9_\.\-]/i', $val)) if (preg_match('/[^a-z0-9_\.\-]/i', $val))
return ''; return '';
return strtolower($val); return strtolower($val);
} }
return null;
}
protected function checkUser($val) protected function checkUser($val)
{ {
$n = Util::lower(trim(urldecode($val))); $n = Util::lower(trim(urldecode($val)));

6
pages/admin.php
View File

@@ -172,7 +172,7 @@ class AdminPage extends GenericPage
$(_status).append(CreateAjaxLoader()); $(_status).append(CreateAjaxLoader());
new Ajax('?admin=siteconfig&action=add&id=' + key + '&val=' + value, { new Ajax('?admin=siteconfig&action=add&key=' + key + '&val=' + value, {
method: 'get', method: 'get',
onSuccess: function(xhr) { onSuccess: function(xhr) {
$WH.ee(_status); $WH.ee(_status);
@@ -273,7 +273,7 @@ class AdminPage extends GenericPage
$(_status).append(CreateAjaxLoader()); $(_status).append(CreateAjaxLoader());
new Ajax('?admin=siteconfig&action=update&id=' + id + '&val=' + value, { new Ajax('?admin=siteconfig&action=update&key=' + id + '&val=' + value, {
method: 'get', method: 'get',
onSuccess: function(xhr) { onSuccess: function(xhr) {
$WH.ee(_status); $WH.ee(_status);
@@ -319,7 +319,7 @@ class AdminPage extends GenericPage
$(_status).append(CreateAjaxLoader()); $(_status).append(CreateAjaxLoader());
new Ajax('?admin=siteconfig&action=remove&id=' + id, { new Ajax('?admin=siteconfig&action=remove&key=' + id, {
method: 'get', method: 'get',
onSuccess: function(xhr) { onSuccess: function(xhr) {
if (!xhr.responseText) if (!xhr.responseText)