From f074f25be23422d088d594a14cc2b84c2c83f2c8 Mon Sep 17 00:00:00 2001
From: Neil Lathwood <neil@lathwood.co.uk>
Date: Tue, 9 Feb 2016 19:02:38 +0000
Subject: [PATCH] Revert "Revert "Added location_map_regex""

---
 AUTHORS.md                    | 1 +
 doc/Support/Configuration.md  | 7 ++++++-
 includes/polling/core.inc.php | 2 +-
 includes/rewrites.php         | 9 +++++++++
 4 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/AUTHORS.md b/AUTHORS.md
index 1aa5c18ff9..ad2afab6e6 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -83,6 +83,7 @@ LibreNMS contributors:
 - Maximilian Wilhelm <max@rfc2324.org> (BarbarossaTM)
 - Jameson Finney <jameson.finney@gmail.com> (JamesonFinney)
 - John Wells <john.wells@greatworx.com> (jbwiv)
+- Paul Blasquez <pblasquez@gmail.com> (pblasquez)
 
 [1]: http://observium.org/ "Observium web site"
 Observium was written by:
diff --git a/doc/Support/Configuration.md b/doc/Support/Configuration.md
index f37f7bc786..8070df0ce5 100644
--- a/doc/Support/Configuration.md
+++ b/doc/Support/Configuration.md
@@ -379,10 +379,15 @@ NFSen integration support.
 
 #### Location mapping
 
+Exact Matching:
 ```php
 $config['location_map']['Under the Sink'] = "Under The Sink, The Office, London, UK";
 ```
-The above is an example, this will rewrite basic snmp locations so you don't need to configure full location within snmp.
+Regex Matching:
+```php
+$config['location_map']['/Sink/'] = "Under The Sink, The Office, London, UK";
+```
+The above are examples, these will rewrite device snmp locations so you don't need to configure full location within snmp.
 
 #### Interfaces to be ignored
 
diff --git a/includes/polling/core.inc.php b/includes/polling/core.inc.php
index ec23309a24..1af4e3b58f 100644
--- a/includes/polling/core.inc.php
+++ b/includes/polling/core.inc.php
@@ -85,7 +85,7 @@ $poll_device['sysLocation'] = str_replace('"', '', $poll_device['sysLocation']);
 $poll_device['sysLocation'] = trim($poll_device['sysLocation'], '\\');
 
 // Rewrite sysLocation if there is a mapping array (database too?)
-if (!empty($poll_device['sysLocation']) && is_array($config['location_map'])) {
+if (!empty($poll_device['sysLocation']) && (is_array($config['location_map']) || is_array($config['location_map_regex']))) {
     $poll_device['sysLocation'] = rewrite_location($poll_device['sysLocation']);
 }
 
diff --git a/includes/rewrites.php b/includes/rewrites.php
index e2516d5c28..b4b28cd631 100644
--- a/includes/rewrites.php
+++ b/includes/rewrites.php
@@ -5,6 +5,15 @@ function rewrite_location($location) {
     // FIXME -- also check the database for rewrites?
     global $config, $debug;
 
+    if (is_array($config['location_map_regex'])) {
+        foreach ($config['location_map_regex'] as $reg => $val) {
+            if (preg_match($reg, $location)) {
+                $location = $val;
+                continue;
+            }
+        }
+    }
+    
     if (isset($config['location_map'][$location])) {
         $location = $config['location_map'][$location];
     }