Rewritten a lot double-quotes to single-requotes, removed deprecated exception, some...

[core.git] / inc / classes / main / commands / web / class_WebLoginAreaCommand.php

diff --git a/inc/classes/main/commands/web/class_WebLoginAreaCommand.php b/inc/classes/main/commands/web/class_WebLoginAreaCommand.php
index 7531fa1f7241183b8e817be8df5bbee8f9a2f50d..2cd3c9c1692322c960d4722086456fc352c6fc1d 100644 (file)
--- a/inc/classes/main/commands/web/class_WebLoginAreaCommand.php
+++ b/inc/classes/main/commands/web/class_WebLoginAreaCommand.php
@@ -159,10 +159,7 @@ class WebLoginAreaCommand extends BaseCommand implements Commandable {
                $appInstance = $registryInstance->getInstance('application');
 
                // Default action is the one from configuration
-               $this->actionName = sprintf("%s_login_%s",
-                       str_replace("-", "_", $appInstance->getAppShortName()),
-                       $this->getConfigInstance()->readConfig('login_default_action')
-               );
+               $this->actionName = $this->convertDashesToUnderscores($appInstance->getAppShortName()) . '_login_' . $this->getConfigInstance()->readConfig('login_default_action');
 
                // Get "action" from request
                $actReq = $requestInstance->getRequestElement('action');
@@ -170,10 +167,7 @@ class WebLoginAreaCommand extends BaseCommand implements Commandable {
                // Do we have a "action" parameter set?
                if ((is_string($actReq)) && (!empty($actReq))) {
                        // Then use it with prefix
-                       $this->actionName = sprintf("%s_login_%s",
-                               str_replace("-", "_", $appInstance->getAppShortName()),
-                               $actReq
-                       );
+                       $this->actionName = $this->convertDashesToUnderscores($appInstance->getAppShortName()) . '_login_' . $actReq;
                } // END - if
 
                // Get application instance