From 9eea316b86d87d6e58cd197109cfe77d3581e472 Mon Sep 17 00:00:00 2001
From: magikcypress <cyp@rouquin.me>
Date: Mon, 22 May 2017 21:21:55 +0200
Subject: [PATCH] [fix] compare version apache && ServerSalt namespace

---
 lib/Model/Paste.php           | 2 +-
 lib/Persistence/WebServer.php | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/lib/Model/Paste.php b/lib/Model/Paste.php
index 3af7dc96..ca6b1f77 100644
--- a/lib/Model/Paste.php
+++ b/lib/Model/Paste.php
@@ -90,7 +90,7 @@ class Paste extends AbstractModel
         }
 
         $this->_data->meta->postdate = time();
-        $this->_data->meta->salt     = serversalt::generate();
+        $this->_data->meta->salt     = ServerSalt::generate();
         $this->_data->webserver      = WebServer::canHtaccess();
 
         // store paste
diff --git a/lib/Persistence/WebServer.php b/lib/Persistence/WebServer.php
index d59a38e6..245702c6 100644
--- a/lib/Persistence/WebServer.php
+++ b/lib/Persistence/WebServer.php
@@ -68,9 +68,7 @@ class WebServer extends AbstractPersistence
         if (is_dir(self::$_path) && !is_file($file)) {
             $server = self::getWebserver();
             if($server['software'] == "Apache") {
-                $pattern = '/2.4/';
-                $regex = preg_match($pattern, $server['version']);
-                if($regex == false) {
+                if (version_compare($server['version'], '2.2') >= 0) {
                     self::_store(
                         $file,
                         'Allow from none' . PHP_EOL .