arno/privatebin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[fix] compare version apache && ServerSalt namespace

Browse Source
This commit is contained in:
magikcypress 2017-05-22 21:21:55 +02:00
parent f23b1222dd
commit 9eea316b86
No known key found for this signature in database
GPG Key ID: 3B3C7CD61957AC9A
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Model/Paste.php
View File

@ -90,7 +90,7 @@ class Paste extends AbstractModel
} }
$this->_data->meta->postdate = time(); $this->_data->meta->postdate = time();
$this->_data->meta->salt = serversalt::generate(); $this->_data->meta->salt = ServerSalt::generate();
$this->_data->webserver = WebServer::canHtaccess(); $this->_data->webserver = WebServer::canHtaccess();
// store paste // store paste

4
lib/Persistence/WebServer.php
View File

@ -68,9 +68,7 @@ class WebServer extends AbstractPersistence
if (is_dir(self::$_path) && !is_file($file)) { if (is_dir(self::$_path) && !is_file($file)) {
$server = self::getWebserver(); $server = self::getWebserver();
if($server['software'] == "Apache") { if($server['software'] == "Apache") {
$pattern = '/2.4/'; if (version_compare($server['version'], '2.2') >= 0) {
$regex = preg_match($pattern, $server['version']);
if($regex == false) {
self::_store( self::_store(
$file, $file,
'Allow from none' . PHP_EOL . 'Allow from none' . PHP_EOL .