tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-31 01:34:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

lib: Don't alias Zend classes in Module

Browse Source
This commit is contained in:
Eric Lippmann 2015-08-20 16:46:31 +02:00
parent 4ab20b9142
commit 5d8f091209
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
library/Icinga/Application/Modules/Module.php
View File

@ -4,23 +4,23 @@
namespace Icinga\Application\Modules; namespace Icinga\Application\Modules;
use Exception; use Exception;
use Zend_Controller_Router_Route;
use Zend_Controller_Router_Route_Abstract; use Zend_Controller_Router_Route_Abstract;
use Zend_Controller_Router_Route as Route; use Zend_Controller_Router_Route_Regex;
use Zend_Controller_Router_Route_Regex as RegexRoute;
use Icinga\Application\ApplicationBootstrap; use Icinga\Application\ApplicationBootstrap;
use Icinga\Application\Config; use Icinga\Application\Config;
use Icinga\Application\Icinga; use Icinga\Application\Icinga;
use Icinga\Application\Logger; use Icinga\Application\Logger;
use Icinga\Data\ConfigObject; use Icinga\Data\ConfigObject;
use Icinga\Exception\IcingaException;
use Icinga\Exception\ProgrammingError;
use Icinga\Module\Setup\SetupWizard;
use Icinga\Util\File;
use Icinga\Util\Translator; use Icinga\Util\Translator;
use Icinga\Web\Hook; use Icinga\Web\Hook;
use Icinga\Web\Menu; use Icinga\Web\Menu;
use Icinga\Web\Widget; use Icinga\Web\Widget;
use Icinga\Web\Widget\Dashboard\Pane; use Icinga\Web\Widget\Dashboard\Pane;
use Icinga\Module\Setup\SetupWizard;
use Icinga\Util\File;
use Icinga\Exception\ProgrammingError;
use Icinga\Exception\IcingaException;
/** /**
* Module handling * Module handling
@ -1044,7 +1044,7 @@ class Module
} }
$router->addRoute( $router->addRoute(
$this->name . '_jsprovider', $this->name . '_jsprovider',
new Route( new Zend_Controller_Router_Route(
'js/' . $this->name . '/:file', 'js/' . $this->name . '/:file',
array( array(
'controller' => 'static', 'controller' => 'static',
@ -1055,7 +1055,7 @@ class Module
); );
$router->addRoute( $router->addRoute(
$this->name . '_img', $this->name . '_img',
new RegexRoute( new Zend_Controller_Router_Route_Regex(
'img/' . $this->name . '/(.+)', 'img/' . $this->name . '/(.+)',
array( array(
'controller' => 'static', 'controller' => 'static',