diff --git a/include/admin_checks.php b/include/admin_checks.php index 4ae439a7..27e7011a 100644 --- a/include/admin_checks.php +++ b/include/admin_checks.php @@ -34,6 +34,10 @@ if (@$_SESSION['USERDATA']['is_admin'] && $user->isAdmin(@$_SESSION['USERDATA'][ } if (class_exists('Memcached')) { $memcache_test = @new Memcached(); + if ($config['memcache']['sasl'] === true) { + $memcache_test->setOption(Memcached::OPT_BINARY_PROTOCOL, true); + $memcache_test->setSaslAuthData($config['memcache']['sasl']['username'], $config['memcache']['sasl']['password']); + } $memcache_test_add = @$memcache_test->addServer($config['memcache']['host'], $config['memcache']['port']); $randmctv = rand(5,10); $memcache_test_set = @$memcache_test->set('test_mpos_setval', $randmctv); diff --git a/include/classes/news.class.php b/include/classes/news.class.php index bccc6cab..b4de57e2 100644 --- a/include/classes/news.class.php +++ b/include/classes/news.class.php @@ -88,6 +88,7 @@ class News extends Base { if (empty($aData['header'])) return false; if (empty($aData['content'])) return false; if (!is_int($account_id)) return false; + if (@$aData['active']) $active = true; $stmt = $this->mysqli->prepare("INSERT INTO $this->table (account_id, header, content, active) VALUES (?,?,?,?)"); if ($stmt && $stmt->bind_param('issi', $account_id, $aData['header'], $aData['content'], $active) && $stmt->execute()) return true; diff --git a/include/classes/statscache.class.php b/include/classes/statscache.class.php index c17d8a74..615ba5d1 100644 --- a/include/classes/statscache.class.php +++ b/include/classes/statscache.class.php @@ -19,6 +19,10 @@ class StatsCache { require_once(CLASS_DIR . '/memcached.class.php'); } $this->cache = new Memcached(); + if ($config['memcache']['sasl'] === true) { + $this->cache->setOption(Memcached::OPT_BINARY_PROTOCOL, true); + $this->cache->setSaslAuthData($config['memcache']['sasl']['username'], $config['memcache']['sasl']['password']); + } } } diff --git a/include/config/global.inc.dist.php b/include/config/global.inc.dist.php index 40aa975b..f35c9bf4 100644 --- a/include/config/global.inc.dist.php +++ b/include/config/global.inc.dist.php @@ -268,6 +268,9 @@ $config['memcache']['keyprefix'] = 'mpos_'; $config['memcache']['expiration'] = 90; $config['memcache']['splay'] = 15; $config['memcache']['force']['contrib_shares'] = false; +$config['memcache']['sasl'] = false; +$config['memcache']['sasl']['username'] = ''; +$config['memcache']['sasl']['password'] = ''; /** * Cookies diff --git a/templates/bootstrap/admin/news/default.tpl b/templates/bootstrap/admin/news/default.tpl index 2bbe31de..d66589b0 100644 --- a/templates/bootstrap/admin/news/default.tpl +++ b/templates/bootstrap/admin/news/default.tpl @@ -18,6 +18,10 @@ +