From 3a361f8e5945abfe18e76b0b527c74b7d0b25bb2 Mon Sep 17 00:00:00 2001 From: Ad Schellevis Date: Thu, 21 Feb 2019 21:29:37 +0100 Subject: [PATCH] auth/pam, better CamelCase for https://github.com/opnsense/core/issues/3242 --- .../mvc/app/library/OPNsense/Auth/AuthenticationFactory.php | 2 +- .../Services/{Opnsense_Auth_Test.php => OpnsenseAuthTest.php} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename src/opnsense/mvc/app/library/OPNsense/Auth/Services/{Opnsense_Auth_Test.php => OpnsenseAuthTest.php} (97%) diff --git a/src/opnsense/mvc/app/library/OPNsense/Auth/AuthenticationFactory.php b/src/opnsense/mvc/app/library/OPNsense/Auth/AuthenticationFactory.php index 311a4f205..a8737dae5 100644 --- a/src/opnsense/mvc/app/library/OPNsense/Auth/AuthenticationFactory.php +++ b/src/opnsense/mvc/app/library/OPNsense/Auth/AuthenticationFactory.php @@ -147,7 +147,7 @@ class AuthenticationFactory public function getService($service_name) { // cleanse service name - $srv_name = str_replace('-', '_', strtolower($service_name)); + $srv_name = strtolower(str_replace(array('-', '_'), '', $service_name)); foreach (glob(__DIR__."/Services/*.php") as $filename) { $srv_found = basename($filename, '.php'); if (strtolower($srv_found) == $srv_name) { diff --git a/src/opnsense/mvc/app/library/OPNsense/Auth/Services/Opnsense_Auth_Test.php b/src/opnsense/mvc/app/library/OPNsense/Auth/Services/OpnsenseAuthTest.php similarity index 97% rename from src/opnsense/mvc/app/library/OPNsense/Auth/Services/Opnsense_Auth_Test.php rename to src/opnsense/mvc/app/library/OPNsense/Auth/Services/OpnsenseAuthTest.php index 8a4efe0de..a2d940e57 100644 --- a/src/opnsense/mvc/app/library/OPNsense/Auth/Services/Opnsense_Auth_Test.php +++ b/src/opnsense/mvc/app/library/OPNsense/Auth/Services/OpnsenseAuthTest.php @@ -35,6 +35,6 @@ use OPNsense\Auth\IService; * opnsense test service * @package OPNsense\Auth */ -class OPNsense_Auth_Test extends System +class OPNsenseAuthTest extends System { }