From d8ca9fd4a40148ab69d8222f40fce06c44ff8865 Mon Sep 17 00:00:00 2001 From: cajus Date: Wed, 9 Jan 2008 16:10:41 +0000 Subject: [PATCH] Updated scanner lists git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@8270 594d385d-05f5-0310-b6e9-bd551577e9d8 --- gosa-core/plugins/admin/systems/class_terminalService.inc | 2 +- .../{include/scanner.inc => plugins/admin/systems/scanners.lst} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename gosa-core/{include/scanner.inc => plugins/admin/systems/scanners.lst} (100%) diff --git a/gosa-core/plugins/admin/systems/class_terminalService.inc b/gosa-core/plugins/admin/systems/class_terminalService.inc index 49f804692..e73acf229 100644 --- a/gosa-core/plugins/admin/systems/class_terminalService.inc +++ b/gosa-core/plugins/admin/systems/class_terminalService.inc @@ -146,7 +146,7 @@ class termservice extends plugin } /* Load scanner models */ - $fcontents = file ($this->config->basedir."/include/scanner.inc"); + $fcontents = file (CONFIG_DIR."/scanner-list"); while (list ($line_num, $line) = each ($fcontents)) { preg_match('/^(\w+) "([^"]+)" "([^"]+)" "([^"]+)"/', "$line", $matches); $this->gotoScannerModels[$matches[2]." - ".$matches[3]]= $matches[1]."|".$matches[4]; diff --git a/gosa-core/include/scanner.inc b/gosa-core/plugins/admin/systems/scanners.lst similarity index 100% rename from gosa-core/include/scanner.inc rename to gosa-core/plugins/admin/systems/scanners.lst -- 2.30.2