Added new (not yet used) function

git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.5@6744 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/Changelog b/Changelog
index 4d8b4e3e7fe3b120a7821ef0e7f0eaf1c166d138..5f28b5bbef73951b5d434aa5c92a693bf47cfe1d 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -1,6 +1,9 @@
 GOsa2 changelog
 ===============
 
+* gosa 2.5.12
+  - Fixed problems with automatic reverse zones
+
 * gosa 2.5.11a
   - Added chinese translation
   - Fixed language detection and removed line wraps in tab headers

diff --git a/FAQ b/FAQ
index e7a6740f2c275d1e9ae454ee54e4ad4a09432505..3da4ce0c39fe159b13f68e9270db5f1990a0af84 100644 (file)
--- a/FAQ
+++ b/FAQ
@@ -367,3 +367,9 @@ Q: I'd like to use rfc2307bis compliant groups. Is this possible?
 A: Yes - place the rfc2307bis="true" inside of the location section of
    your gosa.conf. Remember, that you can't create empty groups in this mode.
 
+
+Q: Can GOsa show some vendor information for given MAC addresses?
+
+A: Yes. Download http://standards.ieee.org/regauth/oui/oui.txt and place
+   it in /etc/gosa/oui.txt.
+

diff --git a/include/functions.inc b/include/functions.inc
index 001d152ff3eaf37e2a6ba6429f89956f10399ff5..1fa5e5dbabf10744033aa06294d811ad8cb5ebd2 100644 (file)
--- a/include/functions.inc
+++ b/include/functions.inc
@@ -2490,5 +2490,34 @@ function prepare4mailbody($string)
 }
 
 
+function mac2company($mac)
+{
+  $vendor= "";
+
+  /* Generate a normailzed mac... */
+  $mac= substr(preg_replace('/[:-]/', '', $mac), 0, 6);
+
+  /* Check for existance of the oui file */
+  if (!is_readable(CONFIG_DIR."/oui.txt")){
+    return ("");
+  }
+
+  /* Open file and look for mac addresses... */
+  $handle = @fopen(CONFIG_DIR."/oui.txt", "r");
+  if ($handle) {
+    while (!feof($handle)) {
+      $line = fgets($handle, 4096);
+
+      if (preg_match("/^$mac/", $line)){
+        echo "$line<br>";
+      }
+    }
+    fclose($handle);
+  }
+
+  return ($vendor);
+}
+
+
 // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
 ?>