From 5b5e3753a93d984853d77140673de2d188f4406f Mon Sep 17 00:00:00 2001
From: hanno <hanno@ada9452e-eb2d-45b7-bbe6-05a4ab45a870>
Date: Tue, 7 Feb 2017 23:01:21 +0000
Subject: a bit better detection for own/nextcloud, still not working for some
 older nextcloud versions

git-svn-id: https://svn.schokokeks.org/repos/freewvs@825 ada9452e-eb2d-45b7-bbe6-05a4ab45a870
---
 freewvs                | 6 ++++++
 freewvsdb/misc.freewvs | 3 +--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/freewvs b/freewvs
index 4298261..618dcfa 100755
--- a/freewvs
+++ b/freewvs
@@ -139,6 +139,10 @@ for sect in config.sections():
         item['extra_match'] = config.get(sect, 'extra_match')
     else:
         item['extra_match'] = False
+    if config.has_option(sect, 'extra_nomatch'):
+        item['extra_nomatch'] = config.get(sect, 'extra_nomatch')
+    else:
+        item['extra_nomatch'] = False
     if config.has_option(sect, 'add_minor'):
         item['add_minor'] = config.get(sect, 'add_minor')
     else:
@@ -173,6 +177,8 @@ for fdir in args:
 
                     if item['extra_match']:
                         ematch = (filestr.find(item['extra_match']) != -1)
+                    elif item['extra_nomatch']:
+                        ematch = not (filestr.find(item['extra_nomatch']) != -1)
                     else:
                         ematch = True
 
diff --git a/freewvsdb/misc.freewvs b/freewvsdb/misc.freewvs
index 476c146..c4dcf9d 100644
--- a/freewvsdb/misc.freewvs
+++ b/freewvsdb/misc.freewvs
@@ -343,13 +343,12 @@ variable=$OC_VersionString
 vuln=https://owncloud.org/security/advisory/?id=oc-sa-2017-003
 safe=9.1.3
 subdir=0
-extra_match=$OC_Edition = '';
+extra_nomatch=nextcloud
 
 [owncloud5]
 url=http://owncloud.org/
 file=util.php
 variable=return '
-extra_match=OC_Util
 subdir=1
 vuln=https://owncloud.org/security/advisory/?id=oc-sa-2017-003
 safe=9.1.3
-- 
cgit