From 2092a04971b17ad67fbe96bd9187e1402ddd6aa8 Mon Sep 17 00:00:00 2001 From: Craig Heydenburg Date: Sun, 16 Aug 2015 17:40:44 -0400 Subject: [PATCH 01/35] convert ThemeModule --- composer.json | 3 ++- src/app/ZikulaKernel.php | 2 +- .../{Zikula/Module => }/ThemeModule/.gitignore | 0 .../{Zikula/Module => }/ThemeModule/.travis.yml | 0 .../Module => }/ThemeModule/Api/AccountApi.php | 2 +- .../Module => }/ThemeModule/Api/AdminApi.php | 4 ++-- .../{Zikula/Module => }/ThemeModule/Api/UserApi.php | 2 +- .../Module => }/ThemeModule/Block/RenderBlock.php | 2 +- .../ThemeModule/Block/ThemeswitcherBlock.php | 2 +- .../ThemeModule/Controller/AdminController.php | 4 ++-- .../ThemeModule/Controller/AjaxController.php | 2 +- .../ThemeModule/Controller/UserController.php | 2 +- .../Module => }/ThemeModule/Entity/ThemeEntity.php | 2 +- src/system/{Zikula/Module => }/ThemeModule/LICENSE | 0 .../{Zikula/Module => }/ThemeModule/README.md | 0 .../ThemeModule/Resources/config/routing.yml | 0 .../public/css/form/contextMenuBackground.gif | Bin .../ThemeModule/Resources/public/css/form/style.css | 0 .../ThemeModule/Resources/public/css/style.css | 0 .../ThemeModule/Resources/public/images/admin.png | Bin .../ThemeModule/Resources/public/images/down.gif | Bin .../Resources/public/images/green_dot.gif | Bin .../ThemeModule/Resources/public/images/help.gif | Bin .../Resources/public/images/preview_large.png | Bin .../Resources/public/images/preview_medium.png | Bin .../Resources/public/images/preview_small.png | Bin .../ThemeModule/Resources/public/images/red_dot.gif | Bin .../ThemeModule/Resources/public/images/up.gif | Bin .../js/ZikulaThemeModule.Admin.ModifyConfig.js | 0 .../public/js/ZikulaThemeModule.Admin.View.js | 0 .../ThemeModule/Resources/public/js/form/form.js | 0 .../Resources/public/js/themeswitcher.js | 0 .../ThemeModule/Resources/views/Admin/credits.tpl | 0 .../ThemeModule/Resources/views/Admin/delete.tpl | 0 .../Admin/deletepageconfigurationassignment.tpl | 0 .../ThemeModule/Resources/views/Admin/modify.tpl | 0 .../Resources/views/Admin/modifyconfig.tpl | 0 .../Resources/views/Admin/modifymenu.tpl | 0 .../views/Admin/modifypageconfigtemplates.tpl | 0 .../Admin/modifypageconfigurationassignment.tpl | 0 .../Resources/views/Admin/pageconfigurations.tpl | 0 .../ThemeModule/Resources/views/Admin/palettes.tpl | 0 .../Resources/views/Admin/setasdefault.tpl | 0 .../ThemeModule/Resources/views/Admin/variables.tpl | 0 .../ThemeModule/Resources/views/Admin/view.tpl | 0 .../Resources/views/Block/render_modify.tpl | 0 .../Resources/views/Block/themeswitcher.tpl | 0 .../Resources/views/Block/themeswitcher_modify.tpl | 0 .../ThemeModule/Resources/views/User/main.tpl | 0 .../ThemeModule/Resources/views/moduleheader.tpl | 0 .../ThemeModule/Resources/views/pager.tpl | 0 .../ThemeModule/Resources/views/pagercss.tpl | 0 .../ThemeModule/Resources/views/pagercss2.tpl | 0 .../ThemeModule/Resources/views/pagerimage.tpl | 0 .../ThemeModule/Resources/views/pagerintervals.tpl | 0 .../ThemeModule/Resources/views/pageritems.tpl | 0 .../ThemeModule/Resources/views/pagerjs.tpl | 0 .../Resources/views/system/dbconnectionerror.tpl | 0 .../Resources/views/system/sessionfailed.tpl | 0 .../ThemeModule/Resources/views/system/siteoff.tpl | 0 .../ThemeModule/Resources/views/zdebug.tpl | 0 .../ThemeModule/Resources/views/zpopup.tpl | 0 .../ThemeModule/ThemeModuleInstaller.php | 4 ++-- .../Module => }/ThemeModule/ThemeModuleVersion.php | 2 +- src/system/{Zikula/Module => }/ThemeModule/Util.php | 4 ++-- .../Module => }/ThemeModule/ZikulaThemeModule.php | 2 +- .../{Zikula/Module => }/ThemeModule/composer.json | 4 ++-- .../Module => }/ThemeModule/phpunit.xml.dist | 0 .../{Zikula/Module => }/ThemeModule/tables.php | 0 69 files changed, 22 insertions(+), 21 deletions(-) rename src/system/{Zikula/Module => }/ThemeModule/.gitignore (100%) rename src/system/{Zikula/Module => }/ThemeModule/.travis.yml (100%) rename src/system/{Zikula/Module => }/ThemeModule/Api/AccountApi.php (96%) rename src/system/{Zikula/Module => }/ThemeModule/Api/AdminApi.php (99%) rename src/system/{Zikula/Module => }/ThemeModule/Api/UserApi.php (99%) rename src/system/{Zikula/Module => }/ThemeModule/Block/RenderBlock.php (99%) rename src/system/{Zikula/Module => }/ThemeModule/Block/ThemeswitcherBlock.php (99%) rename src/system/{Zikula/Module => }/ThemeModule/Controller/AdminController.php (99%) rename src/system/{Zikula/Module => }/ThemeModule/Controller/AjaxController.php (96%) rename src/system/{Zikula/Module => }/ThemeModule/Controller/UserController.php (99%) rename src/system/{Zikula/Module => }/ThemeModule/Entity/ThemeEntity.php (99%) rename src/system/{Zikula/Module => }/ThemeModule/LICENSE (100%) rename src/system/{Zikula/Module => }/ThemeModule/README.md (100%) rename src/system/{Zikula/Module => }/ThemeModule/Resources/config/routing.yml (100%) rename src/system/{Zikula/Module => }/ThemeModule/Resources/public/css/form/contextMenuBackground.gif (100%) rename src/system/{Zikula/Module => }/ThemeModule/Resources/public/css/form/style.css (100%) rename src/system/{Zikula/Module => }/ThemeModule/Resources/public/css/style.css (100%) rename src/system/{Zikula/Module => }/ThemeModule/Resources/public/images/admin.png (100%) rename src/system/{Zikula/Module => }/ThemeModule/Resources/public/images/down.gif (100%) rename src/system/{Zikula/Module => }/ThemeModule/Resources/public/images/green_dot.gif (100%) rename src/system/{Zikula/Module => }/ThemeModule/Resources/public/images/help.gif (100%) rename src/system/{Zikula/Module => }/ThemeModule/Resources/public/images/preview_large.png (100%) rename src/system/{Zikula/Module => }/ThemeModule/Resources/public/images/preview_medium.png (100%) rename src/system/{Zikula/Module => }/ThemeModule/Resources/public/images/preview_small.png (100%) rename src/system/{Zikula/Module => }/ThemeModule/Resources/public/images/red_dot.gif (100%) rename src/system/{Zikula/Module => }/ThemeModule/Resources/public/images/up.gif (100%) rename src/system/{Zikula/Module => }/ThemeModule/Resources/public/js/ZikulaThemeModule.Admin.ModifyConfig.js (100%) rename src/system/{Zikula/Module => }/ThemeModule/Resources/public/js/ZikulaThemeModule.Admin.View.js (100%) rename src/system/{Zikula/Module => }/ThemeModule/Resources/public/js/form/form.js (100%) rename src/system/{Zikula/Module => }/ThemeModule/Resources/public/js/themeswitcher.js (100%) rename src/system/{Zikula/Module => }/ThemeModule/Resources/views/Admin/credits.tpl (100%) rename src/system/{Zikula/Module => }/ThemeModule/Resources/views/Admin/delete.tpl (100%) rename src/system/{Zikula/Module => }/ThemeModule/Resources/views/Admin/deletepageconfigurationassignment.tpl (100%) rename src/system/{Zikula/Module => }/ThemeModule/Resources/views/Admin/modify.tpl (100%) rename src/system/{Zikula/Module => }/ThemeModule/Resources/views/Admin/modifyconfig.tpl (100%) rename src/system/{Zikula/Module => }/ThemeModule/Resources/views/Admin/modifymenu.tpl (100%) rename src/system/{Zikula/Module => }/ThemeModule/Resources/views/Admin/modifypageconfigtemplates.tpl (100%) rename src/system/{Zikula/Module => }/ThemeModule/Resources/views/Admin/modifypageconfigurationassignment.tpl (100%) rename src/system/{Zikula/Module => }/ThemeModule/Resources/views/Admin/pageconfigurations.tpl (100%) rename src/system/{Zikula/Module => }/ThemeModule/Resources/views/Admin/palettes.tpl (100%) rename src/system/{Zikula/Module => }/ThemeModule/Resources/views/Admin/setasdefault.tpl (100%) rename src/system/{Zikula/Module => }/ThemeModule/Resources/views/Admin/variables.tpl (100%) rename src/system/{Zikula/Module => }/ThemeModule/Resources/views/Admin/view.tpl (100%) rename src/system/{Zikula/Module => }/ThemeModule/Resources/views/Block/render_modify.tpl (100%) rename src/system/{Zikula/Module => }/ThemeModule/Resources/views/Block/themeswitcher.tpl (100%) rename src/system/{Zikula/Module => }/ThemeModule/Resources/views/Block/themeswitcher_modify.tpl (100%) rename src/system/{Zikula/Module => }/ThemeModule/Resources/views/User/main.tpl (100%) rename src/system/{Zikula/Module => }/ThemeModule/Resources/views/moduleheader.tpl (100%) rename src/system/{Zikula/Module => }/ThemeModule/Resources/views/pager.tpl (100%) rename src/system/{Zikula/Module => }/ThemeModule/Resources/views/pagercss.tpl (100%) rename src/system/{Zikula/Module => }/ThemeModule/Resources/views/pagercss2.tpl (100%) rename src/system/{Zikula/Module => }/ThemeModule/Resources/views/pagerimage.tpl (100%) rename src/system/{Zikula/Module => }/ThemeModule/Resources/views/pagerintervals.tpl (100%) rename src/system/{Zikula/Module => }/ThemeModule/Resources/views/pageritems.tpl (100%) rename src/system/{Zikula/Module => }/ThemeModule/Resources/views/pagerjs.tpl (100%) rename src/system/{Zikula/Module => }/ThemeModule/Resources/views/system/dbconnectionerror.tpl (100%) rename src/system/{Zikula/Module => }/ThemeModule/Resources/views/system/sessionfailed.tpl (100%) rename src/system/{Zikula/Module => }/ThemeModule/Resources/views/system/siteoff.tpl (100%) rename src/system/{Zikula/Module => }/ThemeModule/Resources/views/zdebug.tpl (100%) rename src/system/{Zikula/Module => }/ThemeModule/Resources/views/zpopup.tpl (100%) rename src/system/{Zikula/Module => }/ThemeModule/ThemeModuleInstaller.php (96%) rename src/system/{Zikula/Module => }/ThemeModule/ThemeModuleVersion.php (97%) rename src/system/{Zikula/Module => }/ThemeModule/Util.php (98%) rename src/system/{Zikula/Module => }/ThemeModule/ZikulaThemeModule.php (94%) rename src/system/{Zikula/Module => }/ThemeModule/composer.json (75%) rename src/system/{Zikula/Module => }/ThemeModule/phpunit.xml.dist (100%) rename src/system/{Zikula/Module => }/ThemeModule/tables.php (100%) diff --git a/composer.json b/composer.json index d10246a333..0f4df54cfe 100644 --- a/composer.json +++ b/composer.json @@ -16,7 +16,8 @@ "CustomBundle\\": "src/app/custom" }, "psr-4": { - "Zikula\\RoutesModule\\": "src/system/ZikulaRoutesModule" + "Zikula\\RoutesModule\\": "src/system/ZikulaRoutesModule", + "Zikula\\ThemeModule\\": "src/system/ThemeModule" }, "classmap": [ "src/lib/util/", diff --git a/src/app/ZikulaKernel.php b/src/app/ZikulaKernel.php index 8464932797..889753d666 100644 --- a/src/app/ZikulaKernel.php +++ b/src/app/ZikulaKernel.php @@ -74,7 +74,7 @@ private function registerCoreModules(array &$bundles) $bundles[] = new Zikula\Module\SearchModule\ZikulaSearchModule(); $bundles[] = new Zikula\Module\SecurityCenterModule\ZikulaSecurityCenterModule(); $bundles[] = new Zikula\Module\SettingsModule\ZikulaSettingsModule(); - $bundles[] = new Zikula\Module\ThemeModule\ZikulaThemeModule(); + $bundles[] = new Zikula\ThemeModule\ZikulaThemeModule(); $bundles[] = new Zikula\Module\UsersModule\ZikulaUsersModule(); $bundles[] = new Zikula\RoutesModule\ZikulaRoutesModule(); // $bundles[] = new Zikula\Theme\Andreas08Theme\ZikulaAndreas08Theme(); diff --git a/src/system/Zikula/Module/ThemeModule/.gitignore b/src/system/ThemeModule/.gitignore similarity index 100% rename from src/system/Zikula/Module/ThemeModule/.gitignore rename to src/system/ThemeModule/.gitignore diff --git a/src/system/Zikula/Module/ThemeModule/.travis.yml b/src/system/ThemeModule/.travis.yml similarity index 100% rename from src/system/Zikula/Module/ThemeModule/.travis.yml rename to src/system/ThemeModule/.travis.yml diff --git a/src/system/Zikula/Module/ThemeModule/Api/AccountApi.php b/src/system/ThemeModule/Api/AccountApi.php similarity index 96% rename from src/system/Zikula/Module/ThemeModule/Api/AccountApi.php rename to src/system/ThemeModule/Api/AccountApi.php index 254cbfc8af..f14be44791 100644 --- a/src/system/Zikula/Module/ThemeModule/Api/AccountApi.php +++ b/src/system/ThemeModule/Api/AccountApi.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\ThemeModule\Api; +namespace Zikula\ThemeModule\Api; use ModUtil; use System; diff --git a/src/system/Zikula/Module/ThemeModule/Api/AdminApi.php b/src/system/ThemeModule/Api/AdminApi.php similarity index 99% rename from src/system/Zikula/Module/ThemeModule/Api/AdminApi.php rename to src/system/ThemeModule/Api/AdminApi.php index 4b19e7dfa3..9eeb219623 100644 --- a/src/system/Zikula/Module/ThemeModule/Api/AdminApi.php +++ b/src/system/ThemeModule/Api/AdminApi.php @@ -11,9 +11,9 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\ThemeModule\Api; +namespace Zikula\ThemeModule\Api; -use Zikula\Module\ThemeModule\Util; +use Zikula\ThemeModule\Util; use ModUtil; use SecurityUtil; use LogUtil; diff --git a/src/system/Zikula/Module/ThemeModule/Api/UserApi.php b/src/system/ThemeModule/Api/UserApi.php similarity index 99% rename from src/system/Zikula/Module/ThemeModule/Api/UserApi.php rename to src/system/ThemeModule/Api/UserApi.php index 69efa34038..7103aed7ca 100644 --- a/src/system/Zikula/Module/ThemeModule/Api/UserApi.php +++ b/src/system/ThemeModule/Api/UserApi.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\ThemeModule\Api; +namespace Zikula\ThemeModule\Api; use LogUtil; use ModUtil; diff --git a/src/system/Zikula/Module/ThemeModule/Block/RenderBlock.php b/src/system/ThemeModule/Block/RenderBlock.php similarity index 99% rename from src/system/Zikula/Module/ThemeModule/Block/RenderBlock.php rename to src/system/ThemeModule/Block/RenderBlock.php index 8c1e5dc8d7..522e44962c 100644 --- a/src/system/Zikula/Module/ThemeModule/Block/RenderBlock.php +++ b/src/system/ThemeModule/Block/RenderBlock.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\ThemeModule\Block; +namespace Zikula\ThemeModule\Block; use Zikula_View; use SecurityUtil; diff --git a/src/system/Zikula/Module/ThemeModule/Block/ThemeswitcherBlock.php b/src/system/ThemeModule/Block/ThemeswitcherBlock.php similarity index 99% rename from src/system/Zikula/Module/ThemeModule/Block/ThemeswitcherBlock.php rename to src/system/ThemeModule/Block/ThemeswitcherBlock.php index 79f3452d13..10cf30af71 100644 --- a/src/system/Zikula/Module/ThemeModule/Block/ThemeswitcherBlock.php +++ b/src/system/ThemeModule/Block/ThemeswitcherBlock.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\ThemeModule\Block; +namespace Zikula\ThemeModule\Block; use SecurityUtil; use System; diff --git a/src/system/Zikula/Module/ThemeModule/Controller/AdminController.php b/src/system/ThemeModule/Controller/AdminController.php similarity index 99% rename from src/system/Zikula/Module/ThemeModule/Controller/AdminController.php rename to src/system/ThemeModule/Controller/AdminController.php index f0af80f014..88d4496a5d 100644 --- a/src/system/Zikula/Module/ThemeModule/Controller/AdminController.php +++ b/src/system/ThemeModule/Controller/AdminController.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\ThemeModule\Controller; +namespace Zikula\ThemeModule\Controller; use Zikula_View; use Modutil; @@ -23,7 +23,7 @@ use ZLanguage; use BlockUtil; use Zikula_View_Theme; -use Zikula\Module\ThemeModule\Util; +use Zikula\ThemeModule\Util; use Symfony\Component\Security\Core\Exception\AccessDeniedException; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; use Symfony\Component\HttpFoundation\Request; diff --git a/src/system/Zikula/Module/ThemeModule/Controller/AjaxController.php b/src/system/ThemeModule/Controller/AjaxController.php similarity index 96% rename from src/system/Zikula/Module/ThemeModule/Controller/AjaxController.php rename to src/system/ThemeModule/Controller/AjaxController.php index 5e2c3ea341..99fac1bb15 100644 --- a/src/system/Zikula/Module/ThemeModule/Controller/AjaxController.php +++ b/src/system/ThemeModule/Controller/AjaxController.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\ThemeModule\Controller; +namespace Zikula\ThemeModule\Controller; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; use Zikula\Core\Response\Ajax\AjaxResponse; diff --git a/src/system/Zikula/Module/ThemeModule/Controller/UserController.php b/src/system/ThemeModule/Controller/UserController.php similarity index 99% rename from src/system/Zikula/Module/ThemeModule/Controller/UserController.php rename to src/system/ThemeModule/Controller/UserController.php index 02a82e7876..90d6243b8a 100644 --- a/src/system/Zikula/Module/ThemeModule/Controller/UserController.php +++ b/src/system/ThemeModule/Controller/UserController.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\ThemeModule\Controller; +namespace Zikula\ThemeModule\Controller; use ModUtil; use System; diff --git a/src/system/Zikula/Module/ThemeModule/Entity/ThemeEntity.php b/src/system/ThemeModule/Entity/ThemeEntity.php similarity index 99% rename from src/system/Zikula/Module/ThemeModule/Entity/ThemeEntity.php rename to src/system/ThemeModule/Entity/ThemeEntity.php index 893cc3a164..0d99a8f3f8 100644 --- a/src/system/Zikula/Module/ThemeModule/Entity/ThemeEntity.php +++ b/src/system/ThemeModule/Entity/ThemeEntity.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\ThemeModule\Entity; +namespace Zikula\ThemeModule\Entity; use Zikula\Core\Doctrine\EntityAccess; use Doctrine\ORM\Mapping as ORM; diff --git a/src/system/Zikula/Module/ThemeModule/LICENSE b/src/system/ThemeModule/LICENSE similarity index 100% rename from src/system/Zikula/Module/ThemeModule/LICENSE rename to src/system/ThemeModule/LICENSE diff --git a/src/system/Zikula/Module/ThemeModule/README.md b/src/system/ThemeModule/README.md similarity index 100% rename from src/system/Zikula/Module/ThemeModule/README.md rename to src/system/ThemeModule/README.md diff --git a/src/system/Zikula/Module/ThemeModule/Resources/config/routing.yml b/src/system/ThemeModule/Resources/config/routing.yml similarity index 100% rename from src/system/Zikula/Module/ThemeModule/Resources/config/routing.yml rename to src/system/ThemeModule/Resources/config/routing.yml diff --git a/src/system/Zikula/Module/ThemeModule/Resources/public/css/form/contextMenuBackground.gif b/src/system/ThemeModule/Resources/public/css/form/contextMenuBackground.gif similarity index 100% rename from src/system/Zikula/Module/ThemeModule/Resources/public/css/form/contextMenuBackground.gif rename to src/system/ThemeModule/Resources/public/css/form/contextMenuBackground.gif diff --git a/src/system/Zikula/Module/ThemeModule/Resources/public/css/form/style.css b/src/system/ThemeModule/Resources/public/css/form/style.css similarity index 100% rename from src/system/Zikula/Module/ThemeModule/Resources/public/css/form/style.css rename to src/system/ThemeModule/Resources/public/css/form/style.css diff --git a/src/system/Zikula/Module/ThemeModule/Resources/public/css/style.css b/src/system/ThemeModule/Resources/public/css/style.css similarity index 100% rename from src/system/Zikula/Module/ThemeModule/Resources/public/css/style.css rename to src/system/ThemeModule/Resources/public/css/style.css diff --git a/src/system/Zikula/Module/ThemeModule/Resources/public/images/admin.png b/src/system/ThemeModule/Resources/public/images/admin.png similarity index 100% rename from src/system/Zikula/Module/ThemeModule/Resources/public/images/admin.png rename to src/system/ThemeModule/Resources/public/images/admin.png diff --git a/src/system/Zikula/Module/ThemeModule/Resources/public/images/down.gif b/src/system/ThemeModule/Resources/public/images/down.gif similarity index 100% rename from src/system/Zikula/Module/ThemeModule/Resources/public/images/down.gif rename to src/system/ThemeModule/Resources/public/images/down.gif diff --git a/src/system/Zikula/Module/ThemeModule/Resources/public/images/green_dot.gif b/src/system/ThemeModule/Resources/public/images/green_dot.gif similarity index 100% rename from src/system/Zikula/Module/ThemeModule/Resources/public/images/green_dot.gif rename to src/system/ThemeModule/Resources/public/images/green_dot.gif diff --git a/src/system/Zikula/Module/ThemeModule/Resources/public/images/help.gif b/src/system/ThemeModule/Resources/public/images/help.gif similarity index 100% rename from src/system/Zikula/Module/ThemeModule/Resources/public/images/help.gif rename to src/system/ThemeModule/Resources/public/images/help.gif diff --git a/src/system/Zikula/Module/ThemeModule/Resources/public/images/preview_large.png b/src/system/ThemeModule/Resources/public/images/preview_large.png similarity index 100% rename from src/system/Zikula/Module/ThemeModule/Resources/public/images/preview_large.png rename to src/system/ThemeModule/Resources/public/images/preview_large.png diff --git a/src/system/Zikula/Module/ThemeModule/Resources/public/images/preview_medium.png b/src/system/ThemeModule/Resources/public/images/preview_medium.png similarity index 100% rename from src/system/Zikula/Module/ThemeModule/Resources/public/images/preview_medium.png rename to src/system/ThemeModule/Resources/public/images/preview_medium.png diff --git a/src/system/Zikula/Module/ThemeModule/Resources/public/images/preview_small.png b/src/system/ThemeModule/Resources/public/images/preview_small.png similarity index 100% rename from src/system/Zikula/Module/ThemeModule/Resources/public/images/preview_small.png rename to src/system/ThemeModule/Resources/public/images/preview_small.png diff --git a/src/system/Zikula/Module/ThemeModule/Resources/public/images/red_dot.gif b/src/system/ThemeModule/Resources/public/images/red_dot.gif similarity index 100% rename from src/system/Zikula/Module/ThemeModule/Resources/public/images/red_dot.gif rename to src/system/ThemeModule/Resources/public/images/red_dot.gif diff --git a/src/system/Zikula/Module/ThemeModule/Resources/public/images/up.gif b/src/system/ThemeModule/Resources/public/images/up.gif similarity index 100% rename from src/system/Zikula/Module/ThemeModule/Resources/public/images/up.gif rename to src/system/ThemeModule/Resources/public/images/up.gif diff --git a/src/system/Zikula/Module/ThemeModule/Resources/public/js/ZikulaThemeModule.Admin.ModifyConfig.js b/src/system/ThemeModule/Resources/public/js/ZikulaThemeModule.Admin.ModifyConfig.js similarity index 100% rename from src/system/Zikula/Module/ThemeModule/Resources/public/js/ZikulaThemeModule.Admin.ModifyConfig.js rename to src/system/ThemeModule/Resources/public/js/ZikulaThemeModule.Admin.ModifyConfig.js diff --git a/src/system/Zikula/Module/ThemeModule/Resources/public/js/ZikulaThemeModule.Admin.View.js b/src/system/ThemeModule/Resources/public/js/ZikulaThemeModule.Admin.View.js similarity index 100% rename from src/system/Zikula/Module/ThemeModule/Resources/public/js/ZikulaThemeModule.Admin.View.js rename to src/system/ThemeModule/Resources/public/js/ZikulaThemeModule.Admin.View.js diff --git a/src/system/Zikula/Module/ThemeModule/Resources/public/js/form/form.js b/src/system/ThemeModule/Resources/public/js/form/form.js similarity index 100% rename from src/system/Zikula/Module/ThemeModule/Resources/public/js/form/form.js rename to src/system/ThemeModule/Resources/public/js/form/form.js diff --git a/src/system/Zikula/Module/ThemeModule/Resources/public/js/themeswitcher.js b/src/system/ThemeModule/Resources/public/js/themeswitcher.js similarity index 100% rename from src/system/Zikula/Module/ThemeModule/Resources/public/js/themeswitcher.js rename to src/system/ThemeModule/Resources/public/js/themeswitcher.js diff --git a/src/system/Zikula/Module/ThemeModule/Resources/views/Admin/credits.tpl b/src/system/ThemeModule/Resources/views/Admin/credits.tpl similarity index 100% rename from src/system/Zikula/Module/ThemeModule/Resources/views/Admin/credits.tpl rename to src/system/ThemeModule/Resources/views/Admin/credits.tpl diff --git a/src/system/Zikula/Module/ThemeModule/Resources/views/Admin/delete.tpl b/src/system/ThemeModule/Resources/views/Admin/delete.tpl similarity index 100% rename from src/system/Zikula/Module/ThemeModule/Resources/views/Admin/delete.tpl rename to src/system/ThemeModule/Resources/views/Admin/delete.tpl diff --git a/src/system/Zikula/Module/ThemeModule/Resources/views/Admin/deletepageconfigurationassignment.tpl b/src/system/ThemeModule/Resources/views/Admin/deletepageconfigurationassignment.tpl similarity index 100% rename from src/system/Zikula/Module/ThemeModule/Resources/views/Admin/deletepageconfigurationassignment.tpl rename to src/system/ThemeModule/Resources/views/Admin/deletepageconfigurationassignment.tpl diff --git a/src/system/Zikula/Module/ThemeModule/Resources/views/Admin/modify.tpl b/src/system/ThemeModule/Resources/views/Admin/modify.tpl similarity index 100% rename from src/system/Zikula/Module/ThemeModule/Resources/views/Admin/modify.tpl rename to src/system/ThemeModule/Resources/views/Admin/modify.tpl diff --git a/src/system/Zikula/Module/ThemeModule/Resources/views/Admin/modifyconfig.tpl b/src/system/ThemeModule/Resources/views/Admin/modifyconfig.tpl similarity index 100% rename from src/system/Zikula/Module/ThemeModule/Resources/views/Admin/modifyconfig.tpl rename to src/system/ThemeModule/Resources/views/Admin/modifyconfig.tpl diff --git a/src/system/Zikula/Module/ThemeModule/Resources/views/Admin/modifymenu.tpl b/src/system/ThemeModule/Resources/views/Admin/modifymenu.tpl similarity index 100% rename from src/system/Zikula/Module/ThemeModule/Resources/views/Admin/modifymenu.tpl rename to src/system/ThemeModule/Resources/views/Admin/modifymenu.tpl diff --git a/src/system/Zikula/Module/ThemeModule/Resources/views/Admin/modifypageconfigtemplates.tpl b/src/system/ThemeModule/Resources/views/Admin/modifypageconfigtemplates.tpl similarity index 100% rename from src/system/Zikula/Module/ThemeModule/Resources/views/Admin/modifypageconfigtemplates.tpl rename to src/system/ThemeModule/Resources/views/Admin/modifypageconfigtemplates.tpl diff --git a/src/system/Zikula/Module/ThemeModule/Resources/views/Admin/modifypageconfigurationassignment.tpl b/src/system/ThemeModule/Resources/views/Admin/modifypageconfigurationassignment.tpl similarity index 100% rename from src/system/Zikula/Module/ThemeModule/Resources/views/Admin/modifypageconfigurationassignment.tpl rename to src/system/ThemeModule/Resources/views/Admin/modifypageconfigurationassignment.tpl diff --git a/src/system/Zikula/Module/ThemeModule/Resources/views/Admin/pageconfigurations.tpl b/src/system/ThemeModule/Resources/views/Admin/pageconfigurations.tpl similarity index 100% rename from src/system/Zikula/Module/ThemeModule/Resources/views/Admin/pageconfigurations.tpl rename to src/system/ThemeModule/Resources/views/Admin/pageconfigurations.tpl diff --git a/src/system/Zikula/Module/ThemeModule/Resources/views/Admin/palettes.tpl b/src/system/ThemeModule/Resources/views/Admin/palettes.tpl similarity index 100% rename from src/system/Zikula/Module/ThemeModule/Resources/views/Admin/palettes.tpl rename to src/system/ThemeModule/Resources/views/Admin/palettes.tpl diff --git a/src/system/Zikula/Module/ThemeModule/Resources/views/Admin/setasdefault.tpl b/src/system/ThemeModule/Resources/views/Admin/setasdefault.tpl similarity index 100% rename from src/system/Zikula/Module/ThemeModule/Resources/views/Admin/setasdefault.tpl rename to src/system/ThemeModule/Resources/views/Admin/setasdefault.tpl diff --git a/src/system/Zikula/Module/ThemeModule/Resources/views/Admin/variables.tpl b/src/system/ThemeModule/Resources/views/Admin/variables.tpl similarity index 100% rename from src/system/Zikula/Module/ThemeModule/Resources/views/Admin/variables.tpl rename to src/system/ThemeModule/Resources/views/Admin/variables.tpl diff --git a/src/system/Zikula/Module/ThemeModule/Resources/views/Admin/view.tpl b/src/system/ThemeModule/Resources/views/Admin/view.tpl similarity index 100% rename from src/system/Zikula/Module/ThemeModule/Resources/views/Admin/view.tpl rename to src/system/ThemeModule/Resources/views/Admin/view.tpl diff --git a/src/system/Zikula/Module/ThemeModule/Resources/views/Block/render_modify.tpl b/src/system/ThemeModule/Resources/views/Block/render_modify.tpl similarity index 100% rename from src/system/Zikula/Module/ThemeModule/Resources/views/Block/render_modify.tpl rename to src/system/ThemeModule/Resources/views/Block/render_modify.tpl diff --git a/src/system/Zikula/Module/ThemeModule/Resources/views/Block/themeswitcher.tpl b/src/system/ThemeModule/Resources/views/Block/themeswitcher.tpl similarity index 100% rename from src/system/Zikula/Module/ThemeModule/Resources/views/Block/themeswitcher.tpl rename to src/system/ThemeModule/Resources/views/Block/themeswitcher.tpl diff --git a/src/system/Zikula/Module/ThemeModule/Resources/views/Block/themeswitcher_modify.tpl b/src/system/ThemeModule/Resources/views/Block/themeswitcher_modify.tpl similarity index 100% rename from src/system/Zikula/Module/ThemeModule/Resources/views/Block/themeswitcher_modify.tpl rename to src/system/ThemeModule/Resources/views/Block/themeswitcher_modify.tpl diff --git a/src/system/Zikula/Module/ThemeModule/Resources/views/User/main.tpl b/src/system/ThemeModule/Resources/views/User/main.tpl similarity index 100% rename from src/system/Zikula/Module/ThemeModule/Resources/views/User/main.tpl rename to src/system/ThemeModule/Resources/views/User/main.tpl diff --git a/src/system/Zikula/Module/ThemeModule/Resources/views/moduleheader.tpl b/src/system/ThemeModule/Resources/views/moduleheader.tpl similarity index 100% rename from src/system/Zikula/Module/ThemeModule/Resources/views/moduleheader.tpl rename to src/system/ThemeModule/Resources/views/moduleheader.tpl diff --git a/src/system/Zikula/Module/ThemeModule/Resources/views/pager.tpl b/src/system/ThemeModule/Resources/views/pager.tpl similarity index 100% rename from src/system/Zikula/Module/ThemeModule/Resources/views/pager.tpl rename to src/system/ThemeModule/Resources/views/pager.tpl diff --git a/src/system/Zikula/Module/ThemeModule/Resources/views/pagercss.tpl b/src/system/ThemeModule/Resources/views/pagercss.tpl similarity index 100% rename from src/system/Zikula/Module/ThemeModule/Resources/views/pagercss.tpl rename to src/system/ThemeModule/Resources/views/pagercss.tpl diff --git a/src/system/Zikula/Module/ThemeModule/Resources/views/pagercss2.tpl b/src/system/ThemeModule/Resources/views/pagercss2.tpl similarity index 100% rename from src/system/Zikula/Module/ThemeModule/Resources/views/pagercss2.tpl rename to src/system/ThemeModule/Resources/views/pagercss2.tpl diff --git a/src/system/Zikula/Module/ThemeModule/Resources/views/pagerimage.tpl b/src/system/ThemeModule/Resources/views/pagerimage.tpl similarity index 100% rename from src/system/Zikula/Module/ThemeModule/Resources/views/pagerimage.tpl rename to src/system/ThemeModule/Resources/views/pagerimage.tpl diff --git a/src/system/Zikula/Module/ThemeModule/Resources/views/pagerintervals.tpl b/src/system/ThemeModule/Resources/views/pagerintervals.tpl similarity index 100% rename from src/system/Zikula/Module/ThemeModule/Resources/views/pagerintervals.tpl rename to src/system/ThemeModule/Resources/views/pagerintervals.tpl diff --git a/src/system/Zikula/Module/ThemeModule/Resources/views/pageritems.tpl b/src/system/ThemeModule/Resources/views/pageritems.tpl similarity index 100% rename from src/system/Zikula/Module/ThemeModule/Resources/views/pageritems.tpl rename to src/system/ThemeModule/Resources/views/pageritems.tpl diff --git a/src/system/Zikula/Module/ThemeModule/Resources/views/pagerjs.tpl b/src/system/ThemeModule/Resources/views/pagerjs.tpl similarity index 100% rename from src/system/Zikula/Module/ThemeModule/Resources/views/pagerjs.tpl rename to src/system/ThemeModule/Resources/views/pagerjs.tpl diff --git a/src/system/Zikula/Module/ThemeModule/Resources/views/system/dbconnectionerror.tpl b/src/system/ThemeModule/Resources/views/system/dbconnectionerror.tpl similarity index 100% rename from src/system/Zikula/Module/ThemeModule/Resources/views/system/dbconnectionerror.tpl rename to src/system/ThemeModule/Resources/views/system/dbconnectionerror.tpl diff --git a/src/system/Zikula/Module/ThemeModule/Resources/views/system/sessionfailed.tpl b/src/system/ThemeModule/Resources/views/system/sessionfailed.tpl similarity index 100% rename from src/system/Zikula/Module/ThemeModule/Resources/views/system/sessionfailed.tpl rename to src/system/ThemeModule/Resources/views/system/sessionfailed.tpl diff --git a/src/system/Zikula/Module/ThemeModule/Resources/views/system/siteoff.tpl b/src/system/ThemeModule/Resources/views/system/siteoff.tpl similarity index 100% rename from src/system/Zikula/Module/ThemeModule/Resources/views/system/siteoff.tpl rename to src/system/ThemeModule/Resources/views/system/siteoff.tpl diff --git a/src/system/Zikula/Module/ThemeModule/Resources/views/zdebug.tpl b/src/system/ThemeModule/Resources/views/zdebug.tpl similarity index 100% rename from src/system/Zikula/Module/ThemeModule/Resources/views/zdebug.tpl rename to src/system/ThemeModule/Resources/views/zdebug.tpl diff --git a/src/system/Zikula/Module/ThemeModule/Resources/views/zpopup.tpl b/src/system/ThemeModule/Resources/views/zpopup.tpl similarity index 100% rename from src/system/Zikula/Module/ThemeModule/Resources/views/zpopup.tpl rename to src/system/ThemeModule/Resources/views/zpopup.tpl diff --git a/src/system/Zikula/Module/ThemeModule/ThemeModuleInstaller.php b/src/system/ThemeModule/ThemeModuleInstaller.php similarity index 96% rename from src/system/Zikula/Module/ThemeModule/ThemeModuleInstaller.php rename to src/system/ThemeModule/ThemeModuleInstaller.php index 92bdf3bd04..e0062f3507 100644 --- a/src/system/Zikula/Module/ThemeModule/ThemeModuleInstaller.php +++ b/src/system/ThemeModule/ThemeModuleInstaller.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\ThemeModule; +namespace Zikula\ThemeModule; use ModUtil; use DoctrineHelper; @@ -30,7 +30,7 @@ public function install() { // create the table try { - DoctrineHelper::createSchema($this->entityManager, array('Zikula\Module\ThemeModule\Entity\ThemeEntity')); + DoctrineHelper::createSchema($this->entityManager, array('Zikula\ThemeModule\Entity\ThemeEntity')); } catch (\Exception $e) { return false; } diff --git a/src/system/Zikula/Module/ThemeModule/ThemeModuleVersion.php b/src/system/ThemeModule/ThemeModuleVersion.php similarity index 97% rename from src/system/Zikula/Module/ThemeModule/ThemeModuleVersion.php rename to src/system/ThemeModule/ThemeModuleVersion.php index da2c924375..edc51f55fc 100644 --- a/src/system/Zikula/Module/ThemeModule/ThemeModuleVersion.php +++ b/src/system/ThemeModule/ThemeModuleVersion.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\ThemeModule; +namespace Zikula\ThemeModule; /** * Version information for the theme module diff --git a/src/system/Zikula/Module/ThemeModule/Util.php b/src/system/ThemeModule/Util.php similarity index 98% rename from src/system/Zikula/Module/ThemeModule/Util.php rename to src/system/ThemeModule/Util.php index 39edcd015e..533976032a 100644 --- a/src/system/Zikula/Module/ThemeModule/Util.php +++ b/src/system/ThemeModule/Util.php @@ -11,14 +11,14 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\ThemeModule; +namespace Zikula\ThemeModule; use ModUtil; use FileUtil; use ZLanguage; use ThemeUtil; use ServiceUtil; -use Zikula\Module\ThemeModule\Entity\ThemeEntity; +use Zikula\ThemeModule\Entity\ThemeEntity; use Zikula\Bundle\CoreBundle\Bundle\Scanner; use ZLoader; use Zikula\Bundle\CoreBundle\Bundle\Bootstrap; diff --git a/src/system/Zikula/Module/ThemeModule/ZikulaThemeModule.php b/src/system/ThemeModule/ZikulaThemeModule.php similarity index 94% rename from src/system/Zikula/Module/ThemeModule/ZikulaThemeModule.php rename to src/system/ThemeModule/ZikulaThemeModule.php index 4487131f54..be956ab784 100644 --- a/src/system/Zikula/Module/ThemeModule/ZikulaThemeModule.php +++ b/src/system/ThemeModule/ZikulaThemeModule.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\ThemeModule; +namespace Zikula\ThemeModule; use Zikula\Bundle\CoreBundle\Bundle\AbstractCoreModule; diff --git a/src/system/Zikula/Module/ThemeModule/composer.json b/src/system/ThemeModule/composer.json similarity index 75% rename from src/system/Zikula/Module/ThemeModule/composer.json rename to src/system/ThemeModule/composer.json index dea227e63a..5ff67f3ff5 100644 --- a/src/system/Zikula/Module/ThemeModule/composer.json +++ b/src/system/ThemeModule/composer.json @@ -10,14 +10,14 @@ } ], "autoload": { - "psr-0": { "Zikula\\Module\\ThemeModule\\": "" } + "psr-4": { "Zikula\\ThemeModule\\": "" } }, "require": { "php": ">5.4.0" }, "extra": { "zikula": { - "class": "Zikula\\Module\\ThemeModule\\ZikulaThemeModule" + "class": "Zikula\\ThemeModule\\ZikulaThemeModule" } } } diff --git a/src/system/Zikula/Module/ThemeModule/phpunit.xml.dist b/src/system/ThemeModule/phpunit.xml.dist similarity index 100% rename from src/system/Zikula/Module/ThemeModule/phpunit.xml.dist rename to src/system/ThemeModule/phpunit.xml.dist diff --git a/src/system/Zikula/Module/ThemeModule/tables.php b/src/system/ThemeModule/tables.php similarity index 100% rename from src/system/Zikula/Module/ThemeModule/tables.php rename to src/system/ThemeModule/tables.php From 3525db2e7586541bf97777dd86c4d6af89ce58a7 Mon Sep 17 00:00:00 2001 From: Craig Heydenburg Date: Sun, 16 Aug 2015 17:46:11 -0400 Subject: [PATCH 02/35] convert AdminModule --- composer.json | 3 ++- src/app/ZikulaKernel.php | 2 +- .../{Zikula/Module => }/AdminModule/.gitignore | 0 .../{Zikula/Module => }/AdminModule/.travis.yml | 0 .../AdminModule/AdminModuleInstaller.php | 8 ++++---- .../Module => }/AdminModule/AdminModuleVersion.php | 2 +- .../Module => }/AdminModule/Api/AccountApi.php | 2 +- .../Module => }/AdminModule/Api/AdminApi.php | 6 +++--- .../Module => }/AdminModule/Block/AdminnavBlock.php | 2 +- .../AdminModule/Controller/AdminController.php | 8 ++++---- .../AdminModule/Controller/AjaxController.php | 2 +- .../DependencyInjection/ZikulaAdminExtension.php | 2 +- .../AdminModule/Entity/AdminCategoryEntity.php | 2 +- .../AdminModule/Entity/AdminModuleEntity.php | 2 +- src/system/{Zikula/Module => }/AdminModule/LICENSE | 0 .../AdminModule/Listener/ModuleEventListener.php | 2 +- .../{Zikula/Module => }/AdminModule/README.md | 0 .../AdminModule/Resources/config/routing.yml | 0 .../AdminModule/Resources/config/services.xml | 2 +- .../AdminModule/Resources/public/css/admin.css | 0 .../AdminModule/Resources/public/css/minitabs.css | 0 .../public/css/mmenu-hiddenpanel-customwidth.css | 0 .../css/mmenu-hiddenpanel-customwidth.css.map | 0 .../public/css/mmenu-hiddenpanel-customwidth.scss | 0 .../AdminModule/Resources/public/css/navtabs.css | 0 .../AdminModule/Resources/public/css/style.css | 0 .../AdminModule/Resources/public/images/admin.png | Bin .../Resources/public/images/button_bkg.gif | Bin .../AdminModule/Resources/public/images/default.gif | Bin .../AdminModule/Resources/public/images/mouse.png | Bin .../Resources/public/images/tab_bottom.gif | Bin .../Resources/public/js/admin_admin_admintabs.js | 0 .../public/js/admin_admin_systemnotices.js | 0 .../public/js/jQuery.mmenu-master/.gitignore | 0 .../public/js/jQuery.mmenu-master/Guardfile | 0 .../public/js/jQuery.mmenu-master/README.md | 0 .../public/js/jQuery.mmenu-master/bower.json | 0 .../public/js/jQuery.mmenu-master/composer.json | 0 .../js/jQuery.mmenu-master/demo/advanced.html | 0 .../public/js/jQuery.mmenu-master/demo/css/demo.css | 0 .../public/js/jQuery.mmenu-master/demo/css/site.css | 0 .../public/js/jQuery.mmenu-master/demo/default.html | 0 .../public/js/jQuery.mmenu-master/demo/onepage.html | 0 .../dist/css/addons/jquery.mmenu.autoheight.css | 0 .../dist/css/addons/jquery.mmenu.buttonbars.css | 0 .../dist/css/addons/jquery.mmenu.counters.css | 0 .../dist/css/addons/jquery.mmenu.dividers.css | 0 .../dist/css/addons/jquery.mmenu.dragopen.css | 0 .../dist/css/addons/jquery.mmenu.footer.css | 0 .../dist/css/addons/jquery.mmenu.header.css | 0 .../dist/css/addons/jquery.mmenu.height.css | 0 .../dist/css/addons/jquery.mmenu.offcanvas.css | 0 .../dist/css/addons/jquery.mmenu.searchfield.css | 0 .../dist/css/addons/jquery.mmenu.sectionindexer.css | 0 .../dist/css/addons/jquery.mmenu.toggles.css | 0 .../css/extensions/jquery.mmenu.borderstyle.css | 0 .../dist/css/extensions/jquery.mmenu.effects.css | 0 .../dist/css/extensions/jquery.mmenu.fullscreen.css | 0 .../dist/css/extensions/jquery.mmenu.iconbar.css | 0 .../dist/css/extensions/jquery.mmenu.multiline.css | 0 .../dist/css/extensions/jquery.mmenu.pageshadow.css | 0 .../css/extensions/jquery.mmenu.positioning.css | 0 .../dist/css/extensions/jquery.mmenu.themes.css | 0 .../dist/css/extensions/jquery.mmenu.widescreen.css | 0 .../dist/css/jquery.mmenu.all.css | 0 .../jQuery.mmenu-master/dist/css/jquery.mmenu.css | 0 .../dist/css/jquery.mmenu.oncanvas.css | 0 .../dist/js/addons/jquery.mmenu.autoheight.min.js | 0 .../dist/js/addons/jquery.mmenu.backbutton.min.js | 0 .../dist/js/addons/jquery.mmenu.buttonbars.min.js | 0 .../dist/js/addons/jquery.mmenu.counters.min.js | 0 .../dist/js/addons/jquery.mmenu.dividers.min.js | 0 .../dist/js/addons/jquery.mmenu.dragopen.min.js | 0 .../js/addons/jquery.mmenu.fixedelements.min.js | 0 .../dist/js/addons/jquery.mmenu.footer.min.js | 0 .../dist/js/addons/jquery.mmenu.header.min.js | 0 .../dist/js/addons/jquery.mmenu.offcanvas.min.js | 0 .../dist/js/addons/jquery.mmenu.searchfield.min.js | 0 .../js/addons/jquery.mmenu.sectionindexer.min.js | 0 .../dist/js/addons/jquery.mmenu.toggles.min.js | 0 .../dist/js/jquery.mmenu.min.all.js | 0 .../jQuery.mmenu-master/dist/js/jquery.mmenu.min.js | 0 .../dist/js/jquery.mmenu.oncanvas.min.js | 0 .../jQuery.mmenu-master/dist/js_umd/_inc/affix.js | 0 .../jQuery.mmenu-master/dist/js_umd/_inc/prefix.js | 0 .../js_umd/addons/jquery.mmenu.autoheight.umd.js | 0 .../js_umd/addons/jquery.mmenu.backbutton.umd.js | 0 .../js_umd/addons/jquery.mmenu.buttonbars.umd.js | 0 .../dist/js_umd/addons/jquery.mmenu.counters.umd.js | 0 .../dist/js_umd/addons/jquery.mmenu.dividers.umd.js | 0 .../dist/js_umd/addons/jquery.mmenu.dragopen.umd.js | 0 .../js_umd/addons/jquery.mmenu.fixedelements.umd.js | 0 .../dist/js_umd/addons/jquery.mmenu.footer.umd.js | 0 .../dist/js_umd/addons/jquery.mmenu.header.umd.js | 0 .../js_umd/addons/jquery.mmenu.offcanvas.umd.js | 0 .../js_umd/addons/jquery.mmenu.searchfield.umd.js | 0 .../dist/js_umd/addons/jquery.mmenu.toggles.umd.js | 0 .../dist/js_umd/jquery.mmenu.oncanvas.umd.js | 0 .../dist/js_umd/jquery.mmenu.umd.all.js | 0 .../dist/js_umd/jquery.mmenu.umd.js | 0 .../public/js/jQuery.mmenu-master/index.html | 0 .../public/js/jQuery.mmenu-master/mmenu.jquery.json | 0 .../public/js/jQuery.mmenu-master/package.json | 0 .../src/js/addons/addon-template.js | 0 .../src/js/addons/jquery.mmenu.autoheight.js | 0 .../src/js/addons/jquery.mmenu.backbutton.js | 0 .../src/js/addons/jquery.mmenu.buttonbars.js | 0 .../src/js/addons/jquery.mmenu.counters.js | 0 .../src/js/addons/jquery.mmenu.dividers.js | 0 .../src/js/addons/jquery.mmenu.dragopen.js | 0 .../src/js/addons/jquery.mmenu.fixedelements.js | 0 .../src/js/addons/jquery.mmenu.footer.js | 0 .../src/js/addons/jquery.mmenu.header.js | 0 .../src/js/addons/jquery.mmenu.offcanvas.js | 0 .../src/js/addons/jquery.mmenu.searchfield.js | 0 .../src/js/addons/jquery.mmenu.sectionindexer.js | 0 .../src/js/addons/jquery.mmenu.toggles.js | 0 .../src/js/jquery.mmenu.debugger.js | 0 .../js/jQuery.mmenu-master/src/js/jquery.mmenu.js | 0 .../src/js/jquery.mmenu.oncanvas.js | 0 .../jQuery.mmenu-master/src/scss/_inc/_colors.scss | 0 .../jQuery.mmenu-master/src/scss/_inc/_mixins.scss | 0 .../jQuery.mmenu-master/src/scss/_inc/_sizing.scss | 0 .../src/scss/_inc/_variables.scss | 0 .../src/scss/addons/jquery.mmenu.autoheight.scss | 0 .../src/scss/addons/jquery.mmenu.buttonbars.scss | 0 .../src/scss/addons/jquery.mmenu.counters.scss | 0 .../src/scss/addons/jquery.mmenu.dividers.scss | 0 .../src/scss/addons/jquery.mmenu.dragopen.scss | 0 .../src/scss/addons/jquery.mmenu.footer.scss | 0 .../src/scss/addons/jquery.mmenu.header.scss | 0 .../src/scss/addons/jquery.mmenu.offcanvas.scss | 0 .../src/scss/addons/jquery.mmenu.searchfield.scss | 0 .../scss/addons/jquery.mmenu.sectionindexer.scss | 0 .../src/scss/addons/jquery.mmenu.toggles.scss | 0 .../scss/extensions/jquery.mmenu.borderstyle.scss | 0 .../src/scss/extensions/jquery.mmenu.effects.scss | 0 .../scss/extensions/jquery.mmenu.fullscreen.scss | 0 .../src/scss/extensions/jquery.mmenu.iconbar.scss | 0 .../src/scss/extensions/jquery.mmenu.multiline.scss | 0 .../scss/extensions/jquery.mmenu.pageshadow.scss | 0 .../scss/extensions/jquery.mmenu.positioning.scss | 0 .../src/scss/extensions/jquery.mmenu.themes.scss | 0 .../scss/extensions/jquery.mmenu.widescreen.scss | 0 .../src/scss/jquery.mmenu.all.scss | 0 .../src/scss/jquery.mmenu.oncanvas.scss | 0 .../jQuery.mmenu-master/src/scss/jquery.mmenu.scss | 0 .../Resources/views/Admin/adminpanel.tpl | 0 .../AdminModule/Resources/views/Admin/admintabs.tpl | 0 .../Resources/views/Admin/ajaxAddCategory.tpl | 0 .../Resources/views/Admin/breadcrumbs.tpl | 0 .../Resources/views/Admin/categorymenu.tpl | 0 .../AdminModule/Resources/views/Admin/delete.tpl | 0 .../Resources/views/Admin/developernotices.tpl | 0 .../AdminModule/Resources/views/Admin/footer.tpl | 0 .../AdminModule/Resources/views/Admin/header.tpl | 0 .../AdminModule/Resources/views/Admin/help.tpl | 0 .../AdminModule/Resources/views/Admin/modify.tpl | 0 .../Resources/views/Admin/modifyconfig.tpl | 0 .../AdminModule/Resources/views/Admin/newcat.tpl | 0 .../Resources/views/Admin/securityanalyzer.tpl | 0 .../Resources/views/Admin/systemnotices.tpl | 0 .../Resources/views/Admin/updatechecker.tpl | 0 .../AdminModule/Resources/views/Admin/view.tpl | 0 .../AdminModule/Resources/views/Admin/warning.tpl | 0 .../AdminModule/Resources/views/Block/adminnav.tpl | 0 .../views/plugins/function.admincategorymenu.php | 0 .../views/plugins/function.adminfooter.php | 0 .../views/plugins/function.adminheader.php | 0 .../Module => }/AdminModule/ZikulaAdminModule.php | 2 +- .../{Zikula/Module => }/AdminModule/composer.json | 4 ++-- .../Module => }/AdminModule/phpunit.xml.dist | 0 .../{Zikula/Module => }/AdminModule/tables.php | 0 173 files changed, 26 insertions(+), 25 deletions(-) rename src/system/{Zikula/Module => }/AdminModule/.gitignore (100%) rename src/system/{Zikula/Module => }/AdminModule/.travis.yml (100%) rename src/system/{Zikula/Module => }/AdminModule/AdminModuleInstaller.php (94%) rename src/system/{Zikula/Module => }/AdminModule/AdminModuleVersion.php (96%) rename src/system/{Zikula/Module => }/AdminModule/Api/AccountApi.php (96%) rename src/system/{Zikula/Module => }/AdminModule/Api/AdminApi.php (99%) rename src/system/{Zikula/Module => }/AdminModule/Block/AdminnavBlock.php (99%) rename src/system/{Zikula/Module => }/AdminModule/Controller/AdminController.php (99%) rename src/system/{Zikula/Module => }/AdminModule/Controller/AjaxController.php (99%) rename src/system/{Zikula/Module => }/AdminModule/DependencyInjection/ZikulaAdminExtension.php (95%) rename src/system/{Zikula/Module => }/AdminModule/Entity/AdminCategoryEntity.php (98%) rename src/system/{Zikula/Module => }/AdminModule/Entity/AdminModuleEntity.php (98%) rename src/system/{Zikula/Module => }/AdminModule/LICENSE (100%) rename src/system/{Zikula/Module => }/AdminModule/Listener/ModuleEventListener.php (97%) rename src/system/{Zikula/Module => }/AdminModule/README.md (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/config/routing.yml (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/config/services.xml (89%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/css/admin.css (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/css/minitabs.css (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/css/mmenu-hiddenpanel-customwidth.css (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/css/mmenu-hiddenpanel-customwidth.css.map (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/css/mmenu-hiddenpanel-customwidth.scss (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/css/navtabs.css (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/css/style.css (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/images/admin.png (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/images/button_bkg.gif (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/images/default.gif (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/images/mouse.png (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/images/tab_bottom.gif (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/admin_admin_admintabs.js (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/admin_admin_systemnotices.js (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/.gitignore (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/Guardfile (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/README.md (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/bower.json (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/composer.json (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/demo/advanced.html (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/demo/css/demo.css (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/demo/css/site.css (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/demo/default.html (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/demo/onepage.html (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/addons/jquery.mmenu.autoheight.css (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/addons/jquery.mmenu.buttonbars.css (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/addons/jquery.mmenu.counters.css (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/addons/jquery.mmenu.dividers.css (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/addons/jquery.mmenu.dragopen.css (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/addons/jquery.mmenu.footer.css (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/addons/jquery.mmenu.header.css (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/addons/jquery.mmenu.height.css (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/addons/jquery.mmenu.offcanvas.css (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/addons/jquery.mmenu.searchfield.css (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/addons/jquery.mmenu.sectionindexer.css (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/addons/jquery.mmenu.toggles.css (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/extensions/jquery.mmenu.borderstyle.css (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/extensions/jquery.mmenu.effects.css (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/extensions/jquery.mmenu.fullscreen.css (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/extensions/jquery.mmenu.iconbar.css (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/extensions/jquery.mmenu.multiline.css (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/extensions/jquery.mmenu.pageshadow.css (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/extensions/jquery.mmenu.positioning.css (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/extensions/jquery.mmenu.themes.css (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/extensions/jquery.mmenu.widescreen.css (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/jquery.mmenu.all.css (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/jquery.mmenu.css (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/jquery.mmenu.oncanvas.css (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js/addons/jquery.mmenu.autoheight.min.js (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js/addons/jquery.mmenu.backbutton.min.js (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js/addons/jquery.mmenu.buttonbars.min.js (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js/addons/jquery.mmenu.counters.min.js (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js/addons/jquery.mmenu.dividers.min.js (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js/addons/jquery.mmenu.dragopen.min.js (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js/addons/jquery.mmenu.fixedelements.min.js (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js/addons/jquery.mmenu.footer.min.js (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js/addons/jquery.mmenu.header.min.js (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js/addons/jquery.mmenu.offcanvas.min.js (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js/addons/jquery.mmenu.searchfield.min.js (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js/addons/jquery.mmenu.sectionindexer.min.js (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js/addons/jquery.mmenu.toggles.min.js (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js/jquery.mmenu.min.all.js (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js/jquery.mmenu.min.js (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js/jquery.mmenu.oncanvas.min.js (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js_umd/_inc/affix.js (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js_umd/_inc/prefix.js (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js_umd/addons/jquery.mmenu.autoheight.umd.js (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js_umd/addons/jquery.mmenu.backbutton.umd.js (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js_umd/addons/jquery.mmenu.buttonbars.umd.js (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js_umd/addons/jquery.mmenu.counters.umd.js (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js_umd/addons/jquery.mmenu.dividers.umd.js (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js_umd/addons/jquery.mmenu.dragopen.umd.js (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js_umd/addons/jquery.mmenu.fixedelements.umd.js (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js_umd/addons/jquery.mmenu.footer.umd.js (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js_umd/addons/jquery.mmenu.header.umd.js (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js_umd/addons/jquery.mmenu.offcanvas.umd.js (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js_umd/addons/jquery.mmenu.searchfield.umd.js (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js_umd/addons/jquery.mmenu.toggles.umd.js (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js_umd/jquery.mmenu.oncanvas.umd.js (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js_umd/jquery.mmenu.umd.all.js (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js_umd/jquery.mmenu.umd.js (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/index.html (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/mmenu.jquery.json (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/package.json (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/src/js/addons/addon-template.js (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/src/js/addons/jquery.mmenu.autoheight.js (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/src/js/addons/jquery.mmenu.backbutton.js (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/src/js/addons/jquery.mmenu.buttonbars.js (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/src/js/addons/jquery.mmenu.counters.js (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/src/js/addons/jquery.mmenu.dividers.js (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/src/js/addons/jquery.mmenu.dragopen.js (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/src/js/addons/jquery.mmenu.fixedelements.js (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/src/js/addons/jquery.mmenu.footer.js (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/src/js/addons/jquery.mmenu.header.js (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/src/js/addons/jquery.mmenu.offcanvas.js (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/src/js/addons/jquery.mmenu.searchfield.js (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/src/js/addons/jquery.mmenu.sectionindexer.js (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/src/js/addons/jquery.mmenu.toggles.js (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/src/js/jquery.mmenu.debugger.js (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/src/js/jquery.mmenu.js (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/src/js/jquery.mmenu.oncanvas.js (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/_inc/_colors.scss (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/_inc/_mixins.scss (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/_inc/_sizing.scss (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/_inc/_variables.scss (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/addons/jquery.mmenu.autoheight.scss (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/addons/jquery.mmenu.buttonbars.scss (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/addons/jquery.mmenu.counters.scss (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/addons/jquery.mmenu.dividers.scss (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/addons/jquery.mmenu.dragopen.scss (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/addons/jquery.mmenu.footer.scss (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/addons/jquery.mmenu.header.scss (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/addons/jquery.mmenu.offcanvas.scss (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/addons/jquery.mmenu.searchfield.scss (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/addons/jquery.mmenu.sectionindexer.scss (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/addons/jquery.mmenu.toggles.scss (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/extensions/jquery.mmenu.borderstyle.scss (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/extensions/jquery.mmenu.effects.scss (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/extensions/jquery.mmenu.fullscreen.scss (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/extensions/jquery.mmenu.iconbar.scss (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/extensions/jquery.mmenu.multiline.scss (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/extensions/jquery.mmenu.pageshadow.scss (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/extensions/jquery.mmenu.positioning.scss (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/extensions/jquery.mmenu.themes.scss (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/extensions/jquery.mmenu.widescreen.scss (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/jquery.mmenu.all.scss (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/jquery.mmenu.oncanvas.scss (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/jquery.mmenu.scss (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/views/Admin/adminpanel.tpl (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/views/Admin/admintabs.tpl (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/views/Admin/ajaxAddCategory.tpl (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/views/Admin/breadcrumbs.tpl (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/views/Admin/categorymenu.tpl (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/views/Admin/delete.tpl (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/views/Admin/developernotices.tpl (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/views/Admin/footer.tpl (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/views/Admin/header.tpl (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/views/Admin/help.tpl (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/views/Admin/modify.tpl (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/views/Admin/modifyconfig.tpl (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/views/Admin/newcat.tpl (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/views/Admin/securityanalyzer.tpl (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/views/Admin/systemnotices.tpl (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/views/Admin/updatechecker.tpl (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/views/Admin/view.tpl (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/views/Admin/warning.tpl (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/views/Block/adminnav.tpl (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/views/plugins/function.admincategorymenu.php (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/views/plugins/function.adminfooter.php (100%) rename src/system/{Zikula/Module => }/AdminModule/Resources/views/plugins/function.adminheader.php (100%) rename src/system/{Zikula/Module => }/AdminModule/ZikulaAdminModule.php (94%) rename src/system/{Zikula/Module => }/AdminModule/composer.json (75%) rename src/system/{Zikula/Module => }/AdminModule/phpunit.xml.dist (100%) rename src/system/{Zikula/Module => }/AdminModule/tables.php (100%) diff --git a/composer.json b/composer.json index 0f4df54cfe..ae1dbde11f 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,8 @@ }, "psr-4": { "Zikula\\RoutesModule\\": "src/system/ZikulaRoutesModule", - "Zikula\\ThemeModule\\": "src/system/ThemeModule" + "Zikula\\ThemeModule\\": "src/system/ThemeModule", + "Zikula\\AdminModule\\": "src/system/AdminModule" }, "classmap": [ "src/lib/util/", diff --git a/src/app/ZikulaKernel.php b/src/app/ZikulaKernel.php index 889753d666..59b1c57e71 100644 --- a/src/app/ZikulaKernel.php +++ b/src/app/ZikulaKernel.php @@ -63,7 +63,7 @@ public function registerContainerConfiguration(LoaderInterface $loader) private function registerCoreModules(array &$bundles) { - $bundles[] = new Zikula\Module\AdminModule\ZikulaAdminModule(); + $bundles[] = new Zikula\AdminModule\ZikulaAdminModule(); $bundles[] = new Zikula\Module\BlocksModule\ZikulaBlocksModule(); $bundles[] = new Zikula\Module\CategoriesModule\ZikulaCategoriesModule(); $bundles[] = new Zikula\Module\ExtensionsModule\ZikulaExtensionsModule(); diff --git a/src/system/Zikula/Module/AdminModule/.gitignore b/src/system/AdminModule/.gitignore similarity index 100% rename from src/system/Zikula/Module/AdminModule/.gitignore rename to src/system/AdminModule/.gitignore diff --git a/src/system/Zikula/Module/AdminModule/.travis.yml b/src/system/AdminModule/.travis.yml similarity index 100% rename from src/system/Zikula/Module/AdminModule/.travis.yml rename to src/system/AdminModule/.travis.yml diff --git a/src/system/Zikula/Module/AdminModule/AdminModuleInstaller.php b/src/system/AdminModule/AdminModuleInstaller.php similarity index 94% rename from src/system/Zikula/Module/AdminModule/AdminModuleInstaller.php rename to src/system/AdminModule/AdminModuleInstaller.php index 63dea1a5a6..914ef1fe5f 100644 --- a/src/system/Zikula/Module/AdminModule/AdminModuleInstaller.php +++ b/src/system/AdminModule/AdminModuleInstaller.php @@ -11,10 +11,10 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\AdminModule; +namespace Zikula\AdminModule; use DoctrineHelper; -use Zikula\Module\AdminModule\Entity\AdminCategoryEntity; +use Zikula\AdminModule\Entity\AdminCategoryEntity; /** * Installation and upgrade routines for the admin module @@ -34,8 +34,8 @@ public function install() // create tables try { DoctrineHelper::createSchema($this->entityManager, array( - 'Zikula\Module\AdminModule\Entity\AdminCategoryEntity', - 'Zikula\Module\AdminModule\Entity\AdminModuleEntity', + 'Zikula\AdminModule\Entity\AdminCategoryEntity', + 'Zikula\AdminModule\Entity\AdminModuleEntity', )); } catch (\Exception $e) { return false; diff --git a/src/system/Zikula/Module/AdminModule/AdminModuleVersion.php b/src/system/AdminModule/AdminModuleVersion.php similarity index 96% rename from src/system/Zikula/Module/AdminModule/AdminModuleVersion.php rename to src/system/AdminModule/AdminModuleVersion.php index b0ca737dd1..7c044884c2 100644 --- a/src/system/Zikula/Module/AdminModule/AdminModuleVersion.php +++ b/src/system/AdminModule/AdminModuleVersion.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\AdminModule; +namespace Zikula\AdminModule; /** * Version information for the admin module diff --git a/src/system/Zikula/Module/AdminModule/Api/AccountApi.php b/src/system/AdminModule/Api/AccountApi.php similarity index 96% rename from src/system/Zikula/Module/AdminModule/Api/AccountApi.php rename to src/system/AdminModule/Api/AccountApi.php index 2d4e7dc49b..da463f58ca 100644 --- a/src/system/Zikula/Module/AdminModule/Api/AccountApi.php +++ b/src/system/AdminModule/Api/AccountApi.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\AdminModule\Api; +namespace Zikula\AdminModule\Api; use ModUtil; use SecurityUtil; diff --git a/src/system/Zikula/Module/AdminModule/Api/AdminApi.php b/src/system/AdminModule/Api/AdminApi.php similarity index 99% rename from src/system/Zikula/Module/AdminModule/Api/AdminApi.php rename to src/system/AdminModule/Api/AdminApi.php index d19192e0a2..641dee1bcb 100644 --- a/src/system/Zikula/Module/AdminModule/Api/AdminApi.php +++ b/src/system/AdminModule/Api/AdminApi.php @@ -11,15 +11,15 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\AdminModule\Api; +namespace Zikula\AdminModule\Api; use ModUtil; -use Zikula\Module\AdminModule\Entity\AdminCategoryEntity; +use Zikula\AdminModule\Entity\AdminCategoryEntity; use SecurityUtil; use System; use DataUtil; use Symfony\Component\Security\Core\Exception\AccessDeniedException; -use Zikula\Module\AdminModule\Entity\AdminModuleEntity; +use Zikula\AdminModule\Entity\AdminModuleEntity; /** * API functions used by administrative controllers diff --git a/src/system/Zikula/Module/AdminModule/Block/AdminnavBlock.php b/src/system/AdminModule/Block/AdminnavBlock.php similarity index 99% rename from src/system/Zikula/Module/AdminModule/Block/AdminnavBlock.php rename to src/system/AdminModule/Block/AdminnavBlock.php index af3598a361..83644e392b 100644 --- a/src/system/Zikula/Module/AdminModule/Block/AdminnavBlock.php +++ b/src/system/AdminModule/Block/AdminnavBlock.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\AdminModule\Block; +namespace Zikula\AdminModule\Block; use Zikula_View; use SecurityUtil; diff --git a/src/system/Zikula/Module/AdminModule/Controller/AdminController.php b/src/system/AdminModule/Controller/AdminController.php similarity index 99% rename from src/system/Zikula/Module/AdminModule/Controller/AdminController.php rename to src/system/AdminModule/Controller/AdminController.php index f4678e74ae..2b347ff3b2 100644 --- a/src/system/Zikula/Module/AdminModule/Controller/AdminController.php +++ b/src/system/AdminModule/Controller/AdminController.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\AdminModule\Controller; +namespace Zikula\AdminModule\Controller; use Zikula_View; use ModUtil; @@ -396,7 +396,7 @@ public function adminpanelAction($acid = null) } } } - usort($adminlinks, 'Zikula\Module\AdminModule\Controller\AdminController::_sortAdminModsByOrder'); + usort($adminlinks, 'Zikula\AdminModule\Controller\AdminController::_sortAdminModsByOrder'); $this->view->assign('adminlinks', $adminlinks); return new Response($this->view->fetch('Admin/adminpanel.tpl')); @@ -519,7 +519,7 @@ public function updateconfigAction(Request $request) 'category' => $category)); if ($result == false) { - /** @var $cat \Zikula\Module\AdminModule\Entity\AdminCategoryEntity */ + /** @var $cat \Zikula\AdminModule\Entity\AdminCategoryEntity */ $cat = ModUtil::apiFunc($this->name, 'admin', 'getCategory', array('cid' => $category)); $request->getSession()->getFlashBag()->add('error', $this->__f('Error! Could not add module %1$s to module category %2$s.', array($adminmodule['name'], $cat->getName()))); } @@ -583,7 +583,7 @@ public function categorymenuAction($acid = null) } foreach ($adminlinks as &$item) { - usort($item, 'Zikula\Module\AdminModule\Controller\AdminController::_sortAdminModsByOrder'); + usort($item, 'Zikula\AdminModule\Controller\AdminController::_sortAdminModsByOrder'); } $menuoptions = array(); diff --git a/src/system/Zikula/Module/AdminModule/Controller/AjaxController.php b/src/system/AdminModule/Controller/AjaxController.php similarity index 99% rename from src/system/Zikula/Module/AdminModule/Controller/AjaxController.php rename to src/system/AdminModule/Controller/AjaxController.php index 3c0bc3a6f8..7e7a5559dd 100644 --- a/src/system/Zikula/Module/AdminModule/Controller/AjaxController.php +++ b/src/system/AdminModule/Controller/AjaxController.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\AdminModule\Controller; +namespace Zikula\AdminModule\Controller; use SecurityUtil; use ModUtil; diff --git a/src/system/Zikula/Module/AdminModule/DependencyInjection/ZikulaAdminExtension.php b/src/system/AdminModule/DependencyInjection/ZikulaAdminExtension.php similarity index 95% rename from src/system/Zikula/Module/AdminModule/DependencyInjection/ZikulaAdminExtension.php rename to src/system/AdminModule/DependencyInjection/ZikulaAdminExtension.php index a11bc3caf9..34944870c5 100644 --- a/src/system/Zikula/Module/AdminModule/DependencyInjection/ZikulaAdminExtension.php +++ b/src/system/AdminModule/DependencyInjection/ZikulaAdminExtension.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\AdminModule\DependencyInjection; +namespace Zikula\AdminModule\DependencyInjection; use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Loader\XmlFileLoader; diff --git a/src/system/Zikula/Module/AdminModule/Entity/AdminCategoryEntity.php b/src/system/AdminModule/Entity/AdminCategoryEntity.php similarity index 98% rename from src/system/Zikula/Module/AdminModule/Entity/AdminCategoryEntity.php rename to src/system/AdminModule/Entity/AdminCategoryEntity.php index d716b86fbf..4b9884ad01 100644 --- a/src/system/Zikula/Module/AdminModule/Entity/AdminCategoryEntity.php +++ b/src/system/AdminModule/Entity/AdminCategoryEntity.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\AdminModule\Entity; +namespace Zikula\AdminModule\Entity; use Doctrine\ORM\Mapping as ORM; use Zikula\Core\Doctrine\EntityAccess; diff --git a/src/system/Zikula/Module/AdminModule/Entity/AdminModuleEntity.php b/src/system/AdminModule/Entity/AdminModuleEntity.php similarity index 98% rename from src/system/Zikula/Module/AdminModule/Entity/AdminModuleEntity.php rename to src/system/AdminModule/Entity/AdminModuleEntity.php index 43850280b0..57c22449db 100644 --- a/src/system/Zikula/Module/AdminModule/Entity/AdminModuleEntity.php +++ b/src/system/AdminModule/Entity/AdminModuleEntity.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\AdminModule\Entity; +namespace Zikula\AdminModule\Entity; use Zikula\Core\Doctrine\EntityAccess; use Doctrine\ORM\Mapping as ORM; diff --git a/src/system/Zikula/Module/AdminModule/LICENSE b/src/system/AdminModule/LICENSE similarity index 100% rename from src/system/Zikula/Module/AdminModule/LICENSE rename to src/system/AdminModule/LICENSE diff --git a/src/system/Zikula/Module/AdminModule/Listener/ModuleEventListener.php b/src/system/AdminModule/Listener/ModuleEventListener.php similarity index 97% rename from src/system/Zikula/Module/AdminModule/Listener/ModuleEventListener.php rename to src/system/AdminModule/Listener/ModuleEventListener.php index 9cafb2a2fb..1a2b32e5f8 100644 --- a/src/system/Zikula/Module/AdminModule/Listener/ModuleEventListener.php +++ b/src/system/AdminModule/Listener/ModuleEventListener.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\AdminModule\Listener; +namespace Zikula\AdminModule\Listener; use ModUtil; use Symfony\Component\EventDispatcher\EventSubscriberInterface; diff --git a/src/system/Zikula/Module/AdminModule/README.md b/src/system/AdminModule/README.md similarity index 100% rename from src/system/Zikula/Module/AdminModule/README.md rename to src/system/AdminModule/README.md diff --git a/src/system/Zikula/Module/AdminModule/Resources/config/routing.yml b/src/system/AdminModule/Resources/config/routing.yml similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/config/routing.yml rename to src/system/AdminModule/Resources/config/routing.yml diff --git a/src/system/Zikula/Module/AdminModule/Resources/config/services.xml b/src/system/AdminModule/Resources/config/services.xml similarity index 89% rename from src/system/Zikula/Module/AdminModule/Resources/config/services.xml rename to src/system/AdminModule/Resources/config/services.xml index 5040b963d1..4196d2911d 100644 --- a/src/system/Zikula/Module/AdminModule/Resources/config/services.xml +++ b/src/system/AdminModule/Resources/config/services.xml @@ -5,7 +5,7 @@ xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"> - Zikula\Module\AdminModule\Listener\ModuleEventListener + Zikula\AdminModule\Listener\ModuleEventListener diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/css/admin.css b/src/system/AdminModule/Resources/public/css/admin.css similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/css/admin.css rename to src/system/AdminModule/Resources/public/css/admin.css diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/css/minitabs.css b/src/system/AdminModule/Resources/public/css/minitabs.css similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/css/minitabs.css rename to src/system/AdminModule/Resources/public/css/minitabs.css diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/css/mmenu-hiddenpanel-customwidth.css b/src/system/AdminModule/Resources/public/css/mmenu-hiddenpanel-customwidth.css similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/css/mmenu-hiddenpanel-customwidth.css rename to src/system/AdminModule/Resources/public/css/mmenu-hiddenpanel-customwidth.css diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/css/mmenu-hiddenpanel-customwidth.css.map b/src/system/AdminModule/Resources/public/css/mmenu-hiddenpanel-customwidth.css.map similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/css/mmenu-hiddenpanel-customwidth.css.map rename to src/system/AdminModule/Resources/public/css/mmenu-hiddenpanel-customwidth.css.map diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/css/mmenu-hiddenpanel-customwidth.scss b/src/system/AdminModule/Resources/public/css/mmenu-hiddenpanel-customwidth.scss similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/css/mmenu-hiddenpanel-customwidth.scss rename to src/system/AdminModule/Resources/public/css/mmenu-hiddenpanel-customwidth.scss diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/css/navtabs.css b/src/system/AdminModule/Resources/public/css/navtabs.css similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/css/navtabs.css rename to src/system/AdminModule/Resources/public/css/navtabs.css diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/css/style.css b/src/system/AdminModule/Resources/public/css/style.css similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/css/style.css rename to src/system/AdminModule/Resources/public/css/style.css diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/images/admin.png b/src/system/AdminModule/Resources/public/images/admin.png similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/images/admin.png rename to src/system/AdminModule/Resources/public/images/admin.png diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/images/button_bkg.gif b/src/system/AdminModule/Resources/public/images/button_bkg.gif similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/images/button_bkg.gif rename to src/system/AdminModule/Resources/public/images/button_bkg.gif diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/images/default.gif b/src/system/AdminModule/Resources/public/images/default.gif similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/images/default.gif rename to src/system/AdminModule/Resources/public/images/default.gif diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/images/mouse.png b/src/system/AdminModule/Resources/public/images/mouse.png similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/images/mouse.png rename to src/system/AdminModule/Resources/public/images/mouse.png diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/images/tab_bottom.gif b/src/system/AdminModule/Resources/public/images/tab_bottom.gif similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/images/tab_bottom.gif rename to src/system/AdminModule/Resources/public/images/tab_bottom.gif diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/admin_admin_admintabs.js b/src/system/AdminModule/Resources/public/js/admin_admin_admintabs.js similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/admin_admin_admintabs.js rename to src/system/AdminModule/Resources/public/js/admin_admin_admintabs.js diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/admin_admin_systemnotices.js b/src/system/AdminModule/Resources/public/js/admin_admin_systemnotices.js similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/admin_admin_systemnotices.js rename to src/system/AdminModule/Resources/public/js/admin_admin_systemnotices.js diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/.gitignore b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/.gitignore similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/.gitignore rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/.gitignore diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/Guardfile b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/Guardfile similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/Guardfile rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/Guardfile diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/README.md b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/README.md similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/README.md rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/README.md diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/bower.json b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/bower.json similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/bower.json rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/bower.json diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/composer.json b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/composer.json similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/composer.json rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/composer.json diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/demo/advanced.html b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/demo/advanced.html similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/demo/advanced.html rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/demo/advanced.html diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/demo/css/demo.css b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/demo/css/demo.css similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/demo/css/demo.css rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/demo/css/demo.css diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/demo/css/site.css b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/demo/css/site.css similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/demo/css/site.css rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/demo/css/site.css diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/demo/default.html b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/demo/default.html similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/demo/default.html rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/demo/default.html diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/demo/onepage.html b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/demo/onepage.html similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/demo/onepage.html rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/demo/onepage.html diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/addons/jquery.mmenu.autoheight.css b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/addons/jquery.mmenu.autoheight.css similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/addons/jquery.mmenu.autoheight.css rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/addons/jquery.mmenu.autoheight.css diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/addons/jquery.mmenu.buttonbars.css b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/addons/jquery.mmenu.buttonbars.css similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/addons/jquery.mmenu.buttonbars.css rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/addons/jquery.mmenu.buttonbars.css diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/addons/jquery.mmenu.counters.css b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/addons/jquery.mmenu.counters.css similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/addons/jquery.mmenu.counters.css rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/addons/jquery.mmenu.counters.css diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/addons/jquery.mmenu.dividers.css b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/addons/jquery.mmenu.dividers.css similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/addons/jquery.mmenu.dividers.css rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/addons/jquery.mmenu.dividers.css diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/addons/jquery.mmenu.dragopen.css b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/addons/jquery.mmenu.dragopen.css similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/addons/jquery.mmenu.dragopen.css rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/addons/jquery.mmenu.dragopen.css diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/addons/jquery.mmenu.footer.css b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/addons/jquery.mmenu.footer.css similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/addons/jquery.mmenu.footer.css rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/addons/jquery.mmenu.footer.css diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/addons/jquery.mmenu.header.css b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/addons/jquery.mmenu.header.css similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/addons/jquery.mmenu.header.css rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/addons/jquery.mmenu.header.css diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/addons/jquery.mmenu.height.css b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/addons/jquery.mmenu.height.css similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/addons/jquery.mmenu.height.css rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/addons/jquery.mmenu.height.css diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/addons/jquery.mmenu.offcanvas.css b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/addons/jquery.mmenu.offcanvas.css similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/addons/jquery.mmenu.offcanvas.css rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/addons/jquery.mmenu.offcanvas.css diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/addons/jquery.mmenu.searchfield.css b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/addons/jquery.mmenu.searchfield.css similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/addons/jquery.mmenu.searchfield.css rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/addons/jquery.mmenu.searchfield.css diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/addons/jquery.mmenu.sectionindexer.css b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/addons/jquery.mmenu.sectionindexer.css similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/addons/jquery.mmenu.sectionindexer.css rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/addons/jquery.mmenu.sectionindexer.css diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/addons/jquery.mmenu.toggles.css b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/addons/jquery.mmenu.toggles.css similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/addons/jquery.mmenu.toggles.css rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/addons/jquery.mmenu.toggles.css diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/extensions/jquery.mmenu.borderstyle.css b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/extensions/jquery.mmenu.borderstyle.css similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/extensions/jquery.mmenu.borderstyle.css rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/extensions/jquery.mmenu.borderstyle.css diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/extensions/jquery.mmenu.effects.css b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/extensions/jquery.mmenu.effects.css similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/extensions/jquery.mmenu.effects.css rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/extensions/jquery.mmenu.effects.css diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/extensions/jquery.mmenu.fullscreen.css b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/extensions/jquery.mmenu.fullscreen.css similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/extensions/jquery.mmenu.fullscreen.css rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/extensions/jquery.mmenu.fullscreen.css diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/extensions/jquery.mmenu.iconbar.css b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/extensions/jquery.mmenu.iconbar.css similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/extensions/jquery.mmenu.iconbar.css rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/extensions/jquery.mmenu.iconbar.css diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/extensions/jquery.mmenu.multiline.css b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/extensions/jquery.mmenu.multiline.css similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/extensions/jquery.mmenu.multiline.css rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/extensions/jquery.mmenu.multiline.css diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/extensions/jquery.mmenu.pageshadow.css b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/extensions/jquery.mmenu.pageshadow.css similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/extensions/jquery.mmenu.pageshadow.css rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/extensions/jquery.mmenu.pageshadow.css diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/extensions/jquery.mmenu.positioning.css b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/extensions/jquery.mmenu.positioning.css similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/extensions/jquery.mmenu.positioning.css rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/extensions/jquery.mmenu.positioning.css diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/extensions/jquery.mmenu.themes.css b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/extensions/jquery.mmenu.themes.css similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/extensions/jquery.mmenu.themes.css rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/extensions/jquery.mmenu.themes.css diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/extensions/jquery.mmenu.widescreen.css b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/extensions/jquery.mmenu.widescreen.css similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/extensions/jquery.mmenu.widescreen.css rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/extensions/jquery.mmenu.widescreen.css diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/jquery.mmenu.all.css b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/jquery.mmenu.all.css similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/jquery.mmenu.all.css rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/jquery.mmenu.all.css diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/jquery.mmenu.css b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/jquery.mmenu.css similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/jquery.mmenu.css rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/jquery.mmenu.css diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/jquery.mmenu.oncanvas.css b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/jquery.mmenu.oncanvas.css similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/jquery.mmenu.oncanvas.css rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/css/jquery.mmenu.oncanvas.css diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js/addons/jquery.mmenu.autoheight.min.js b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js/addons/jquery.mmenu.autoheight.min.js similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js/addons/jquery.mmenu.autoheight.min.js rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js/addons/jquery.mmenu.autoheight.min.js diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js/addons/jquery.mmenu.backbutton.min.js b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js/addons/jquery.mmenu.backbutton.min.js similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js/addons/jquery.mmenu.backbutton.min.js rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js/addons/jquery.mmenu.backbutton.min.js diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js/addons/jquery.mmenu.buttonbars.min.js b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js/addons/jquery.mmenu.buttonbars.min.js similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js/addons/jquery.mmenu.buttonbars.min.js rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js/addons/jquery.mmenu.buttonbars.min.js diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js/addons/jquery.mmenu.counters.min.js b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js/addons/jquery.mmenu.counters.min.js similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js/addons/jquery.mmenu.counters.min.js rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js/addons/jquery.mmenu.counters.min.js diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js/addons/jquery.mmenu.dividers.min.js b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js/addons/jquery.mmenu.dividers.min.js similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js/addons/jquery.mmenu.dividers.min.js rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js/addons/jquery.mmenu.dividers.min.js diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js/addons/jquery.mmenu.dragopen.min.js b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js/addons/jquery.mmenu.dragopen.min.js similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js/addons/jquery.mmenu.dragopen.min.js rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js/addons/jquery.mmenu.dragopen.min.js diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js/addons/jquery.mmenu.fixedelements.min.js b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js/addons/jquery.mmenu.fixedelements.min.js similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js/addons/jquery.mmenu.fixedelements.min.js rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js/addons/jquery.mmenu.fixedelements.min.js diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js/addons/jquery.mmenu.footer.min.js b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js/addons/jquery.mmenu.footer.min.js similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js/addons/jquery.mmenu.footer.min.js rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js/addons/jquery.mmenu.footer.min.js diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js/addons/jquery.mmenu.header.min.js b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js/addons/jquery.mmenu.header.min.js similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js/addons/jquery.mmenu.header.min.js rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js/addons/jquery.mmenu.header.min.js diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js/addons/jquery.mmenu.offcanvas.min.js b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js/addons/jquery.mmenu.offcanvas.min.js similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js/addons/jquery.mmenu.offcanvas.min.js rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js/addons/jquery.mmenu.offcanvas.min.js diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js/addons/jquery.mmenu.searchfield.min.js b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js/addons/jquery.mmenu.searchfield.min.js similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js/addons/jquery.mmenu.searchfield.min.js rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js/addons/jquery.mmenu.searchfield.min.js diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js/addons/jquery.mmenu.sectionindexer.min.js b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js/addons/jquery.mmenu.sectionindexer.min.js similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js/addons/jquery.mmenu.sectionindexer.min.js rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js/addons/jquery.mmenu.sectionindexer.min.js diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js/addons/jquery.mmenu.toggles.min.js b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js/addons/jquery.mmenu.toggles.min.js similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js/addons/jquery.mmenu.toggles.min.js rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js/addons/jquery.mmenu.toggles.min.js diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js/jquery.mmenu.min.all.js b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js/jquery.mmenu.min.all.js similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js/jquery.mmenu.min.all.js rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js/jquery.mmenu.min.all.js diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js/jquery.mmenu.min.js b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js/jquery.mmenu.min.js similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js/jquery.mmenu.min.js rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js/jquery.mmenu.min.js diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js/jquery.mmenu.oncanvas.min.js b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js/jquery.mmenu.oncanvas.min.js similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js/jquery.mmenu.oncanvas.min.js rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js/jquery.mmenu.oncanvas.min.js diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js_umd/_inc/affix.js b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js_umd/_inc/affix.js similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js_umd/_inc/affix.js rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js_umd/_inc/affix.js diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js_umd/_inc/prefix.js b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js_umd/_inc/prefix.js similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js_umd/_inc/prefix.js rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js_umd/_inc/prefix.js diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js_umd/addons/jquery.mmenu.autoheight.umd.js b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js_umd/addons/jquery.mmenu.autoheight.umd.js similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js_umd/addons/jquery.mmenu.autoheight.umd.js rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js_umd/addons/jquery.mmenu.autoheight.umd.js diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js_umd/addons/jquery.mmenu.backbutton.umd.js b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js_umd/addons/jquery.mmenu.backbutton.umd.js similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js_umd/addons/jquery.mmenu.backbutton.umd.js rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js_umd/addons/jquery.mmenu.backbutton.umd.js diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js_umd/addons/jquery.mmenu.buttonbars.umd.js b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js_umd/addons/jquery.mmenu.buttonbars.umd.js similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js_umd/addons/jquery.mmenu.buttonbars.umd.js rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js_umd/addons/jquery.mmenu.buttonbars.umd.js diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js_umd/addons/jquery.mmenu.counters.umd.js b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js_umd/addons/jquery.mmenu.counters.umd.js similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js_umd/addons/jquery.mmenu.counters.umd.js rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js_umd/addons/jquery.mmenu.counters.umd.js diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js_umd/addons/jquery.mmenu.dividers.umd.js b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js_umd/addons/jquery.mmenu.dividers.umd.js similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js_umd/addons/jquery.mmenu.dividers.umd.js rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js_umd/addons/jquery.mmenu.dividers.umd.js diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js_umd/addons/jquery.mmenu.dragopen.umd.js b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js_umd/addons/jquery.mmenu.dragopen.umd.js similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js_umd/addons/jquery.mmenu.dragopen.umd.js rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js_umd/addons/jquery.mmenu.dragopen.umd.js diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js_umd/addons/jquery.mmenu.fixedelements.umd.js b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js_umd/addons/jquery.mmenu.fixedelements.umd.js similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js_umd/addons/jquery.mmenu.fixedelements.umd.js rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js_umd/addons/jquery.mmenu.fixedelements.umd.js diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js_umd/addons/jquery.mmenu.footer.umd.js b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js_umd/addons/jquery.mmenu.footer.umd.js similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js_umd/addons/jquery.mmenu.footer.umd.js rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js_umd/addons/jquery.mmenu.footer.umd.js diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js_umd/addons/jquery.mmenu.header.umd.js b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js_umd/addons/jquery.mmenu.header.umd.js similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js_umd/addons/jquery.mmenu.header.umd.js rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js_umd/addons/jquery.mmenu.header.umd.js diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js_umd/addons/jquery.mmenu.offcanvas.umd.js b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js_umd/addons/jquery.mmenu.offcanvas.umd.js similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js_umd/addons/jquery.mmenu.offcanvas.umd.js rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js_umd/addons/jquery.mmenu.offcanvas.umd.js diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js_umd/addons/jquery.mmenu.searchfield.umd.js b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js_umd/addons/jquery.mmenu.searchfield.umd.js similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js_umd/addons/jquery.mmenu.searchfield.umd.js rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js_umd/addons/jquery.mmenu.searchfield.umd.js diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js_umd/addons/jquery.mmenu.toggles.umd.js b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js_umd/addons/jquery.mmenu.toggles.umd.js similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js_umd/addons/jquery.mmenu.toggles.umd.js rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js_umd/addons/jquery.mmenu.toggles.umd.js diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js_umd/jquery.mmenu.oncanvas.umd.js b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js_umd/jquery.mmenu.oncanvas.umd.js similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js_umd/jquery.mmenu.oncanvas.umd.js rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js_umd/jquery.mmenu.oncanvas.umd.js diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js_umd/jquery.mmenu.umd.all.js b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js_umd/jquery.mmenu.umd.all.js similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js_umd/jquery.mmenu.umd.all.js rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js_umd/jquery.mmenu.umd.all.js diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js_umd/jquery.mmenu.umd.js b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js_umd/jquery.mmenu.umd.js similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js_umd/jquery.mmenu.umd.js rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/dist/js_umd/jquery.mmenu.umd.js diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/index.html b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/index.html similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/index.html rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/index.html diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/mmenu.jquery.json b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/mmenu.jquery.json similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/mmenu.jquery.json rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/mmenu.jquery.json diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/package.json b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/package.json similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/package.json rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/package.json diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/src/js/addons/addon-template.js b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/src/js/addons/addon-template.js similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/src/js/addons/addon-template.js rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/src/js/addons/addon-template.js diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/src/js/addons/jquery.mmenu.autoheight.js b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/src/js/addons/jquery.mmenu.autoheight.js similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/src/js/addons/jquery.mmenu.autoheight.js rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/src/js/addons/jquery.mmenu.autoheight.js diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/src/js/addons/jquery.mmenu.backbutton.js b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/src/js/addons/jquery.mmenu.backbutton.js similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/src/js/addons/jquery.mmenu.backbutton.js rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/src/js/addons/jquery.mmenu.backbutton.js diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/src/js/addons/jquery.mmenu.buttonbars.js b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/src/js/addons/jquery.mmenu.buttonbars.js similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/src/js/addons/jquery.mmenu.buttonbars.js rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/src/js/addons/jquery.mmenu.buttonbars.js diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/src/js/addons/jquery.mmenu.counters.js b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/src/js/addons/jquery.mmenu.counters.js similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/src/js/addons/jquery.mmenu.counters.js rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/src/js/addons/jquery.mmenu.counters.js diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/src/js/addons/jquery.mmenu.dividers.js b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/src/js/addons/jquery.mmenu.dividers.js similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/src/js/addons/jquery.mmenu.dividers.js rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/src/js/addons/jquery.mmenu.dividers.js diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/src/js/addons/jquery.mmenu.dragopen.js b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/src/js/addons/jquery.mmenu.dragopen.js similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/src/js/addons/jquery.mmenu.dragopen.js rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/src/js/addons/jquery.mmenu.dragopen.js diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/src/js/addons/jquery.mmenu.fixedelements.js b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/src/js/addons/jquery.mmenu.fixedelements.js similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/src/js/addons/jquery.mmenu.fixedelements.js rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/src/js/addons/jquery.mmenu.fixedelements.js diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/src/js/addons/jquery.mmenu.footer.js b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/src/js/addons/jquery.mmenu.footer.js similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/src/js/addons/jquery.mmenu.footer.js rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/src/js/addons/jquery.mmenu.footer.js diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/src/js/addons/jquery.mmenu.header.js b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/src/js/addons/jquery.mmenu.header.js similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/src/js/addons/jquery.mmenu.header.js rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/src/js/addons/jquery.mmenu.header.js diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/src/js/addons/jquery.mmenu.offcanvas.js b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/src/js/addons/jquery.mmenu.offcanvas.js similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/src/js/addons/jquery.mmenu.offcanvas.js rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/src/js/addons/jquery.mmenu.offcanvas.js diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/src/js/addons/jquery.mmenu.searchfield.js b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/src/js/addons/jquery.mmenu.searchfield.js similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/src/js/addons/jquery.mmenu.searchfield.js rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/src/js/addons/jquery.mmenu.searchfield.js diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/src/js/addons/jquery.mmenu.sectionindexer.js b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/src/js/addons/jquery.mmenu.sectionindexer.js similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/src/js/addons/jquery.mmenu.sectionindexer.js rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/src/js/addons/jquery.mmenu.sectionindexer.js diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/src/js/addons/jquery.mmenu.toggles.js b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/src/js/addons/jquery.mmenu.toggles.js similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/src/js/addons/jquery.mmenu.toggles.js rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/src/js/addons/jquery.mmenu.toggles.js diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/src/js/jquery.mmenu.debugger.js b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/src/js/jquery.mmenu.debugger.js similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/src/js/jquery.mmenu.debugger.js rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/src/js/jquery.mmenu.debugger.js diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/src/js/jquery.mmenu.js b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/src/js/jquery.mmenu.js similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/src/js/jquery.mmenu.js rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/src/js/jquery.mmenu.js diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/src/js/jquery.mmenu.oncanvas.js b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/src/js/jquery.mmenu.oncanvas.js similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/src/js/jquery.mmenu.oncanvas.js rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/src/js/jquery.mmenu.oncanvas.js diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/_inc/_colors.scss b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/_inc/_colors.scss similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/_inc/_colors.scss rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/_inc/_colors.scss diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/_inc/_mixins.scss b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/_inc/_mixins.scss similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/_inc/_mixins.scss rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/_inc/_mixins.scss diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/_inc/_sizing.scss b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/_inc/_sizing.scss similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/_inc/_sizing.scss rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/_inc/_sizing.scss diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/_inc/_variables.scss b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/_inc/_variables.scss similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/_inc/_variables.scss rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/_inc/_variables.scss diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/addons/jquery.mmenu.autoheight.scss b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/addons/jquery.mmenu.autoheight.scss similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/addons/jquery.mmenu.autoheight.scss rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/addons/jquery.mmenu.autoheight.scss diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/addons/jquery.mmenu.buttonbars.scss b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/addons/jquery.mmenu.buttonbars.scss similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/addons/jquery.mmenu.buttonbars.scss rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/addons/jquery.mmenu.buttonbars.scss diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/addons/jquery.mmenu.counters.scss b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/addons/jquery.mmenu.counters.scss similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/addons/jquery.mmenu.counters.scss rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/addons/jquery.mmenu.counters.scss diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/addons/jquery.mmenu.dividers.scss b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/addons/jquery.mmenu.dividers.scss similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/addons/jquery.mmenu.dividers.scss rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/addons/jquery.mmenu.dividers.scss diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/addons/jquery.mmenu.dragopen.scss b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/addons/jquery.mmenu.dragopen.scss similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/addons/jquery.mmenu.dragopen.scss rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/addons/jquery.mmenu.dragopen.scss diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/addons/jquery.mmenu.footer.scss b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/addons/jquery.mmenu.footer.scss similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/addons/jquery.mmenu.footer.scss rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/addons/jquery.mmenu.footer.scss diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/addons/jquery.mmenu.header.scss b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/addons/jquery.mmenu.header.scss similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/addons/jquery.mmenu.header.scss rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/addons/jquery.mmenu.header.scss diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/addons/jquery.mmenu.offcanvas.scss b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/addons/jquery.mmenu.offcanvas.scss similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/addons/jquery.mmenu.offcanvas.scss rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/addons/jquery.mmenu.offcanvas.scss diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/addons/jquery.mmenu.searchfield.scss b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/addons/jquery.mmenu.searchfield.scss similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/addons/jquery.mmenu.searchfield.scss rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/addons/jquery.mmenu.searchfield.scss diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/addons/jquery.mmenu.sectionindexer.scss b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/addons/jquery.mmenu.sectionindexer.scss similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/addons/jquery.mmenu.sectionindexer.scss rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/addons/jquery.mmenu.sectionindexer.scss diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/addons/jquery.mmenu.toggles.scss b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/addons/jquery.mmenu.toggles.scss similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/addons/jquery.mmenu.toggles.scss rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/addons/jquery.mmenu.toggles.scss diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/extensions/jquery.mmenu.borderstyle.scss b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/extensions/jquery.mmenu.borderstyle.scss similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/extensions/jquery.mmenu.borderstyle.scss rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/extensions/jquery.mmenu.borderstyle.scss diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/extensions/jquery.mmenu.effects.scss b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/extensions/jquery.mmenu.effects.scss similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/extensions/jquery.mmenu.effects.scss rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/extensions/jquery.mmenu.effects.scss diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/extensions/jquery.mmenu.fullscreen.scss b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/extensions/jquery.mmenu.fullscreen.scss similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/extensions/jquery.mmenu.fullscreen.scss rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/extensions/jquery.mmenu.fullscreen.scss diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/extensions/jquery.mmenu.iconbar.scss b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/extensions/jquery.mmenu.iconbar.scss similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/extensions/jquery.mmenu.iconbar.scss rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/extensions/jquery.mmenu.iconbar.scss diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/extensions/jquery.mmenu.multiline.scss b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/extensions/jquery.mmenu.multiline.scss similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/extensions/jquery.mmenu.multiline.scss rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/extensions/jquery.mmenu.multiline.scss diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/extensions/jquery.mmenu.pageshadow.scss b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/extensions/jquery.mmenu.pageshadow.scss similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/extensions/jquery.mmenu.pageshadow.scss rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/extensions/jquery.mmenu.pageshadow.scss diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/extensions/jquery.mmenu.positioning.scss b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/extensions/jquery.mmenu.positioning.scss similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/extensions/jquery.mmenu.positioning.scss rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/extensions/jquery.mmenu.positioning.scss diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/extensions/jquery.mmenu.themes.scss b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/extensions/jquery.mmenu.themes.scss similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/extensions/jquery.mmenu.themes.scss rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/extensions/jquery.mmenu.themes.scss diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/extensions/jquery.mmenu.widescreen.scss b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/extensions/jquery.mmenu.widescreen.scss similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/extensions/jquery.mmenu.widescreen.scss rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/extensions/jquery.mmenu.widescreen.scss diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/jquery.mmenu.all.scss b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/jquery.mmenu.all.scss similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/jquery.mmenu.all.scss rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/jquery.mmenu.all.scss diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/jquery.mmenu.oncanvas.scss b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/jquery.mmenu.oncanvas.scss similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/jquery.mmenu.oncanvas.scss rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/jquery.mmenu.oncanvas.scss diff --git a/src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/jquery.mmenu.scss b/src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/jquery.mmenu.scss similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/jquery.mmenu.scss rename to src/system/AdminModule/Resources/public/js/jQuery.mmenu-master/src/scss/jquery.mmenu.scss diff --git a/src/system/Zikula/Module/AdminModule/Resources/views/Admin/adminpanel.tpl b/src/system/AdminModule/Resources/views/Admin/adminpanel.tpl similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/views/Admin/adminpanel.tpl rename to src/system/AdminModule/Resources/views/Admin/adminpanel.tpl diff --git a/src/system/Zikula/Module/AdminModule/Resources/views/Admin/admintabs.tpl b/src/system/AdminModule/Resources/views/Admin/admintabs.tpl similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/views/Admin/admintabs.tpl rename to src/system/AdminModule/Resources/views/Admin/admintabs.tpl diff --git a/src/system/Zikula/Module/AdminModule/Resources/views/Admin/ajaxAddCategory.tpl b/src/system/AdminModule/Resources/views/Admin/ajaxAddCategory.tpl similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/views/Admin/ajaxAddCategory.tpl rename to src/system/AdminModule/Resources/views/Admin/ajaxAddCategory.tpl diff --git a/src/system/Zikula/Module/AdminModule/Resources/views/Admin/breadcrumbs.tpl b/src/system/AdminModule/Resources/views/Admin/breadcrumbs.tpl similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/views/Admin/breadcrumbs.tpl rename to src/system/AdminModule/Resources/views/Admin/breadcrumbs.tpl diff --git a/src/system/Zikula/Module/AdminModule/Resources/views/Admin/categorymenu.tpl b/src/system/AdminModule/Resources/views/Admin/categorymenu.tpl similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/views/Admin/categorymenu.tpl rename to src/system/AdminModule/Resources/views/Admin/categorymenu.tpl diff --git a/src/system/Zikula/Module/AdminModule/Resources/views/Admin/delete.tpl b/src/system/AdminModule/Resources/views/Admin/delete.tpl similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/views/Admin/delete.tpl rename to src/system/AdminModule/Resources/views/Admin/delete.tpl diff --git a/src/system/Zikula/Module/AdminModule/Resources/views/Admin/developernotices.tpl b/src/system/AdminModule/Resources/views/Admin/developernotices.tpl similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/views/Admin/developernotices.tpl rename to src/system/AdminModule/Resources/views/Admin/developernotices.tpl diff --git a/src/system/Zikula/Module/AdminModule/Resources/views/Admin/footer.tpl b/src/system/AdminModule/Resources/views/Admin/footer.tpl similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/views/Admin/footer.tpl rename to src/system/AdminModule/Resources/views/Admin/footer.tpl diff --git a/src/system/Zikula/Module/AdminModule/Resources/views/Admin/header.tpl b/src/system/AdminModule/Resources/views/Admin/header.tpl similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/views/Admin/header.tpl rename to src/system/AdminModule/Resources/views/Admin/header.tpl diff --git a/src/system/Zikula/Module/AdminModule/Resources/views/Admin/help.tpl b/src/system/AdminModule/Resources/views/Admin/help.tpl similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/views/Admin/help.tpl rename to src/system/AdminModule/Resources/views/Admin/help.tpl diff --git a/src/system/Zikula/Module/AdminModule/Resources/views/Admin/modify.tpl b/src/system/AdminModule/Resources/views/Admin/modify.tpl similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/views/Admin/modify.tpl rename to src/system/AdminModule/Resources/views/Admin/modify.tpl diff --git a/src/system/Zikula/Module/AdminModule/Resources/views/Admin/modifyconfig.tpl b/src/system/AdminModule/Resources/views/Admin/modifyconfig.tpl similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/views/Admin/modifyconfig.tpl rename to src/system/AdminModule/Resources/views/Admin/modifyconfig.tpl diff --git a/src/system/Zikula/Module/AdminModule/Resources/views/Admin/newcat.tpl b/src/system/AdminModule/Resources/views/Admin/newcat.tpl similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/views/Admin/newcat.tpl rename to src/system/AdminModule/Resources/views/Admin/newcat.tpl diff --git a/src/system/Zikula/Module/AdminModule/Resources/views/Admin/securityanalyzer.tpl b/src/system/AdminModule/Resources/views/Admin/securityanalyzer.tpl similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/views/Admin/securityanalyzer.tpl rename to src/system/AdminModule/Resources/views/Admin/securityanalyzer.tpl diff --git a/src/system/Zikula/Module/AdminModule/Resources/views/Admin/systemnotices.tpl b/src/system/AdminModule/Resources/views/Admin/systemnotices.tpl similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/views/Admin/systemnotices.tpl rename to src/system/AdminModule/Resources/views/Admin/systemnotices.tpl diff --git a/src/system/Zikula/Module/AdminModule/Resources/views/Admin/updatechecker.tpl b/src/system/AdminModule/Resources/views/Admin/updatechecker.tpl similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/views/Admin/updatechecker.tpl rename to src/system/AdminModule/Resources/views/Admin/updatechecker.tpl diff --git a/src/system/Zikula/Module/AdminModule/Resources/views/Admin/view.tpl b/src/system/AdminModule/Resources/views/Admin/view.tpl similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/views/Admin/view.tpl rename to src/system/AdminModule/Resources/views/Admin/view.tpl diff --git a/src/system/Zikula/Module/AdminModule/Resources/views/Admin/warning.tpl b/src/system/AdminModule/Resources/views/Admin/warning.tpl similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/views/Admin/warning.tpl rename to src/system/AdminModule/Resources/views/Admin/warning.tpl diff --git a/src/system/Zikula/Module/AdminModule/Resources/views/Block/adminnav.tpl b/src/system/AdminModule/Resources/views/Block/adminnav.tpl similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/views/Block/adminnav.tpl rename to src/system/AdminModule/Resources/views/Block/adminnav.tpl diff --git a/src/system/Zikula/Module/AdminModule/Resources/views/plugins/function.admincategorymenu.php b/src/system/AdminModule/Resources/views/plugins/function.admincategorymenu.php similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/views/plugins/function.admincategorymenu.php rename to src/system/AdminModule/Resources/views/plugins/function.admincategorymenu.php diff --git a/src/system/Zikula/Module/AdminModule/Resources/views/plugins/function.adminfooter.php b/src/system/AdminModule/Resources/views/plugins/function.adminfooter.php similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/views/plugins/function.adminfooter.php rename to src/system/AdminModule/Resources/views/plugins/function.adminfooter.php diff --git a/src/system/Zikula/Module/AdminModule/Resources/views/plugins/function.adminheader.php b/src/system/AdminModule/Resources/views/plugins/function.adminheader.php similarity index 100% rename from src/system/Zikula/Module/AdminModule/Resources/views/plugins/function.adminheader.php rename to src/system/AdminModule/Resources/views/plugins/function.adminheader.php diff --git a/src/system/Zikula/Module/AdminModule/ZikulaAdminModule.php b/src/system/AdminModule/ZikulaAdminModule.php similarity index 94% rename from src/system/Zikula/Module/AdminModule/ZikulaAdminModule.php rename to src/system/AdminModule/ZikulaAdminModule.php index 992265687e..a951ed8a96 100644 --- a/src/system/Zikula/Module/AdminModule/ZikulaAdminModule.php +++ b/src/system/AdminModule/ZikulaAdminModule.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\AdminModule; +namespace Zikula\AdminModule; use Zikula\Bundle\CoreBundle\Bundle\AbstractCoreModule; diff --git a/src/system/Zikula/Module/AdminModule/composer.json b/src/system/AdminModule/composer.json similarity index 75% rename from src/system/Zikula/Module/AdminModule/composer.json rename to src/system/AdminModule/composer.json index f12585c813..08fb97b28a 100644 --- a/src/system/Zikula/Module/AdminModule/composer.json +++ b/src/system/AdminModule/composer.json @@ -10,14 +10,14 @@ } ], "autoload": { - "psr-0": { "Zikula\\Module\\AdminModule\\": "" } + "psr-4": { "Zikula\\AdminModule\\": "" } }, "require": { "php": ">5.4.0" }, "extra": { "zikula": { - "class": "Zikula\\Module\\AdminModule\\ZikulaAdminModule" + "class": "Zikula\\AdminModule\\ZikulaAdminModule" } } } diff --git a/src/system/Zikula/Module/AdminModule/phpunit.xml.dist b/src/system/AdminModule/phpunit.xml.dist similarity index 100% rename from src/system/Zikula/Module/AdminModule/phpunit.xml.dist rename to src/system/AdminModule/phpunit.xml.dist diff --git a/src/system/Zikula/Module/AdminModule/tables.php b/src/system/AdminModule/tables.php similarity index 100% rename from src/system/Zikula/Module/AdminModule/tables.php rename to src/system/AdminModule/tables.php From 265036c5073b96ed49e4f366d16e81451ff2b95a Mon Sep 17 00:00:00 2001 From: Craig Heydenburg Date: Sun, 16 Aug 2015 17:49:35 -0400 Subject: [PATCH 03/35] convert BlocksModule to psr-4 --- composer.json | 3 ++- src/app/ZikulaKernel.php | 2 +- .../Controller/AjaxInstallController.php | 2 +- src/lib/util/BlockUtil.php | 2 +- .../{Zikula/Module => }/BlocksModule/.gitignore | 0 .../{Zikula/Module => }/BlocksModule/.travis.yml | 0 .../Module => }/BlocksModule/Api/AdminApi.php | 14 +++++++------- .../Module => }/BlocksModule/Api/MenutreeApi.php | 4 ++-- .../Module => }/BlocksModule/Api/UserApi.php | 2 +- .../BlocksModule/Block/ExtmenuBlock.php | 2 +- .../BlocksModule/Block/FincludeBlock.php | 2 +- .../Module => }/BlocksModule/Block/HtmlBlock.php | 2 +- .../Module => }/BlocksModule/Block/LangBlock.php | 2 +- .../Module => }/BlocksModule/Block/MenuBlock.php | 2 +- .../BlocksModule/Block/MenutreeBlock.php | 8 ++++---- .../BlocksModule/Block/PendingContentBlock.php | 2 +- .../Module => }/BlocksModule/Block/TextBlock.php | 2 +- .../Module => }/BlocksModule/Block/XsltBlock.php | 2 +- .../BlocksModule/BlocksModuleInstaller.php | 12 ++++++------ .../BlocksModule/BlocksModuleVersion.php | 2 +- .../BlocksModule/Controller/AdminController.php | 2 +- .../BlocksModule/Controller/AjaxController.php | 4 ++-- .../BlocksModule/Controller/UserController.php | 2 +- .../BlocksModule/Entity/BlockEntity.php | 2 +- .../BlocksModule/Entity/BlockPlacementEntity.php | 2 +- .../BlocksModule/Entity/BlockPositionEntity.php | 2 +- .../BlocksModule/Entity/UserBlockEntity.php | 2 +- .../{Zikula/Module => }/BlocksModule/LICENSE | 0 .../Module => }/BlocksModule/MenutreeTree.php | 2 +- .../Module => }/BlocksModule/MenutreeUtil.php | 2 +- .../{Zikula/Module => }/BlocksModule/README.md | 0 .../BlocksModule/Resources/config/routing.yml | 0 .../BlocksModule/Resources/public/css/arrows.css | 0 .../BlocksModule/Resources/public/css/extmenu.css | 0 .../Resources/public/css/extmenu_modify.css | 0 .../BlocksModule/Resources/public/css/menu.css | 0 .../Resources/public/css/menutree/adminstyle.css | 0 .../Resources/public/css/menutree/contextmenu.css | 0 .../Resources/public/css/menutree/horizontal.css | 0 .../public/css/menutree/vertical_left.css | 0 .../public/css/menutree/vertical_right.css | 0 .../Resources/public/css/rollover.css | 0 .../BlocksModule/Resources/public/css/style.css | 0 .../Resources/public/images/admin.png | Bin .../Resources/public/images/arrow.gif | Bin .../Resources/public/images/menutree/filenew.png | Bin .../Resources/public/images/menutree/folder.png | Bin .../public/images/menutree/folder_open.png | Bin .../Resources/public/images/menutree/lnode.gif | Bin .../public/images/menutree/menu/after.png | Bin .../public/images/menutree/menu/all-off.png | Bin .../public/images/menutree/menu/all-on.png | Bin .../public/images/menutree/menu/all-onoff.png | Bin .../public/images/menutree/menu/aschild.png | Bin .../public/images/menutree/menu/before.png | Bin .../public/images/menutree/menu/collapse.png | Bin .../public/images/menutree/menu/expand.png | Bin .../public/images/menutree/menu/folder_add.png | Bin .../public/images/menutree/menu/folder_delete.png | Bin .../public/images/menutree/menu/folder_edit.png | Bin .../public/images/menutree/menu/folder_off.png | Bin .../public/images/menutree/menu/folder_on.png | Bin .../public/images/menutree/menu/withc-hover.gif | Bin .../public/images/menutree/menu/withc.gif | Bin .../Resources/public/images/menutree/minus.gif | Bin .../Resources/public/images/menutree/node.gif | Bin .../Resources/public/images/menutree/pion.gif | Bin .../Resources/public/images/menutree/plus.gif | Bin .../public/js/Zikula.Blocks.Admin.Common.js | 0 .../js/Zikula.Blocks.Admin.Modifyposition.js | 0 .../Resources/public/js/Zikula.Menutree.Tree.js | 0 .../Resources/public/js/contextmenu.js | 0 .../BlocksModule/Resources/public/js/functions.js | 0 .../BlocksModule/Resources/views/Admin/delete.tpl | 0 .../Resources/views/Admin/deleteposition.tpl | 0 .../BlocksModule/Resources/views/Admin/modify.tpl | 0 .../Resources/views/Admin/modifyconfig.tpl | 0 .../Resources/views/Admin/modifyposition.tpl | 0 .../Resources/views/Admin/newblock.tpl | 0 .../Resources/views/Admin/newposition.tpl | 0 .../BlocksModule/Resources/views/Admin/view.tpl | 0 .../Resources/views/Block/Extmenu/bootstrap.tpl | 0 .../Resources/views/Block/Extmenu/extmenu.tpl | 0 .../Resources/views/Block/Extmenu/modify.tpl | 0 .../Resources/views/Block/Extmenu/topnav.tpl | 0 .../Resources/views/Block/Menutree/bootstrap.tpl | 0 .../views/Block/Menutree/bs_hamburger.tpl | 0 .../Resources/views/Block/Menutree/default.tpl | 0 .../Resources/views/Block/Menutree/help.tpl | 0 .../Resources/views/Block/Menutree/horizontal.tpl | 0 .../Resources/views/Block/Menutree/modify.tpl | 0 .../Resources/views/Block/Menutree/tree.tpl | 0 .../views/Block/Menutree/vertical_left.tpl | 0 .../views/Block/Menutree/vertical_right.tpl | 0 .../Resources/views/Block/finclude_modify.tpl | 0 .../BlocksModule/Resources/views/Block/menu.tpl | 0 .../Resources/views/Block/menu_modify.tpl | 0 .../Resources/views/Block/pendingcontent.tpl | 0 .../Resources/views/Block/thelang.tpl | 0 .../Resources/views/Block/thelang_modify.tpl | 0 .../Resources/views/Block/xslt_modify.tpl | 0 .../BlocksModule/Resources/views/User/display.tpl | 0 .../Resources/views/plugins/block.menu.php | 0 .../Resources/views/plugins/function.menutree.php | 0 .../BlocksModule/ZikulaBlocksModule.php | 2 +- .../Module => }/BlocksModule/composer.json | 4 ++-- .../Module => }/BlocksModule/phpunit.xml.dist | 0 .../{Zikula/Module => }/BlocksModule/tables.php | 0 108 files changed, 47 insertions(+), 46 deletions(-) rename src/system/{Zikula/Module => }/BlocksModule/.gitignore (100%) rename src/system/{Zikula/Module => }/BlocksModule/.travis.yml (100%) rename src/system/{Zikula/Module => }/BlocksModule/Api/AdminApi.php (97%) rename src/system/{Zikula/Module => }/BlocksModule/Api/MenutreeApi.php (99%) rename src/system/{Zikula/Module => }/BlocksModule/Api/UserApi.php (99%) rename src/system/{Zikula/Module => }/BlocksModule/Block/ExtmenuBlock.php (99%) rename src/system/{Zikula/Module => }/BlocksModule/Block/FincludeBlock.php (99%) rename src/system/{Zikula/Module => }/BlocksModule/Block/HtmlBlock.php (97%) rename src/system/{Zikula/Module => }/BlocksModule/Block/LangBlock.php (99%) rename src/system/{Zikula/Module => }/BlocksModule/Block/MenuBlock.php (99%) rename src/system/{Zikula/Module => }/BlocksModule/Block/MenutreeBlock.php (99%) rename src/system/{Zikula/Module => }/BlocksModule/Block/PendingContentBlock.php (98%) rename src/system/{Zikula/Module => }/BlocksModule/Block/TextBlock.php (97%) rename src/system/{Zikula/Module => }/BlocksModule/Block/XsltBlock.php (99%) rename src/system/{Zikula/Module => }/BlocksModule/BlocksModuleInstaller.php (97%) rename src/system/{Zikula/Module => }/BlocksModule/BlocksModuleVersion.php (98%) rename src/system/{Zikula/Module => }/BlocksModule/Controller/AdminController.php (99%) rename src/system/{Zikula/Module => }/BlocksModule/Controller/AjaxController.php (97%) rename src/system/{Zikula/Module => }/BlocksModule/Controller/UserController.php (98%) rename src/system/{Zikula/Module => }/BlocksModule/Entity/BlockEntity.php (99%) rename src/system/{Zikula/Module => }/BlocksModule/Entity/BlockPlacementEntity.php (98%) rename src/system/{Zikula/Module => }/BlocksModule/Entity/BlockPositionEntity.php (98%) rename src/system/{Zikula/Module => }/BlocksModule/Entity/UserBlockEntity.php (98%) rename src/system/{Zikula/Module => }/BlocksModule/LICENSE (100%) rename src/system/{Zikula/Module => }/BlocksModule/MenutreeTree.php (99%) rename src/system/{Zikula/Module => }/BlocksModule/MenutreeUtil.php (99%) rename src/system/{Zikula/Module => }/BlocksModule/README.md (100%) rename src/system/{Zikula/Module => }/BlocksModule/Resources/config/routing.yml (100%) rename src/system/{Zikula/Module => }/BlocksModule/Resources/public/css/arrows.css (100%) rename src/system/{Zikula/Module => }/BlocksModule/Resources/public/css/extmenu.css (100%) rename src/system/{Zikula/Module => }/BlocksModule/Resources/public/css/extmenu_modify.css (100%) rename src/system/{Zikula/Module => }/BlocksModule/Resources/public/css/menu.css (100%) rename src/system/{Zikula/Module => }/BlocksModule/Resources/public/css/menutree/adminstyle.css (100%) rename src/system/{Zikula/Module => }/BlocksModule/Resources/public/css/menutree/contextmenu.css (100%) rename src/system/{Zikula/Module => }/BlocksModule/Resources/public/css/menutree/horizontal.css (100%) rename src/system/{Zikula/Module => }/BlocksModule/Resources/public/css/menutree/vertical_left.css (100%) rename src/system/{Zikula/Module => }/BlocksModule/Resources/public/css/menutree/vertical_right.css (100%) rename src/system/{Zikula/Module => }/BlocksModule/Resources/public/css/rollover.css (100%) rename src/system/{Zikula/Module => }/BlocksModule/Resources/public/css/style.css (100%) rename src/system/{Zikula/Module => }/BlocksModule/Resources/public/images/admin.png (100%) rename src/system/{Zikula/Module => }/BlocksModule/Resources/public/images/arrow.gif (100%) rename src/system/{Zikula/Module => }/BlocksModule/Resources/public/images/menutree/filenew.png (100%) rename src/system/{Zikula/Module => }/BlocksModule/Resources/public/images/menutree/folder.png (100%) rename src/system/{Zikula/Module => }/BlocksModule/Resources/public/images/menutree/folder_open.png (100%) rename src/system/{Zikula/Module => }/BlocksModule/Resources/public/images/menutree/lnode.gif (100%) rename src/system/{Zikula/Module => }/BlocksModule/Resources/public/images/menutree/menu/after.png (100%) rename src/system/{Zikula/Module => }/BlocksModule/Resources/public/images/menutree/menu/all-off.png (100%) rename src/system/{Zikula/Module => }/BlocksModule/Resources/public/images/menutree/menu/all-on.png (100%) rename src/system/{Zikula/Module => }/BlocksModule/Resources/public/images/menutree/menu/all-onoff.png (100%) rename src/system/{Zikula/Module => }/BlocksModule/Resources/public/images/menutree/menu/aschild.png (100%) rename src/system/{Zikula/Module => }/BlocksModule/Resources/public/images/menutree/menu/before.png (100%) rename src/system/{Zikula/Module => }/BlocksModule/Resources/public/images/menutree/menu/collapse.png (100%) rename src/system/{Zikula/Module => }/BlocksModule/Resources/public/images/menutree/menu/expand.png (100%) rename src/system/{Zikula/Module => }/BlocksModule/Resources/public/images/menutree/menu/folder_add.png (100%) rename src/system/{Zikula/Module => }/BlocksModule/Resources/public/images/menutree/menu/folder_delete.png (100%) rename src/system/{Zikula/Module => }/BlocksModule/Resources/public/images/menutree/menu/folder_edit.png (100%) rename src/system/{Zikula/Module => }/BlocksModule/Resources/public/images/menutree/menu/folder_off.png (100%) rename src/system/{Zikula/Module => }/BlocksModule/Resources/public/images/menutree/menu/folder_on.png (100%) rename src/system/{Zikula/Module => }/BlocksModule/Resources/public/images/menutree/menu/withc-hover.gif (100%) rename src/system/{Zikula/Module => }/BlocksModule/Resources/public/images/menutree/menu/withc.gif (100%) rename src/system/{Zikula/Module => }/BlocksModule/Resources/public/images/menutree/minus.gif (100%) rename src/system/{Zikula/Module => }/BlocksModule/Resources/public/images/menutree/node.gif (100%) rename src/system/{Zikula/Module => }/BlocksModule/Resources/public/images/menutree/pion.gif (100%) rename src/system/{Zikula/Module => }/BlocksModule/Resources/public/images/menutree/plus.gif (100%) rename src/system/{Zikula/Module => }/BlocksModule/Resources/public/js/Zikula.Blocks.Admin.Common.js (100%) rename src/system/{Zikula/Module => }/BlocksModule/Resources/public/js/Zikula.Blocks.Admin.Modifyposition.js (100%) rename src/system/{Zikula/Module => }/BlocksModule/Resources/public/js/Zikula.Menutree.Tree.js (100%) rename src/system/{Zikula/Module => }/BlocksModule/Resources/public/js/contextmenu.js (100%) rename src/system/{Zikula/Module => }/BlocksModule/Resources/public/js/functions.js (100%) rename src/system/{Zikula/Module => }/BlocksModule/Resources/views/Admin/delete.tpl (100%) rename src/system/{Zikula/Module => }/BlocksModule/Resources/views/Admin/deleteposition.tpl (100%) rename src/system/{Zikula/Module => }/BlocksModule/Resources/views/Admin/modify.tpl (100%) rename src/system/{Zikula/Module => }/BlocksModule/Resources/views/Admin/modifyconfig.tpl (100%) rename src/system/{Zikula/Module => }/BlocksModule/Resources/views/Admin/modifyposition.tpl (100%) rename src/system/{Zikula/Module => }/BlocksModule/Resources/views/Admin/newblock.tpl (100%) rename src/system/{Zikula/Module => }/BlocksModule/Resources/views/Admin/newposition.tpl (100%) rename src/system/{Zikula/Module => }/BlocksModule/Resources/views/Admin/view.tpl (100%) rename src/system/{Zikula/Module => }/BlocksModule/Resources/views/Block/Extmenu/bootstrap.tpl (100%) rename src/system/{Zikula/Module => }/BlocksModule/Resources/views/Block/Extmenu/extmenu.tpl (100%) rename src/system/{Zikula/Module => }/BlocksModule/Resources/views/Block/Extmenu/modify.tpl (100%) rename src/system/{Zikula/Module => }/BlocksModule/Resources/views/Block/Extmenu/topnav.tpl (100%) rename src/system/{Zikula/Module => }/BlocksModule/Resources/views/Block/Menutree/bootstrap.tpl (100%) rename src/system/{Zikula/Module => }/BlocksModule/Resources/views/Block/Menutree/bs_hamburger.tpl (100%) rename src/system/{Zikula/Module => }/BlocksModule/Resources/views/Block/Menutree/default.tpl (100%) rename src/system/{Zikula/Module => }/BlocksModule/Resources/views/Block/Menutree/help.tpl (100%) rename src/system/{Zikula/Module => }/BlocksModule/Resources/views/Block/Menutree/horizontal.tpl (100%) rename src/system/{Zikula/Module => }/BlocksModule/Resources/views/Block/Menutree/modify.tpl (100%) rename src/system/{Zikula/Module => }/BlocksModule/Resources/views/Block/Menutree/tree.tpl (100%) rename src/system/{Zikula/Module => }/BlocksModule/Resources/views/Block/Menutree/vertical_left.tpl (100%) rename src/system/{Zikula/Module => }/BlocksModule/Resources/views/Block/Menutree/vertical_right.tpl (100%) rename src/system/{Zikula/Module => }/BlocksModule/Resources/views/Block/finclude_modify.tpl (100%) rename src/system/{Zikula/Module => }/BlocksModule/Resources/views/Block/menu.tpl (100%) rename src/system/{Zikula/Module => }/BlocksModule/Resources/views/Block/menu_modify.tpl (100%) rename src/system/{Zikula/Module => }/BlocksModule/Resources/views/Block/pendingcontent.tpl (100%) rename src/system/{Zikula/Module => }/BlocksModule/Resources/views/Block/thelang.tpl (100%) rename src/system/{Zikula/Module => }/BlocksModule/Resources/views/Block/thelang_modify.tpl (100%) rename src/system/{Zikula/Module => }/BlocksModule/Resources/views/Block/xslt_modify.tpl (100%) rename src/system/{Zikula/Module => }/BlocksModule/Resources/views/User/display.tpl (100%) rename src/system/{Zikula/Module => }/BlocksModule/Resources/views/plugins/block.menu.php (100%) rename src/system/{Zikula/Module => }/BlocksModule/Resources/views/plugins/function.menutree.php (100%) rename src/system/{Zikula/Module => }/BlocksModule/ZikulaBlocksModule.php (93%) rename src/system/{Zikula/Module => }/BlocksModule/composer.json (75%) rename src/system/{Zikula/Module => }/BlocksModule/phpunit.xml.dist (100%) rename src/system/{Zikula/Module => }/BlocksModule/tables.php (100%) diff --git a/composer.json b/composer.json index ae1dbde11f..614c27d2e0 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,8 @@ "psr-4": { "Zikula\\RoutesModule\\": "src/system/ZikulaRoutesModule", "Zikula\\ThemeModule\\": "src/system/ThemeModule", - "Zikula\\AdminModule\\": "src/system/AdminModule" + "Zikula\\AdminModule\\": "src/system/AdminModule", + "Zikula\\BlocksModule\\": "src/system/BlocksModule" }, "classmap": [ "src/lib/util/", diff --git a/src/app/ZikulaKernel.php b/src/app/ZikulaKernel.php index 59b1c57e71..c3a1ee7c9d 100644 --- a/src/app/ZikulaKernel.php +++ b/src/app/ZikulaKernel.php @@ -64,7 +64,7 @@ public function registerContainerConfiguration(LoaderInterface $loader) private function registerCoreModules(array &$bundles) { $bundles[] = new Zikula\AdminModule\ZikulaAdminModule(); - $bundles[] = new Zikula\Module\BlocksModule\ZikulaBlocksModule(); + $bundles[] = new Zikula\BlocksModule\ZikulaBlocksModule(); $bundles[] = new Zikula\Module\CategoriesModule\ZikulaCategoriesModule(); $bundles[] = new Zikula\Module\ExtensionsModule\ZikulaExtensionsModule(); $bundles[] = new Zikula\Module\GroupsModule\ZikulaGroupsModule(); diff --git a/src/lib/Zikula/Bundle/CoreInstallerBundle/Controller/AjaxInstallController.php b/src/lib/Zikula/Bundle/CoreInstallerBundle/Controller/AjaxInstallController.php index b3d069a1f7..bfc99f25a5 100644 --- a/src/lib/Zikula/Bundle/CoreInstallerBundle/Controller/AjaxInstallController.php +++ b/src/lib/Zikula/Bundle/CoreInstallerBundle/Controller/AjaxInstallController.php @@ -219,7 +219,7 @@ private function categorizeModules() private function createBlocks() { // create the default blocks. - $blockInstance = new \Zikula\Module\BlocksModule\BlocksModuleInstaller($this->container, $this->container->get('kernel')->getModule('ZikulaBlocksModule')); + $blockInstance = new \Zikula\BlocksModule\BlocksModuleInstaller($this->container, $this->container->get('kernel')->getModule('ZikulaBlocksModule')); $blockInstance->defaultdata(); return true; diff --git a/src/lib/util/BlockUtil.php b/src/lib/util/BlockUtil.php index 110a9b8104..678a8f467e 100644 --- a/src/lib/util/BlockUtil.php +++ b/src/lib/util/BlockUtil.php @@ -452,7 +452,7 @@ public static function checkUserBlock($blockinfo) $entityManager = $sm->get('doctrine.entitymanager'); $item = $entityManager->getRepository('ZikulaBlocksModule:UserBlockEntity')->findOneBy(array('uid' => $uid, 'bid' => $blockinfo['bid'])); if (!$item) { - $item = new \Zikula\Module\BlocksModule\Entity\UserBlockEntity; + $item = new \Zikula\BlocksModule\Entity\UserBlockEntity; $item['uid'] = (int) $uid; $item['bid'] = $blockinfo['bid']; $item['active'] = $blockinfo['defaultstate']; diff --git a/src/system/Zikula/Module/BlocksModule/.gitignore b/src/system/BlocksModule/.gitignore similarity index 100% rename from src/system/Zikula/Module/BlocksModule/.gitignore rename to src/system/BlocksModule/.gitignore diff --git a/src/system/Zikula/Module/BlocksModule/.travis.yml b/src/system/BlocksModule/.travis.yml similarity index 100% rename from src/system/Zikula/Module/BlocksModule/.travis.yml rename to src/system/BlocksModule/.travis.yml diff --git a/src/system/Zikula/Module/BlocksModule/Api/AdminApi.php b/src/system/BlocksModule/Api/AdminApi.php similarity index 97% rename from src/system/Zikula/Module/BlocksModule/Api/AdminApi.php rename to src/system/BlocksModule/Api/AdminApi.php index b357a10b53..a206a3161d 100644 --- a/src/system/Zikula/Module/BlocksModule/Api/AdminApi.php +++ b/src/system/BlocksModule/Api/AdminApi.php @@ -11,14 +11,14 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\BlocksModule\Api; +namespace Zikula\BlocksModule\Api; use System; use SecurityUtil; -use Zikula\Module\BlocksModule\Entity\BlockPlacementEntity; +use Zikula\BlocksModule\Entity\BlockPlacementEntity; use ModUtil; -use Zikula\Module\BlocksModule\Entity\BlockEntity; -use Zikula\Module\BlocksModule\Entity\BlockPositionEntity; +use Zikula\BlocksModule\Entity\BlockEntity; +use Zikula\BlocksModule\Entity\BlockPositionEntity; use Symfony\Component\Security\Core\Exception\AccessDeniedException; /** @@ -278,7 +278,7 @@ public function delete($args) throw new \InvalidArgumentException(__('Invalid arguments array received')); } - /** @var \Zikula\Module\BlocksModule\Entity\BlockEntity $block */ + /** @var \Zikula\BlocksModule\Entity\BlockEntity $block */ $block = ModUtil::apiFunc('ZikulaBlocksModule', 'user', 'get', array('bid' => $args['bid'])); // Security check @@ -373,7 +373,7 @@ public function updateposition($args) } // Get the existing position - /** @var \Zikula\Module\BlocksModule\Entity\BlockPositionEntity $item */ + /** @var \Zikula\BlocksModule\Entity\BlockPositionEntity $item */ $item = ModUtil::apiFunc('ZikulaBlocksModule', 'user', 'getposition', array('pid' => $args['pid'])); if ($item == false) { @@ -420,7 +420,7 @@ public function deleteposition($args) throw new \InvalidArgumentException(__('Invalid arguments array received')); } - /** @var \Zikula\Module\BlocksModule\Entity\BlockPositionEntity $position */ + /** @var \Zikula\BlocksModule\Entity\BlockPositionEntity $position */ $position = ModUtil::apiFunc('ZikulaBlocksModule', 'user', 'getposition', array('pid' => $args['pid'])); if (!SecurityUtil::checkPermission('ZikulaBlocksModule::position', "$position[name]::$position[pid]", ACCESS_DELETE)) { diff --git a/src/system/Zikula/Module/BlocksModule/Api/MenutreeApi.php b/src/system/BlocksModule/Api/MenutreeApi.php similarity index 99% rename from src/system/Zikula/Module/BlocksModule/Api/MenutreeApi.php rename to src/system/BlocksModule/Api/MenutreeApi.php index 3d4ef7a15f..b5df0d6451 100644 --- a/src/system/Zikula/Module/BlocksModule/Api/MenutreeApi.php +++ b/src/system/BlocksModule/Api/MenutreeApi.php @@ -11,11 +11,11 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\BlocksModule\Api; +namespace Zikula\BlocksModule\Api; use ModUtil; use SecurityUtil; -use Zikula\Module\BlocksModule\MenutreeUtil; +use Zikula\BlocksModule\MenutreeUtil; use ZLanguage; use Loader; use CategoryRegistryUtil; diff --git a/src/system/Zikula/Module/BlocksModule/Api/UserApi.php b/src/system/BlocksModule/Api/UserApi.php similarity index 99% rename from src/system/Zikula/Module/BlocksModule/Api/UserApi.php rename to src/system/BlocksModule/Api/UserApi.php index 47b7e9d5fa..22aed156e3 100644 --- a/src/system/Zikula/Module/BlocksModule/Api/UserApi.php +++ b/src/system/BlocksModule/Api/UserApi.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\BlocksModule\Api; +namespace Zikula\BlocksModule\Api; use SecurityUtil; use System; diff --git a/src/system/Zikula/Module/BlocksModule/Block/ExtmenuBlock.php b/src/system/BlocksModule/Block/ExtmenuBlock.php similarity index 99% rename from src/system/Zikula/Module/BlocksModule/Block/ExtmenuBlock.php rename to src/system/BlocksModule/Block/ExtmenuBlock.php index 2a239edb41..f9720a2ad7 100644 --- a/src/system/Zikula/Module/BlocksModule/Block/ExtmenuBlock.php +++ b/src/system/BlocksModule/Block/ExtmenuBlock.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\BlocksModule\Block; +namespace Zikula\BlocksModule\Block; use SecurityUtil; use BlockUtil; diff --git a/src/system/Zikula/Module/BlocksModule/Block/FincludeBlock.php b/src/system/BlocksModule/Block/FincludeBlock.php similarity index 99% rename from src/system/Zikula/Module/BlocksModule/Block/FincludeBlock.php rename to src/system/BlocksModule/Block/FincludeBlock.php index 9e14f8ad8b..fa6b4b2b79 100644 --- a/src/system/Zikula/Module/BlocksModule/Block/FincludeBlock.php +++ b/src/system/BlocksModule/Block/FincludeBlock.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\BlocksModule\Block; +namespace Zikula\BlocksModule\Block; use SecurityUtil; use BlockUtil; diff --git a/src/system/Zikula/Module/BlocksModule/Block/HtmlBlock.php b/src/system/BlocksModule/Block/HtmlBlock.php similarity index 97% rename from src/system/Zikula/Module/BlocksModule/Block/HtmlBlock.php rename to src/system/BlocksModule/Block/HtmlBlock.php index fbce27749d..599e5f0345 100644 --- a/src/system/Zikula/Module/BlocksModule/Block/HtmlBlock.php +++ b/src/system/BlocksModule/Block/HtmlBlock.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\BlocksModule\Block; +namespace Zikula\BlocksModule\Block; use SecurityUtil; use BlockUtil; diff --git a/src/system/Zikula/Module/BlocksModule/Block/LangBlock.php b/src/system/BlocksModule/Block/LangBlock.php similarity index 99% rename from src/system/Zikula/Module/BlocksModule/Block/LangBlock.php rename to src/system/BlocksModule/Block/LangBlock.php index bff2c13bb1..73de24c763 100644 --- a/src/system/Zikula/Module/BlocksModule/Block/LangBlock.php +++ b/src/system/BlocksModule/Block/LangBlock.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\BlocksModule\Block; +namespace Zikula\BlocksModule\Block; use SecurityUtil; use System; diff --git a/src/system/Zikula/Module/BlocksModule/Block/MenuBlock.php b/src/system/BlocksModule/Block/MenuBlock.php similarity index 99% rename from src/system/Zikula/Module/BlocksModule/Block/MenuBlock.php rename to src/system/BlocksModule/Block/MenuBlock.php index 9788c69bc7..48ee9ec554 100644 --- a/src/system/Zikula/Module/BlocksModule/Block/MenuBlock.php +++ b/src/system/BlocksModule/Block/MenuBlock.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\BlocksModule\Block; +namespace Zikula\BlocksModule\Block; use SecurityUtil; use BlockUtil; diff --git a/src/system/Zikula/Module/BlocksModule/Block/MenutreeBlock.php b/src/system/BlocksModule/Block/MenutreeBlock.php similarity index 99% rename from src/system/Zikula/Module/BlocksModule/Block/MenutreeBlock.php rename to src/system/BlocksModule/Block/MenutreeBlock.php index a451248fd5..d4311add5a 100644 --- a/src/system/Zikula/Module/BlocksModule/Block/MenutreeBlock.php +++ b/src/system/BlocksModule/Block/MenutreeBlock.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\BlocksModule\Block; +namespace Zikula\BlocksModule\Block; use SecurityUtil; use BlockUtil; @@ -19,8 +19,8 @@ use UserUtil; use ZLanguage; use ModUtil; -use Zikula\Module\BlocksModule\MenutreeUtil; -use Zikula\Module\BlocksModule\MenutreeTree; +use Zikula\BlocksModule\MenutreeUtil; +use Zikula\BlocksModule\MenutreeTree; use System; use Zikula_View; use DataUtil; @@ -367,7 +367,7 @@ public function update($blockinfo) } // sort tree array according to lineno key - uasort($vars['menutree_content'], array('Zikula\Module\BlocksModule\Block\MenutreeBlock','sort_menu')); + uasort($vars['menutree_content'], array('Zikula\BlocksModule\Block\MenutreeBlock','sort_menu')); // get other form data $menutree_data = $this->request->request->get('menutree'); diff --git a/src/system/Zikula/Module/BlocksModule/Block/PendingContentBlock.php b/src/system/BlocksModule/Block/PendingContentBlock.php similarity index 98% rename from src/system/Zikula/Module/BlocksModule/Block/PendingContentBlock.php rename to src/system/BlocksModule/Block/PendingContentBlock.php index 6b1d897abb..546378d900 100644 --- a/src/system/Zikula/Module/BlocksModule/Block/PendingContentBlock.php +++ b/src/system/BlocksModule/Block/PendingContentBlock.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\BlocksModule\Block; +namespace Zikula\BlocksModule\Block; use SecurityUtil; use Zikula_Collection_Container; diff --git a/src/system/Zikula/Module/BlocksModule/Block/TextBlock.php b/src/system/BlocksModule/Block/TextBlock.php similarity index 97% rename from src/system/Zikula/Module/BlocksModule/Block/TextBlock.php rename to src/system/BlocksModule/Block/TextBlock.php index 06545d0114..88198e9ba5 100644 --- a/src/system/Zikula/Module/BlocksModule/Block/TextBlock.php +++ b/src/system/BlocksModule/Block/TextBlock.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\BlocksModule\Block; +namespace Zikula\BlocksModule\Block; use SecurityUtil; use BlockUtil; diff --git a/src/system/Zikula/Module/BlocksModule/Block/XsltBlock.php b/src/system/BlocksModule/Block/XsltBlock.php similarity index 99% rename from src/system/Zikula/Module/BlocksModule/Block/XsltBlock.php rename to src/system/BlocksModule/Block/XsltBlock.php index 8f04a3ceab..22641184af 100644 --- a/src/system/Zikula/Module/BlocksModule/Block/XsltBlock.php +++ b/src/system/BlocksModule/Block/XsltBlock.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\BlocksModule\Block; +namespace Zikula\BlocksModule\Block; use SecurityUtil; use BlockUtil; diff --git a/src/system/Zikula/Module/BlocksModule/BlocksModuleInstaller.php b/src/system/BlocksModule/BlocksModuleInstaller.php similarity index 97% rename from src/system/Zikula/Module/BlocksModule/BlocksModuleInstaller.php rename to src/system/BlocksModule/BlocksModuleInstaller.php index d04debd1d5..c95138a85b 100644 --- a/src/system/Zikula/Module/BlocksModule/BlocksModuleInstaller.php +++ b/src/system/BlocksModule/BlocksModuleInstaller.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\BlocksModule; +namespace Zikula\BlocksModule; use DoctrineHelper; use ModUtil; @@ -33,10 +33,10 @@ public function install() { // create tables $classes = array( - 'Zikula\Module\BlocksModule\Entity\BlockEntity', - 'Zikula\Module\BlocksModule\Entity\BlockPositionEntity', - 'Zikula\Module\BlocksModule\Entity\BlockPlacementEntity', - 'Zikula\Module\BlocksModule\Entity\UserBlockEntity' + 'Zikula\BlocksModule\Entity\BlockEntity', + 'Zikula\BlocksModule\Entity\BlockPositionEntity', + 'Zikula\BlocksModule\Entity\BlockPlacementEntity', + 'Zikula\BlocksModule\Entity\UserBlockEntity' ); try { @@ -70,7 +70,7 @@ public function upgrade($oldversion) case '3.8.2': case '3.9.0': $blocks = $this->entityManager->getRepository('ZikulaBlocksModule:BlockEntity')->findAll(); - /** @var \Zikula\Module\BlocksModule\Entity\BlockEntity $block */ + /** @var \Zikula\BlocksModule\Entity\BlockEntity $block */ foreach ($blocks as $block) { $content = $block->getContent(); if(\DataUtil::is_serialized($content)) { diff --git a/src/system/Zikula/Module/BlocksModule/BlocksModuleVersion.php b/src/system/BlocksModule/BlocksModuleVersion.php similarity index 98% rename from src/system/Zikula/Module/BlocksModule/BlocksModuleVersion.php rename to src/system/BlocksModule/BlocksModuleVersion.php index a8a4396dc3..b5fc4d18ff 100644 --- a/src/system/Zikula/Module/BlocksModule/BlocksModuleVersion.php +++ b/src/system/BlocksModule/BlocksModuleVersion.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\BlocksModule; +namespace Zikula\BlocksModule; use HookUtil; use ModUtil; diff --git a/src/system/Zikula/Module/BlocksModule/Controller/AdminController.php b/src/system/BlocksModule/Controller/AdminController.php similarity index 99% rename from src/system/Zikula/Module/BlocksModule/Controller/AdminController.php rename to src/system/BlocksModule/Controller/AdminController.php index e679fbbbca..18aa104f18 100644 --- a/src/system/Zikula/Module/BlocksModule/Controller/AdminController.php +++ b/src/system/BlocksModule/Controller/AdminController.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\BlocksModule\Controller; +namespace Zikula\BlocksModule\Controller; use Zikula_View; use ModUtil; diff --git a/src/system/Zikula/Module/BlocksModule/Controller/AjaxController.php b/src/system/BlocksModule/Controller/AjaxController.php similarity index 97% rename from src/system/Zikula/Module/BlocksModule/Controller/AjaxController.php rename to src/system/BlocksModule/Controller/AjaxController.php index 915440e5f4..bb26dfe31c 100644 --- a/src/system/Zikula/Module/BlocksModule/Controller/AjaxController.php +++ b/src/system/BlocksModule/Controller/AjaxController.php @@ -11,10 +11,10 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\BlocksModule\Controller; +namespace Zikula\BlocksModule\Controller; use SecurityUtil; -use Zikula\Module\BlocksModule\Entity\BlockPlacementEntity; +use Zikula\BlocksModule\Entity\BlockPlacementEntity; use Symfony\Component\HttpFoundation\Request; use Zikula\Core\Response\Ajax\AjaxResponse; use Zikula\Core\Response\Ajax\FatalResponse; diff --git a/src/system/Zikula/Module/BlocksModule/Controller/UserController.php b/src/system/BlocksModule/Controller/UserController.php similarity index 98% rename from src/system/Zikula/Module/BlocksModule/Controller/UserController.php rename to src/system/BlocksModule/Controller/UserController.php index b9ad1a3419..acda20c22f 100644 --- a/src/system/Zikula/Module/BlocksModule/Controller/UserController.php +++ b/src/system/BlocksModule/Controller/UserController.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\BlocksModule\Controller; +namespace Zikula\BlocksModule\Controller; use UserUtil; use BlockUtil; diff --git a/src/system/Zikula/Module/BlocksModule/Entity/BlockEntity.php b/src/system/BlocksModule/Entity/BlockEntity.php similarity index 99% rename from src/system/Zikula/Module/BlocksModule/Entity/BlockEntity.php rename to src/system/BlocksModule/Entity/BlockEntity.php index 8df3005f0a..fa3f1ee7bc 100644 --- a/src/system/Zikula/Module/BlocksModule/Entity/BlockEntity.php +++ b/src/system/BlocksModule/Entity/BlockEntity.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\BlocksModule\Entity; +namespace Zikula\BlocksModule\Entity; use Zikula\Core\Doctrine\EntityAccess; use Doctrine\ORM\Mapping as ORM; diff --git a/src/system/Zikula/Module/BlocksModule/Entity/BlockPlacementEntity.php b/src/system/BlocksModule/Entity/BlockPlacementEntity.php similarity index 98% rename from src/system/Zikula/Module/BlocksModule/Entity/BlockPlacementEntity.php rename to src/system/BlocksModule/Entity/BlockPlacementEntity.php index 3a438563c5..04dbf5a124 100644 --- a/src/system/Zikula/Module/BlocksModule/Entity/BlockPlacementEntity.php +++ b/src/system/BlocksModule/Entity/BlockPlacementEntity.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\BlocksModule\Entity; +namespace Zikula\BlocksModule\Entity; use Zikula\Core\Doctrine\EntityAccess; use Doctrine\ORM\Mapping as ORM; diff --git a/src/system/Zikula/Module/BlocksModule/Entity/BlockPositionEntity.php b/src/system/BlocksModule/Entity/BlockPositionEntity.php similarity index 98% rename from src/system/Zikula/Module/BlocksModule/Entity/BlockPositionEntity.php rename to src/system/BlocksModule/Entity/BlockPositionEntity.php index b1b775f2f7..538cbdd530 100644 --- a/src/system/Zikula/Module/BlocksModule/Entity/BlockPositionEntity.php +++ b/src/system/BlocksModule/Entity/BlockPositionEntity.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\BlocksModule\Entity; +namespace Zikula\BlocksModule\Entity; use Zikula\Core\Doctrine\EntityAccess; use Doctrine\ORM\Mapping as ORM; diff --git a/src/system/Zikula/Module/BlocksModule/Entity/UserBlockEntity.php b/src/system/BlocksModule/Entity/UserBlockEntity.php similarity index 98% rename from src/system/Zikula/Module/BlocksModule/Entity/UserBlockEntity.php rename to src/system/BlocksModule/Entity/UserBlockEntity.php index 8b8c844cc3..db3c05260b 100644 --- a/src/system/Zikula/Module/BlocksModule/Entity/UserBlockEntity.php +++ b/src/system/BlocksModule/Entity/UserBlockEntity.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\BlocksModule\Entity; +namespace Zikula\BlocksModule\Entity; use Zikula\Core\Doctrine\EntityAccess; use Doctrine\ORM\Mapping as ORM; diff --git a/src/system/Zikula/Module/BlocksModule/LICENSE b/src/system/BlocksModule/LICENSE similarity index 100% rename from src/system/Zikula/Module/BlocksModule/LICENSE rename to src/system/BlocksModule/LICENSE diff --git a/src/system/Zikula/Module/BlocksModule/MenutreeTree.php b/src/system/BlocksModule/MenutreeTree.php similarity index 99% rename from src/system/Zikula/Module/BlocksModule/MenutreeTree.php rename to src/system/BlocksModule/MenutreeTree.php index 27072aa607..3fccf4865d 100644 --- a/src/system/Zikula/Module/BlocksModule/MenutreeTree.php +++ b/src/system/BlocksModule/MenutreeTree.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\BlocksModule; +namespace Zikula\BlocksModule; use ModUtil; use PageUtil; diff --git a/src/system/Zikula/Module/BlocksModule/MenutreeUtil.php b/src/system/BlocksModule/MenutreeUtil.php similarity index 99% rename from src/system/Zikula/Module/BlocksModule/MenutreeUtil.php rename to src/system/BlocksModule/MenutreeUtil.php index 801af513b7..fb94a30391 100644 --- a/src/system/Zikula/Module/BlocksModule/MenutreeUtil.php +++ b/src/system/BlocksModule/MenutreeUtil.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\BlocksModule; +namespace Zikula\BlocksModule; use FileUtil; use ThemeUtil; diff --git a/src/system/Zikula/Module/BlocksModule/README.md b/src/system/BlocksModule/README.md similarity index 100% rename from src/system/Zikula/Module/BlocksModule/README.md rename to src/system/BlocksModule/README.md diff --git a/src/system/Zikula/Module/BlocksModule/Resources/config/routing.yml b/src/system/BlocksModule/Resources/config/routing.yml similarity index 100% rename from src/system/Zikula/Module/BlocksModule/Resources/config/routing.yml rename to src/system/BlocksModule/Resources/config/routing.yml diff --git a/src/system/Zikula/Module/BlocksModule/Resources/public/css/arrows.css b/src/system/BlocksModule/Resources/public/css/arrows.css similarity index 100% rename from src/system/Zikula/Module/BlocksModule/Resources/public/css/arrows.css rename to src/system/BlocksModule/Resources/public/css/arrows.css diff --git a/src/system/Zikula/Module/BlocksModule/Resources/public/css/extmenu.css b/src/system/BlocksModule/Resources/public/css/extmenu.css similarity index 100% rename from src/system/Zikula/Module/BlocksModule/Resources/public/css/extmenu.css rename to src/system/BlocksModule/Resources/public/css/extmenu.css diff --git a/src/system/Zikula/Module/BlocksModule/Resources/public/css/extmenu_modify.css b/src/system/BlocksModule/Resources/public/css/extmenu_modify.css similarity index 100% rename from src/system/Zikula/Module/BlocksModule/Resources/public/css/extmenu_modify.css rename to src/system/BlocksModule/Resources/public/css/extmenu_modify.css diff --git a/src/system/Zikula/Module/BlocksModule/Resources/public/css/menu.css b/src/system/BlocksModule/Resources/public/css/menu.css similarity index 100% rename from src/system/Zikula/Module/BlocksModule/Resources/public/css/menu.css rename to src/system/BlocksModule/Resources/public/css/menu.css diff --git a/src/system/Zikula/Module/BlocksModule/Resources/public/css/menutree/adminstyle.css b/src/system/BlocksModule/Resources/public/css/menutree/adminstyle.css similarity index 100% rename from src/system/Zikula/Module/BlocksModule/Resources/public/css/menutree/adminstyle.css rename to src/system/BlocksModule/Resources/public/css/menutree/adminstyle.css diff --git a/src/system/Zikula/Module/BlocksModule/Resources/public/css/menutree/contextmenu.css b/src/system/BlocksModule/Resources/public/css/menutree/contextmenu.css similarity index 100% rename from src/system/Zikula/Module/BlocksModule/Resources/public/css/menutree/contextmenu.css rename to src/system/BlocksModule/Resources/public/css/menutree/contextmenu.css diff --git a/src/system/Zikula/Module/BlocksModule/Resources/public/css/menutree/horizontal.css b/src/system/BlocksModule/Resources/public/css/menutree/horizontal.css similarity index 100% rename from src/system/Zikula/Module/BlocksModule/Resources/public/css/menutree/horizontal.css rename to src/system/BlocksModule/Resources/public/css/menutree/horizontal.css diff --git a/src/system/Zikula/Module/BlocksModule/Resources/public/css/menutree/vertical_left.css b/src/system/BlocksModule/Resources/public/css/menutree/vertical_left.css similarity index 100% rename from src/system/Zikula/Module/BlocksModule/Resources/public/css/menutree/vertical_left.css rename to src/system/BlocksModule/Resources/public/css/menutree/vertical_left.css diff --git a/src/system/Zikula/Module/BlocksModule/Resources/public/css/menutree/vertical_right.css b/src/system/BlocksModule/Resources/public/css/menutree/vertical_right.css similarity index 100% rename from src/system/Zikula/Module/BlocksModule/Resources/public/css/menutree/vertical_right.css rename to src/system/BlocksModule/Resources/public/css/menutree/vertical_right.css diff --git a/src/system/Zikula/Module/BlocksModule/Resources/public/css/rollover.css b/src/system/BlocksModule/Resources/public/css/rollover.css similarity index 100% rename from src/system/Zikula/Module/BlocksModule/Resources/public/css/rollover.css rename to src/system/BlocksModule/Resources/public/css/rollover.css diff --git a/src/system/Zikula/Module/BlocksModule/Resources/public/css/style.css b/src/system/BlocksModule/Resources/public/css/style.css similarity index 100% rename from src/system/Zikula/Module/BlocksModule/Resources/public/css/style.css rename to src/system/BlocksModule/Resources/public/css/style.css diff --git a/src/system/Zikula/Module/BlocksModule/Resources/public/images/admin.png b/src/system/BlocksModule/Resources/public/images/admin.png similarity index 100% rename from src/system/Zikula/Module/BlocksModule/Resources/public/images/admin.png rename to src/system/BlocksModule/Resources/public/images/admin.png diff --git a/src/system/Zikula/Module/BlocksModule/Resources/public/images/arrow.gif b/src/system/BlocksModule/Resources/public/images/arrow.gif similarity index 100% rename from src/system/Zikula/Module/BlocksModule/Resources/public/images/arrow.gif rename to src/system/BlocksModule/Resources/public/images/arrow.gif diff --git a/src/system/Zikula/Module/BlocksModule/Resources/public/images/menutree/filenew.png b/src/system/BlocksModule/Resources/public/images/menutree/filenew.png similarity index 100% rename from src/system/Zikula/Module/BlocksModule/Resources/public/images/menutree/filenew.png rename to src/system/BlocksModule/Resources/public/images/menutree/filenew.png diff --git a/src/system/Zikula/Module/BlocksModule/Resources/public/images/menutree/folder.png b/src/system/BlocksModule/Resources/public/images/menutree/folder.png similarity index 100% rename from src/system/Zikula/Module/BlocksModule/Resources/public/images/menutree/folder.png rename to src/system/BlocksModule/Resources/public/images/menutree/folder.png diff --git a/src/system/Zikula/Module/BlocksModule/Resources/public/images/menutree/folder_open.png b/src/system/BlocksModule/Resources/public/images/menutree/folder_open.png similarity index 100% rename from src/system/Zikula/Module/BlocksModule/Resources/public/images/menutree/folder_open.png rename to src/system/BlocksModule/Resources/public/images/menutree/folder_open.png diff --git a/src/system/Zikula/Module/BlocksModule/Resources/public/images/menutree/lnode.gif b/src/system/BlocksModule/Resources/public/images/menutree/lnode.gif similarity index 100% rename from src/system/Zikula/Module/BlocksModule/Resources/public/images/menutree/lnode.gif rename to src/system/BlocksModule/Resources/public/images/menutree/lnode.gif diff --git a/src/system/Zikula/Module/BlocksModule/Resources/public/images/menutree/menu/after.png b/src/system/BlocksModule/Resources/public/images/menutree/menu/after.png similarity index 100% rename from src/system/Zikula/Module/BlocksModule/Resources/public/images/menutree/menu/after.png rename to src/system/BlocksModule/Resources/public/images/menutree/menu/after.png diff --git a/src/system/Zikula/Module/BlocksModule/Resources/public/images/menutree/menu/all-off.png b/src/system/BlocksModule/Resources/public/images/menutree/menu/all-off.png similarity index 100% rename from src/system/Zikula/Module/BlocksModule/Resources/public/images/menutree/menu/all-off.png rename to src/system/BlocksModule/Resources/public/images/menutree/menu/all-off.png diff --git a/src/system/Zikula/Module/BlocksModule/Resources/public/images/menutree/menu/all-on.png b/src/system/BlocksModule/Resources/public/images/menutree/menu/all-on.png similarity index 100% rename from src/system/Zikula/Module/BlocksModule/Resources/public/images/menutree/menu/all-on.png rename to src/system/BlocksModule/Resources/public/images/menutree/menu/all-on.png diff --git a/src/system/Zikula/Module/BlocksModule/Resources/public/images/menutree/menu/all-onoff.png b/src/system/BlocksModule/Resources/public/images/menutree/menu/all-onoff.png similarity index 100% rename from src/system/Zikula/Module/BlocksModule/Resources/public/images/menutree/menu/all-onoff.png rename to src/system/BlocksModule/Resources/public/images/menutree/menu/all-onoff.png diff --git a/src/system/Zikula/Module/BlocksModule/Resources/public/images/menutree/menu/aschild.png b/src/system/BlocksModule/Resources/public/images/menutree/menu/aschild.png similarity index 100% rename from src/system/Zikula/Module/BlocksModule/Resources/public/images/menutree/menu/aschild.png rename to src/system/BlocksModule/Resources/public/images/menutree/menu/aschild.png diff --git a/src/system/Zikula/Module/BlocksModule/Resources/public/images/menutree/menu/before.png b/src/system/BlocksModule/Resources/public/images/menutree/menu/before.png similarity index 100% rename from src/system/Zikula/Module/BlocksModule/Resources/public/images/menutree/menu/before.png rename to src/system/BlocksModule/Resources/public/images/menutree/menu/before.png diff --git a/src/system/Zikula/Module/BlocksModule/Resources/public/images/menutree/menu/collapse.png b/src/system/BlocksModule/Resources/public/images/menutree/menu/collapse.png similarity index 100% rename from src/system/Zikula/Module/BlocksModule/Resources/public/images/menutree/menu/collapse.png rename to src/system/BlocksModule/Resources/public/images/menutree/menu/collapse.png diff --git a/src/system/Zikula/Module/BlocksModule/Resources/public/images/menutree/menu/expand.png b/src/system/BlocksModule/Resources/public/images/menutree/menu/expand.png similarity index 100% rename from src/system/Zikula/Module/BlocksModule/Resources/public/images/menutree/menu/expand.png rename to src/system/BlocksModule/Resources/public/images/menutree/menu/expand.png diff --git a/src/system/Zikula/Module/BlocksModule/Resources/public/images/menutree/menu/folder_add.png b/src/system/BlocksModule/Resources/public/images/menutree/menu/folder_add.png similarity index 100% rename from src/system/Zikula/Module/BlocksModule/Resources/public/images/menutree/menu/folder_add.png rename to src/system/BlocksModule/Resources/public/images/menutree/menu/folder_add.png diff --git a/src/system/Zikula/Module/BlocksModule/Resources/public/images/menutree/menu/folder_delete.png b/src/system/BlocksModule/Resources/public/images/menutree/menu/folder_delete.png similarity index 100% rename from src/system/Zikula/Module/BlocksModule/Resources/public/images/menutree/menu/folder_delete.png rename to src/system/BlocksModule/Resources/public/images/menutree/menu/folder_delete.png diff --git a/src/system/Zikula/Module/BlocksModule/Resources/public/images/menutree/menu/folder_edit.png b/src/system/BlocksModule/Resources/public/images/menutree/menu/folder_edit.png similarity index 100% rename from src/system/Zikula/Module/BlocksModule/Resources/public/images/menutree/menu/folder_edit.png rename to src/system/BlocksModule/Resources/public/images/menutree/menu/folder_edit.png diff --git a/src/system/Zikula/Module/BlocksModule/Resources/public/images/menutree/menu/folder_off.png b/src/system/BlocksModule/Resources/public/images/menutree/menu/folder_off.png similarity index 100% rename from src/system/Zikula/Module/BlocksModule/Resources/public/images/menutree/menu/folder_off.png rename to src/system/BlocksModule/Resources/public/images/menutree/menu/folder_off.png diff --git a/src/system/Zikula/Module/BlocksModule/Resources/public/images/menutree/menu/folder_on.png b/src/system/BlocksModule/Resources/public/images/menutree/menu/folder_on.png similarity index 100% rename from src/system/Zikula/Module/BlocksModule/Resources/public/images/menutree/menu/folder_on.png rename to src/system/BlocksModule/Resources/public/images/menutree/menu/folder_on.png diff --git a/src/system/Zikula/Module/BlocksModule/Resources/public/images/menutree/menu/withc-hover.gif b/src/system/BlocksModule/Resources/public/images/menutree/menu/withc-hover.gif similarity index 100% rename from src/system/Zikula/Module/BlocksModule/Resources/public/images/menutree/menu/withc-hover.gif rename to src/system/BlocksModule/Resources/public/images/menutree/menu/withc-hover.gif diff --git a/src/system/Zikula/Module/BlocksModule/Resources/public/images/menutree/menu/withc.gif b/src/system/BlocksModule/Resources/public/images/menutree/menu/withc.gif similarity index 100% rename from src/system/Zikula/Module/BlocksModule/Resources/public/images/menutree/menu/withc.gif rename to src/system/BlocksModule/Resources/public/images/menutree/menu/withc.gif diff --git a/src/system/Zikula/Module/BlocksModule/Resources/public/images/menutree/minus.gif b/src/system/BlocksModule/Resources/public/images/menutree/minus.gif similarity index 100% rename from src/system/Zikula/Module/BlocksModule/Resources/public/images/menutree/minus.gif rename to src/system/BlocksModule/Resources/public/images/menutree/minus.gif diff --git a/src/system/Zikula/Module/BlocksModule/Resources/public/images/menutree/node.gif b/src/system/BlocksModule/Resources/public/images/menutree/node.gif similarity index 100% rename from src/system/Zikula/Module/BlocksModule/Resources/public/images/menutree/node.gif rename to src/system/BlocksModule/Resources/public/images/menutree/node.gif diff --git a/src/system/Zikula/Module/BlocksModule/Resources/public/images/menutree/pion.gif b/src/system/BlocksModule/Resources/public/images/menutree/pion.gif similarity index 100% rename from src/system/Zikula/Module/BlocksModule/Resources/public/images/menutree/pion.gif rename to src/system/BlocksModule/Resources/public/images/menutree/pion.gif diff --git a/src/system/Zikula/Module/BlocksModule/Resources/public/images/menutree/plus.gif b/src/system/BlocksModule/Resources/public/images/menutree/plus.gif similarity index 100% rename from src/system/Zikula/Module/BlocksModule/Resources/public/images/menutree/plus.gif rename to src/system/BlocksModule/Resources/public/images/menutree/plus.gif diff --git a/src/system/Zikula/Module/BlocksModule/Resources/public/js/Zikula.Blocks.Admin.Common.js b/src/system/BlocksModule/Resources/public/js/Zikula.Blocks.Admin.Common.js similarity index 100% rename from src/system/Zikula/Module/BlocksModule/Resources/public/js/Zikula.Blocks.Admin.Common.js rename to src/system/BlocksModule/Resources/public/js/Zikula.Blocks.Admin.Common.js diff --git a/src/system/Zikula/Module/BlocksModule/Resources/public/js/Zikula.Blocks.Admin.Modifyposition.js b/src/system/BlocksModule/Resources/public/js/Zikula.Blocks.Admin.Modifyposition.js similarity index 100% rename from src/system/Zikula/Module/BlocksModule/Resources/public/js/Zikula.Blocks.Admin.Modifyposition.js rename to src/system/BlocksModule/Resources/public/js/Zikula.Blocks.Admin.Modifyposition.js diff --git a/src/system/Zikula/Module/BlocksModule/Resources/public/js/Zikula.Menutree.Tree.js b/src/system/BlocksModule/Resources/public/js/Zikula.Menutree.Tree.js similarity index 100% rename from src/system/Zikula/Module/BlocksModule/Resources/public/js/Zikula.Menutree.Tree.js rename to src/system/BlocksModule/Resources/public/js/Zikula.Menutree.Tree.js diff --git a/src/system/Zikula/Module/BlocksModule/Resources/public/js/contextmenu.js b/src/system/BlocksModule/Resources/public/js/contextmenu.js similarity index 100% rename from src/system/Zikula/Module/BlocksModule/Resources/public/js/contextmenu.js rename to src/system/BlocksModule/Resources/public/js/contextmenu.js diff --git a/src/system/Zikula/Module/BlocksModule/Resources/public/js/functions.js b/src/system/BlocksModule/Resources/public/js/functions.js similarity index 100% rename from src/system/Zikula/Module/BlocksModule/Resources/public/js/functions.js rename to src/system/BlocksModule/Resources/public/js/functions.js diff --git a/src/system/Zikula/Module/BlocksModule/Resources/views/Admin/delete.tpl b/src/system/BlocksModule/Resources/views/Admin/delete.tpl similarity index 100% rename from src/system/Zikula/Module/BlocksModule/Resources/views/Admin/delete.tpl rename to src/system/BlocksModule/Resources/views/Admin/delete.tpl diff --git a/src/system/Zikula/Module/BlocksModule/Resources/views/Admin/deleteposition.tpl b/src/system/BlocksModule/Resources/views/Admin/deleteposition.tpl similarity index 100% rename from src/system/Zikula/Module/BlocksModule/Resources/views/Admin/deleteposition.tpl rename to src/system/BlocksModule/Resources/views/Admin/deleteposition.tpl diff --git a/src/system/Zikula/Module/BlocksModule/Resources/views/Admin/modify.tpl b/src/system/BlocksModule/Resources/views/Admin/modify.tpl similarity index 100% rename from src/system/Zikula/Module/BlocksModule/Resources/views/Admin/modify.tpl rename to src/system/BlocksModule/Resources/views/Admin/modify.tpl diff --git a/src/system/Zikula/Module/BlocksModule/Resources/views/Admin/modifyconfig.tpl b/src/system/BlocksModule/Resources/views/Admin/modifyconfig.tpl similarity index 100% rename from src/system/Zikula/Module/BlocksModule/Resources/views/Admin/modifyconfig.tpl rename to src/system/BlocksModule/Resources/views/Admin/modifyconfig.tpl diff --git a/src/system/Zikula/Module/BlocksModule/Resources/views/Admin/modifyposition.tpl b/src/system/BlocksModule/Resources/views/Admin/modifyposition.tpl similarity index 100% rename from src/system/Zikula/Module/BlocksModule/Resources/views/Admin/modifyposition.tpl rename to src/system/BlocksModule/Resources/views/Admin/modifyposition.tpl diff --git a/src/system/Zikula/Module/BlocksModule/Resources/views/Admin/newblock.tpl b/src/system/BlocksModule/Resources/views/Admin/newblock.tpl similarity index 100% rename from src/system/Zikula/Module/BlocksModule/Resources/views/Admin/newblock.tpl rename to src/system/BlocksModule/Resources/views/Admin/newblock.tpl diff --git a/src/system/Zikula/Module/BlocksModule/Resources/views/Admin/newposition.tpl b/src/system/BlocksModule/Resources/views/Admin/newposition.tpl similarity index 100% rename from src/system/Zikula/Module/BlocksModule/Resources/views/Admin/newposition.tpl rename to src/system/BlocksModule/Resources/views/Admin/newposition.tpl diff --git a/src/system/Zikula/Module/BlocksModule/Resources/views/Admin/view.tpl b/src/system/BlocksModule/Resources/views/Admin/view.tpl similarity index 100% rename from src/system/Zikula/Module/BlocksModule/Resources/views/Admin/view.tpl rename to src/system/BlocksModule/Resources/views/Admin/view.tpl diff --git a/src/system/Zikula/Module/BlocksModule/Resources/views/Block/Extmenu/bootstrap.tpl b/src/system/BlocksModule/Resources/views/Block/Extmenu/bootstrap.tpl similarity index 100% rename from src/system/Zikula/Module/BlocksModule/Resources/views/Block/Extmenu/bootstrap.tpl rename to src/system/BlocksModule/Resources/views/Block/Extmenu/bootstrap.tpl diff --git a/src/system/Zikula/Module/BlocksModule/Resources/views/Block/Extmenu/extmenu.tpl b/src/system/BlocksModule/Resources/views/Block/Extmenu/extmenu.tpl similarity index 100% rename from src/system/Zikula/Module/BlocksModule/Resources/views/Block/Extmenu/extmenu.tpl rename to src/system/BlocksModule/Resources/views/Block/Extmenu/extmenu.tpl diff --git a/src/system/Zikula/Module/BlocksModule/Resources/views/Block/Extmenu/modify.tpl b/src/system/BlocksModule/Resources/views/Block/Extmenu/modify.tpl similarity index 100% rename from src/system/Zikula/Module/BlocksModule/Resources/views/Block/Extmenu/modify.tpl rename to src/system/BlocksModule/Resources/views/Block/Extmenu/modify.tpl diff --git a/src/system/Zikula/Module/BlocksModule/Resources/views/Block/Extmenu/topnav.tpl b/src/system/BlocksModule/Resources/views/Block/Extmenu/topnav.tpl similarity index 100% rename from src/system/Zikula/Module/BlocksModule/Resources/views/Block/Extmenu/topnav.tpl rename to src/system/BlocksModule/Resources/views/Block/Extmenu/topnav.tpl diff --git a/src/system/Zikula/Module/BlocksModule/Resources/views/Block/Menutree/bootstrap.tpl b/src/system/BlocksModule/Resources/views/Block/Menutree/bootstrap.tpl similarity index 100% rename from src/system/Zikula/Module/BlocksModule/Resources/views/Block/Menutree/bootstrap.tpl rename to src/system/BlocksModule/Resources/views/Block/Menutree/bootstrap.tpl diff --git a/src/system/Zikula/Module/BlocksModule/Resources/views/Block/Menutree/bs_hamburger.tpl b/src/system/BlocksModule/Resources/views/Block/Menutree/bs_hamburger.tpl similarity index 100% rename from src/system/Zikula/Module/BlocksModule/Resources/views/Block/Menutree/bs_hamburger.tpl rename to src/system/BlocksModule/Resources/views/Block/Menutree/bs_hamburger.tpl diff --git a/src/system/Zikula/Module/BlocksModule/Resources/views/Block/Menutree/default.tpl b/src/system/BlocksModule/Resources/views/Block/Menutree/default.tpl similarity index 100% rename from src/system/Zikula/Module/BlocksModule/Resources/views/Block/Menutree/default.tpl rename to src/system/BlocksModule/Resources/views/Block/Menutree/default.tpl diff --git a/src/system/Zikula/Module/BlocksModule/Resources/views/Block/Menutree/help.tpl b/src/system/BlocksModule/Resources/views/Block/Menutree/help.tpl similarity index 100% rename from src/system/Zikula/Module/BlocksModule/Resources/views/Block/Menutree/help.tpl rename to src/system/BlocksModule/Resources/views/Block/Menutree/help.tpl diff --git a/src/system/Zikula/Module/BlocksModule/Resources/views/Block/Menutree/horizontal.tpl b/src/system/BlocksModule/Resources/views/Block/Menutree/horizontal.tpl similarity index 100% rename from src/system/Zikula/Module/BlocksModule/Resources/views/Block/Menutree/horizontal.tpl rename to src/system/BlocksModule/Resources/views/Block/Menutree/horizontal.tpl diff --git a/src/system/Zikula/Module/BlocksModule/Resources/views/Block/Menutree/modify.tpl b/src/system/BlocksModule/Resources/views/Block/Menutree/modify.tpl similarity index 100% rename from src/system/Zikula/Module/BlocksModule/Resources/views/Block/Menutree/modify.tpl rename to src/system/BlocksModule/Resources/views/Block/Menutree/modify.tpl diff --git a/src/system/Zikula/Module/BlocksModule/Resources/views/Block/Menutree/tree.tpl b/src/system/BlocksModule/Resources/views/Block/Menutree/tree.tpl similarity index 100% rename from src/system/Zikula/Module/BlocksModule/Resources/views/Block/Menutree/tree.tpl rename to src/system/BlocksModule/Resources/views/Block/Menutree/tree.tpl diff --git a/src/system/Zikula/Module/BlocksModule/Resources/views/Block/Menutree/vertical_left.tpl b/src/system/BlocksModule/Resources/views/Block/Menutree/vertical_left.tpl similarity index 100% rename from src/system/Zikula/Module/BlocksModule/Resources/views/Block/Menutree/vertical_left.tpl rename to src/system/BlocksModule/Resources/views/Block/Menutree/vertical_left.tpl diff --git a/src/system/Zikula/Module/BlocksModule/Resources/views/Block/Menutree/vertical_right.tpl b/src/system/BlocksModule/Resources/views/Block/Menutree/vertical_right.tpl similarity index 100% rename from src/system/Zikula/Module/BlocksModule/Resources/views/Block/Menutree/vertical_right.tpl rename to src/system/BlocksModule/Resources/views/Block/Menutree/vertical_right.tpl diff --git a/src/system/Zikula/Module/BlocksModule/Resources/views/Block/finclude_modify.tpl b/src/system/BlocksModule/Resources/views/Block/finclude_modify.tpl similarity index 100% rename from src/system/Zikula/Module/BlocksModule/Resources/views/Block/finclude_modify.tpl rename to src/system/BlocksModule/Resources/views/Block/finclude_modify.tpl diff --git a/src/system/Zikula/Module/BlocksModule/Resources/views/Block/menu.tpl b/src/system/BlocksModule/Resources/views/Block/menu.tpl similarity index 100% rename from src/system/Zikula/Module/BlocksModule/Resources/views/Block/menu.tpl rename to src/system/BlocksModule/Resources/views/Block/menu.tpl diff --git a/src/system/Zikula/Module/BlocksModule/Resources/views/Block/menu_modify.tpl b/src/system/BlocksModule/Resources/views/Block/menu_modify.tpl similarity index 100% rename from src/system/Zikula/Module/BlocksModule/Resources/views/Block/menu_modify.tpl rename to src/system/BlocksModule/Resources/views/Block/menu_modify.tpl diff --git a/src/system/Zikula/Module/BlocksModule/Resources/views/Block/pendingcontent.tpl b/src/system/BlocksModule/Resources/views/Block/pendingcontent.tpl similarity index 100% rename from src/system/Zikula/Module/BlocksModule/Resources/views/Block/pendingcontent.tpl rename to src/system/BlocksModule/Resources/views/Block/pendingcontent.tpl diff --git a/src/system/Zikula/Module/BlocksModule/Resources/views/Block/thelang.tpl b/src/system/BlocksModule/Resources/views/Block/thelang.tpl similarity index 100% rename from src/system/Zikula/Module/BlocksModule/Resources/views/Block/thelang.tpl rename to src/system/BlocksModule/Resources/views/Block/thelang.tpl diff --git a/src/system/Zikula/Module/BlocksModule/Resources/views/Block/thelang_modify.tpl b/src/system/BlocksModule/Resources/views/Block/thelang_modify.tpl similarity index 100% rename from src/system/Zikula/Module/BlocksModule/Resources/views/Block/thelang_modify.tpl rename to src/system/BlocksModule/Resources/views/Block/thelang_modify.tpl diff --git a/src/system/Zikula/Module/BlocksModule/Resources/views/Block/xslt_modify.tpl b/src/system/BlocksModule/Resources/views/Block/xslt_modify.tpl similarity index 100% rename from src/system/Zikula/Module/BlocksModule/Resources/views/Block/xslt_modify.tpl rename to src/system/BlocksModule/Resources/views/Block/xslt_modify.tpl diff --git a/src/system/Zikula/Module/BlocksModule/Resources/views/User/display.tpl b/src/system/BlocksModule/Resources/views/User/display.tpl similarity index 100% rename from src/system/Zikula/Module/BlocksModule/Resources/views/User/display.tpl rename to src/system/BlocksModule/Resources/views/User/display.tpl diff --git a/src/system/Zikula/Module/BlocksModule/Resources/views/plugins/block.menu.php b/src/system/BlocksModule/Resources/views/plugins/block.menu.php similarity index 100% rename from src/system/Zikula/Module/BlocksModule/Resources/views/plugins/block.menu.php rename to src/system/BlocksModule/Resources/views/plugins/block.menu.php diff --git a/src/system/Zikula/Module/BlocksModule/Resources/views/plugins/function.menutree.php b/src/system/BlocksModule/Resources/views/plugins/function.menutree.php similarity index 100% rename from src/system/Zikula/Module/BlocksModule/Resources/views/plugins/function.menutree.php rename to src/system/BlocksModule/Resources/views/plugins/function.menutree.php diff --git a/src/system/Zikula/Module/BlocksModule/ZikulaBlocksModule.php b/src/system/BlocksModule/ZikulaBlocksModule.php similarity index 93% rename from src/system/Zikula/Module/BlocksModule/ZikulaBlocksModule.php rename to src/system/BlocksModule/ZikulaBlocksModule.php index f6b1960ac2..00d77b55d5 100644 --- a/src/system/Zikula/Module/BlocksModule/ZikulaBlocksModule.php +++ b/src/system/BlocksModule/ZikulaBlocksModule.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\BlocksModule; +namespace Zikula\BlocksModule; use Zikula\Bundle\CoreBundle\Bundle\AbstractCoreModule; diff --git a/src/system/Zikula/Module/BlocksModule/composer.json b/src/system/BlocksModule/composer.json similarity index 75% rename from src/system/Zikula/Module/BlocksModule/composer.json rename to src/system/BlocksModule/composer.json index c7bfc3a723..4aaa8a4138 100644 --- a/src/system/Zikula/Module/BlocksModule/composer.json +++ b/src/system/BlocksModule/composer.json @@ -10,14 +10,14 @@ } ], "autoload": { - "psr-0": { "Zikula\\Module\\BlocksModule\\": "" } + "psr-4": { "Zikula\\BlocksModule\\": "" } }, "require": { "php": ">5.4.0" }, "extra": { "zikula": { - "class": "Zikula\\Module\\BlocksModule\\ZikulaBlocksModule" + "class": "Zikula\\BlocksModule\\ZikulaBlocksModule" } } } diff --git a/src/system/Zikula/Module/BlocksModule/phpunit.xml.dist b/src/system/BlocksModule/phpunit.xml.dist similarity index 100% rename from src/system/Zikula/Module/BlocksModule/phpunit.xml.dist rename to src/system/BlocksModule/phpunit.xml.dist diff --git a/src/system/Zikula/Module/BlocksModule/tables.php b/src/system/BlocksModule/tables.php similarity index 100% rename from src/system/Zikula/Module/BlocksModule/tables.php rename to src/system/BlocksModule/tables.php From 42c2b973187ccea6110886da18f9f659bcc6a19a Mon Sep 17 00:00:00 2001 From: Craig Heydenburg Date: Sun, 16 Aug 2015 18:00:15 -0400 Subject: [PATCH 04/35] convert CategoriesModule and ExtensionsModule to psr-4 --- composer.json | 4 ++- .../translations/routes.template.pot | 4 +-- src/app/ZikulaKernel.php | 4 +-- .../Controller/AjaxInstallController.php | 4 +-- .../Controller/AjaxUpgradeController.php | 2 +- .../Stage/Upgrade/InitStage.php | 4 +-- .../Entity/AbstractEntityCategory.php | 4 +-- .../Zikula/Core/FilterUtil/CategoryPlugin.php | 2 +- .../Zikula/Doctrine2/Entity/Category.php | 4 +-- .../Zikula/Form/Plugin/CategorySelector.php | 2 +- .../function.assignedcategorieslist.php | 2 +- src/lib/util/CategoryRegistryUtil.php | 2 +- src/lib/util/CategoryUtil.php | 26 +++++++++--------- .../Module => }/CategoriesModule/.gitignore | 0 .../Module => }/CategoriesModule/.travis.yml | 0 .../CategoriesModule/Api/AccountApi.php | 2 +- .../CategoriesModule/Api/AdminApi.php | 2 +- .../CategoriesModule/Api/UserApi.php | 2 +- .../CategoriesModuleInstaller.php | 14 +++++----- .../CategoriesModuleVersion.php | 2 +- .../Controller/AdminController.php | 6 ++-- .../Controller/AdminformController.php | 8 +++--- .../Controller/AjaxController.php | 12 ++++---- .../Controller/UserController.php | 6 ++-- .../Controller/UserformController.php | 6 ++-- .../Entity/CategoriesMapobj.php | 2 +- .../Entity/CategoryAttributeEntity.php | 2 +- .../Entity/CategoryEntity.php | 2 +- .../Entity/CategoryRegistryEntity.php | 2 +- .../CategoryDisplayTransformer.php | 2 +- .../CategoryModelTransformer.php | 4 +-- .../Form/Type/CategoryType.php | 8 +++--- .../CategoriesModule/GenericUtil.php | 6 ++-- .../Module => }/CategoriesModule/LICENSE | 0 .../Module => }/CategoriesModule/README.md | 0 .../Resources/config/routing.yml | 0 .../Resources/public/css/style.css | 0 .../Resources/public/images/admin.png | Bin .../public/js/categories_admin_edit.js | 0 .../public/js/categories_admin_view.js | 0 .../Resources/views/Admin/config.tpl | 0 .../Resources/views/Admin/copy.tpl | 0 .../Resources/views/Admin/delete.tpl | 0 .../Resources/views/Admin/edit.tpl | 0 .../Resources/views/Admin/move.tpl | 0 .../Resources/views/Admin/preferences.tpl | 0 .../Resources/views/Admin/registry_delete.tpl | 0 .../Resources/views/Admin/registry_edit.tpl | 0 .../Resources/views/Admin/view.tpl | 0 .../Resources/views/Ajax/delete.tpl | 0 .../Resources/views/Ajax/edit.tpl | 0 .../filter_layout_customizations.html.twig | 0 .../Resources/views/User/edit.tpl | 0 .../Resources/views/User/editcategories.tpl | 0 .../Resources/views/User/list.tpl | 0 .../Resources/views/editattributes.tpl | 0 .../ZikulaCategoriesModule.php | 2 +- .../CategoriesModule/composer.json | 4 +-- .../CategoriesModule/phpunit.xml.dist | 0 .../Module => }/CategoriesModule/tables.php | 0 .../Module => }/ExtensionsModule/.gitignore | 0 .../Module => }/ExtensionsModule/.travis.yml | 0 .../ExtensionsModule/Api/AdminApi.php | 4 +-- .../Controller/AdminController.php | 4 +-- .../Controller/AdminpluginController.php | 2 +- .../Controller/AjaxController.php | 2 +- .../ExtensionsModuleInstaller.php | 4 +-- .../ExtensionsModuleVersion.php | 2 +- .../Module => }/ExtensionsModule/HookUI.php | 4 +-- .../Module => }/ExtensionsModule/LICENSE | 0 .../Module => }/ExtensionsModule/README.md | 0 .../Resources/config/routing.yml | 0 .../Resources/public/css/hooks.css | 0 .../Resources/public/images/admin.png | Bin .../Resources/public/js/hookui.js | 0 .../Resources/views/Admin/HookUi/hooks.tpl | 0 .../views/Admin/HookUi/moduleservices.tpl | 0 .../Resources/views/Admin/HookUi/provider.tpl | 0 .../views/Admin/HookUi/subscriber.tpl | 0 .../Resources/views/Admin/compinfo.tpl | 0 .../Resources/views/Admin/initialise.tpl | 0 .../Resources/views/Admin/modify.tpl | 0 .../Resources/views/Admin/modifyconfig.tpl | 0 .../views/Admin/regenerate_errors.tpl | 0 .../Resources/views/Admin/remove.tpl | 0 .../Resources/views/Admin/view.tpl | 0 .../Resources/views/Admin/viewPlugins.tpl | 0 .../Module => }/ExtensionsModule/Util.php | 2 +- .../ZikulaExtensionsModule.php | 2 +- .../ExtensionsModule/composer.json | 4 +-- .../ExtensionsModule/phpunit.xml.dist | 0 .../Module => }/ExtensionsModule/tables.php | 0 .../Listener/InstallerListener.php | 2 +- 93 files changed, 96 insertions(+), 94 deletions(-) rename src/system/{Zikula/Module => }/CategoriesModule/.gitignore (100%) rename src/system/{Zikula/Module => }/CategoriesModule/.travis.yml (100%) rename src/system/{Zikula/Module => }/CategoriesModule/Api/AccountApi.php (97%) rename src/system/{Zikula/Module => }/CategoriesModule/Api/AdminApi.php (97%) rename src/system/{Zikula/Module => }/CategoriesModule/Api/UserApi.php (98%) rename src/system/{Zikula/Module => }/CategoriesModule/CategoriesModuleInstaller.php (98%) rename src/system/{Zikula/Module => }/CategoriesModule/CategoriesModuleVersion.php (96%) rename src/system/{Zikula/Module => }/CategoriesModule/Controller/AdminController.php (98%) rename src/system/{Zikula/Module => }/CategoriesModule/Controller/AdminformController.php (98%) rename src/system/{Zikula/Module => }/CategoriesModule/Controller/AjaxController.php (97%) rename src/system/{Zikula/Module => }/CategoriesModule/Controller/UserController.php (98%) rename src/system/{Zikula/Module => }/CategoriesModule/Controller/UserformController.php (98%) rename src/system/{Zikula/Module => }/CategoriesModule/Entity/CategoriesMapobj.php (99%) rename src/system/{Zikula/Module => }/CategoriesModule/Entity/CategoryAttributeEntity.php (98%) rename src/system/{Zikula/Module => }/CategoriesModule/Entity/CategoryEntity.php (99%) rename src/system/{Zikula/Module => }/CategoriesModule/Entity/CategoryRegistryEntity.php (99%) rename src/system/{Zikula/Module => }/CategoriesModule/Form/DataTransformer/CategoryDisplayTransformer.php (94%) rename src/system/{Zikula/Module => }/CategoriesModule/Form/DataTransformer/CategoryModelTransformer.php (91%) rename src/system/{Zikula/Module => }/CategoriesModule/Form/Type/CategoryType.php (92%) rename src/system/{Zikula/Module => }/CategoriesModule/GenericUtil.php (95%) rename src/system/{Zikula/Module => }/CategoriesModule/LICENSE (100%) rename src/system/{Zikula/Module => }/CategoriesModule/README.md (100%) rename src/system/{Zikula/Module => }/CategoriesModule/Resources/config/routing.yml (100%) rename src/system/{Zikula/Module => }/CategoriesModule/Resources/public/css/style.css (100%) rename src/system/{Zikula/Module => }/CategoriesModule/Resources/public/images/admin.png (100%) rename src/system/{Zikula/Module => }/CategoriesModule/Resources/public/js/categories_admin_edit.js (100%) rename src/system/{Zikula/Module => }/CategoriesModule/Resources/public/js/categories_admin_view.js (100%) rename src/system/{Zikula/Module => }/CategoriesModule/Resources/views/Admin/config.tpl (100%) rename src/system/{Zikula/Module => }/CategoriesModule/Resources/views/Admin/copy.tpl (100%) rename src/system/{Zikula/Module => }/CategoriesModule/Resources/views/Admin/delete.tpl (100%) rename src/system/{Zikula/Module => }/CategoriesModule/Resources/views/Admin/edit.tpl (100%) rename src/system/{Zikula/Module => }/CategoriesModule/Resources/views/Admin/move.tpl (100%) rename src/system/{Zikula/Module => }/CategoriesModule/Resources/views/Admin/preferences.tpl (100%) rename src/system/{Zikula/Module => }/CategoriesModule/Resources/views/Admin/registry_delete.tpl (100%) rename src/system/{Zikula/Module => }/CategoriesModule/Resources/views/Admin/registry_edit.tpl (100%) rename src/system/{Zikula/Module => }/CategoriesModule/Resources/views/Admin/view.tpl (100%) rename src/system/{Zikula/Module => }/CategoriesModule/Resources/views/Ajax/delete.tpl (100%) rename src/system/{Zikula/Module => }/CategoriesModule/Resources/views/Ajax/edit.tpl (100%) rename src/system/{Zikula/Module => }/CategoriesModule/Resources/views/Form/filter_layout_customizations.html.twig (100%) rename src/system/{Zikula/Module => }/CategoriesModule/Resources/views/User/edit.tpl (100%) rename src/system/{Zikula/Module => }/CategoriesModule/Resources/views/User/editcategories.tpl (100%) rename src/system/{Zikula/Module => }/CategoriesModule/Resources/views/User/list.tpl (100%) rename src/system/{Zikula/Module => }/CategoriesModule/Resources/views/editattributes.tpl (100%) rename src/system/{Zikula/Module => }/CategoriesModule/ZikulaCategoriesModule.php (93%) rename src/system/{Zikula/Module => }/CategoriesModule/composer.json (73%) rename src/system/{Zikula/Module => }/CategoriesModule/phpunit.xml.dist (100%) rename src/system/{Zikula/Module => }/CategoriesModule/tables.php (100%) rename src/system/{Zikula/Module => }/ExtensionsModule/.gitignore (100%) rename src/system/{Zikula/Module => }/ExtensionsModule/.travis.yml (100%) rename src/system/{Zikula/Module => }/ExtensionsModule/Api/AdminApi.php (99%) rename src/system/{Zikula/Module => }/ExtensionsModule/Controller/AdminController.php (99%) rename src/system/{Zikula/Module => }/ExtensionsModule/Controller/AdminpluginController.php (98%) rename src/system/{Zikula/Module => }/ExtensionsModule/Controller/AjaxController.php (99%) rename src/system/{Zikula/Module => }/ExtensionsModule/ExtensionsModuleInstaller.php (97%) rename src/system/{Zikula/Module => }/ExtensionsModule/ExtensionsModuleVersion.php (96%) rename src/system/{Zikula/Module => }/ExtensionsModule/HookUI.php (71%) rename src/system/{Zikula/Module => }/ExtensionsModule/LICENSE (100%) rename src/system/{Zikula/Module => }/ExtensionsModule/README.md (100%) rename src/system/{Zikula/Module => }/ExtensionsModule/Resources/config/routing.yml (100%) rename src/system/{Zikula/Module => }/ExtensionsModule/Resources/public/css/hooks.css (100%) rename src/system/{Zikula/Module => }/ExtensionsModule/Resources/public/images/admin.png (100%) rename src/system/{Zikula/Module => }/ExtensionsModule/Resources/public/js/hookui.js (100%) rename src/system/{Zikula/Module => }/ExtensionsModule/Resources/views/Admin/HookUi/hooks.tpl (100%) rename src/system/{Zikula/Module => }/ExtensionsModule/Resources/views/Admin/HookUi/moduleservices.tpl (100%) rename src/system/{Zikula/Module => }/ExtensionsModule/Resources/views/Admin/HookUi/provider.tpl (100%) rename src/system/{Zikula/Module => }/ExtensionsModule/Resources/views/Admin/HookUi/subscriber.tpl (100%) rename src/system/{Zikula/Module => }/ExtensionsModule/Resources/views/Admin/compinfo.tpl (100%) rename src/system/{Zikula/Module => }/ExtensionsModule/Resources/views/Admin/initialise.tpl (100%) rename src/system/{Zikula/Module => }/ExtensionsModule/Resources/views/Admin/modify.tpl (100%) rename src/system/{Zikula/Module => }/ExtensionsModule/Resources/views/Admin/modifyconfig.tpl (100%) rename src/system/{Zikula/Module => }/ExtensionsModule/Resources/views/Admin/regenerate_errors.tpl (100%) rename src/system/{Zikula/Module => }/ExtensionsModule/Resources/views/Admin/remove.tpl (100%) rename src/system/{Zikula/Module => }/ExtensionsModule/Resources/views/Admin/view.tpl (100%) rename src/system/{Zikula/Module => }/ExtensionsModule/Resources/views/Admin/viewPlugins.tpl (100%) rename src/system/{Zikula/Module => }/ExtensionsModule/Util.php (98%) rename src/system/{Zikula/Module => }/ExtensionsModule/ZikulaExtensionsModule.php (93%) rename src/system/{Zikula/Module => }/ExtensionsModule/composer.json (73%) rename src/system/{Zikula/Module => }/ExtensionsModule/phpunit.xml.dist (100%) rename src/system/{Zikula/Module => }/ExtensionsModule/tables.php (100%) diff --git a/composer.json b/composer.json index 614c27d2e0..ba3938e628 100644 --- a/composer.json +++ b/composer.json @@ -19,7 +19,9 @@ "Zikula\\RoutesModule\\": "src/system/ZikulaRoutesModule", "Zikula\\ThemeModule\\": "src/system/ThemeModule", "Zikula\\AdminModule\\": "src/system/AdminModule", - "Zikula\\BlocksModule\\": "src/system/BlocksModule" + "Zikula\\BlocksModule\\": "src/system/BlocksModule", + "Zikula\\CategoriesModule\\": "src/system/CategoriesModule", + "Zikula\\ExtensionsModule\\": "src/system/ExtensionsModule" }, "classmap": [ "src/lib/util/", diff --git a/src/app/Resources/translations/routes.template.pot b/src/app/Resources/translations/routes.template.pot index 464ea6d937..86357efbb1 100644 --- a/src/app/Resources/translations/routes.template.pot +++ b/src/app/Resources/translations/routes.template.pot @@ -372,7 +372,7 @@ msgstr "" msgid "zikulaextensionsmodule_admin_deactivateplugin" msgstr "" # Desc: /hooks/{moduleName} -# Meaning: Route Controller and method: Zikula\Module\ExtensionsModule\Controller\AdminController::hooksAction +# Meaning: Route Controller and method: Zikula\ExtensionsModule\Controller\AdminController::hooksAction msgid "zikulaextensionsmodule_admin_hooks" msgstr "" # Desc: / @@ -396,7 +396,7 @@ msgstr "" msgid "zikulaextensionsmodule_admin_modifyconfig" msgstr "" # Desc: /moduleservices/{moduleName} -# Meaning: Route Controller and method: Zikula\Module\ExtensionsModule\Controller\AdminController::moduleServicesAction +# Meaning: Route Controller and method: Zikula\ExtensionsModule\Controller\AdminController::moduleServicesAction msgid "zikulaextensionsmodule_admin_moduleservices" msgstr "" # Desc: /modules/remove diff --git a/src/app/ZikulaKernel.php b/src/app/ZikulaKernel.php index c3a1ee7c9d..b1cb8268cc 100644 --- a/src/app/ZikulaKernel.php +++ b/src/app/ZikulaKernel.php @@ -65,8 +65,8 @@ private function registerCoreModules(array &$bundles) { $bundles[] = new Zikula\AdminModule\ZikulaAdminModule(); $bundles[] = new Zikula\BlocksModule\ZikulaBlocksModule(); - $bundles[] = new Zikula\Module\CategoriesModule\ZikulaCategoriesModule(); - $bundles[] = new Zikula\Module\ExtensionsModule\ZikulaExtensionsModule(); + $bundles[] = new Zikula\CategoriesModule\ZikulaCategoriesModule(); + $bundles[] = new Zikula\ExtensionsModule\ZikulaExtensionsModule(); $bundles[] = new Zikula\Module\GroupsModule\ZikulaGroupsModule(); $bundles[] = new Zikula\Module\MailerModule\ZikulaMailerModule(); $bundles[] = new Zikula\Module\PageLockModule\ZikulaPageLockModule(); diff --git a/src/lib/Zikula/Bundle/CoreInstallerBundle/Controller/AjaxInstallController.php b/src/lib/Zikula/Bundle/CoreInstallerBundle/Controller/AjaxInstallController.php index bfc99f25a5..d9b5aec6d1 100644 --- a/src/lib/Zikula/Bundle/CoreInstallerBundle/Controller/AjaxInstallController.php +++ b/src/lib/Zikula/Bundle/CoreInstallerBundle/Controller/AjaxInstallController.php @@ -22,8 +22,8 @@ use Symfony\Component\HttpFoundation\Request; use Zikula\Bundle\CoreBundle\Bundle\Bootstrap as CoreBundleBootstrap; use Zikula\Bundle\CoreBundle\Bundle\Helper\BootstrapHelper as CoreBundleBootstrapHelper; -use Zikula\Module\ExtensionsModule\Api\AdminApi as ExtensionsAdminApi; -use Zikula\Module\ExtensionsModule\ZikulaExtensionsModule; +use Zikula\ExtensionsModule\Api\AdminApi as ExtensionsAdminApi; +use Zikula\ExtensionsModule\ZikulaExtensionsModule; use Zikula\Module\UsersModule\Constant as UsersConstant; use Zikula\Bundle\CoreBundle\YamlDumper; use Zikula\Core\Event\ModuleStateEvent; diff --git a/src/lib/Zikula/Bundle/CoreInstallerBundle/Controller/AjaxUpgradeController.php b/src/lib/Zikula/Bundle/CoreInstallerBundle/Controller/AjaxUpgradeController.php index cdd83d9311..21b0823223 100644 --- a/src/lib/Zikula/Bundle/CoreInstallerBundle/Controller/AjaxUpgradeController.php +++ b/src/lib/Zikula/Bundle/CoreInstallerBundle/Controller/AjaxUpgradeController.php @@ -100,7 +100,7 @@ private function installRoutesModule() } // regenerate modules list - $modApi = new \Zikula\Module\ExtensionsModule\Api\AdminApi($kernel->getContainer(), new \Zikula\Module\ExtensionsModule\ZikulaExtensionsModule()); + $modApi = new \Zikula\ExtensionsModule\Api\AdminApi($kernel->getContainer(), new \Zikula\ExtensionsModule\ZikulaExtensionsModule()); \ModUtil::apiFunc('ZikulaExtensionsModule', 'admin', 'regenerate', array('filemodules' => $modApi->getfilemodules())); // determine module id diff --git a/src/lib/Zikula/Bundle/CoreInstallerBundle/Stage/Upgrade/InitStage.php b/src/lib/Zikula/Bundle/CoreInstallerBundle/Stage/Upgrade/InitStage.php index 6c1322f6a1..0ea0cd42ec 100644 --- a/src/lib/Zikula/Bundle/CoreInstallerBundle/Stage/Upgrade/InitStage.php +++ b/src/lib/Zikula/Bundle/CoreInstallerBundle/Stage/Upgrade/InitStage.php @@ -115,7 +115,7 @@ private function init() foreach ($modules as $module) { $path = realpath($kernel->getRootDir() . '/../' . $module['url']); if (is_dir($path)) { - $meta = \Zikula\Module\ExtensionsModule\Util::getVersionMeta($module['name']); + $meta = \Zikula\ExtensionsModule\Util::getVersionMeta($module['name']); $conn->executeQuery("UPDATE modules SET url = '$meta[url]' WHERE id = $modules[id]"); } } @@ -142,7 +142,7 @@ private function upgradeUsersModule() $installerInstance->upgrade($oldModuleInfo['version']); $versionInstance = new \Zikula\Module\UsersModule\UsersModuleVersion($module); $metaData = $versionInstance->getMetaData(); - $item = $this->container->get('doctrine.entitymanager')->getRepository(\Zikula\Module\ExtensionsModule\Api\AdminApi::EXTENSION_ENTITY)->find($oldModuleInfo['id']); + $item = $this->container->get('doctrine.entitymanager')->getRepository(\Zikula\ExtensionsModule\Api\AdminApi::EXTENSION_ENTITY)->find($oldModuleInfo['id']); $item['version'] = $metaData['version']; $item['state'] = \ModUtil::STATE_ACTIVE; $this->container->get('doctrine.entitymanager')->flush(); diff --git a/src/lib/Zikula/Core/Doctrine/Entity/AbstractEntityCategory.php b/src/lib/Zikula/Core/Doctrine/Entity/AbstractEntityCategory.php index f7c9e85b31..d085f9bdb6 100644 --- a/src/lib/Zikula/Core/Doctrine/Entity/AbstractEntityCategory.php +++ b/src/lib/Zikula/Core/Doctrine/Entity/AbstractEntityCategory.php @@ -16,7 +16,7 @@ use Doctrine\ORM\Mapping as ORM; use Zikula\Core\Doctrine\EntityAccess; -use Zikula\Module\CategoriesModule\Entity\CategoryEntity; +use Zikula\CategoriesModule\Entity\CategoryEntity; /** * Base class of many-to-many association between any entity and Category. @@ -40,7 +40,7 @@ abstract class AbstractEntityCategory extends EntityAccess private $categoryRegistryId; /** - * @ORM\ManyToOne(targetEntity="Zikula\Module\CategoriesModule\Entity\CategoryEntity") + * @ORM\ManyToOne(targetEntity="Zikula\CategoriesModule\Entity\CategoryEntity") * @ORM\JoinColumn(name="categoryId", referencedColumnName="id") * @var CategoryEntity */ diff --git a/src/lib/Zikula/Core/FilterUtil/CategoryPlugin.php b/src/lib/Zikula/Core/FilterUtil/CategoryPlugin.php index eed90c176f..caefbe69ca 100644 --- a/src/lib/Zikula/Core/FilterUtil/CategoryPlugin.php +++ b/src/lib/Zikula/Core/FilterUtil/CategoryPlugin.php @@ -17,7 +17,7 @@ use CategoryUtil; use Doctrine\ORM\Query\Expr\Base as BaseExpr; use Zikula\Component\FilterUtil; -use Zikula\Module\CategoriesModule\Entity\CategoryRegistryEntity; +use Zikula\CategoriesModule\Entity\CategoryRegistryEntity; /** * FilterUtil category filter plugin diff --git a/src/lib/legacy/Zikula/Doctrine2/Entity/Category.php b/src/lib/legacy/Zikula/Doctrine2/Entity/Category.php index 281851113d..e650719f42 100644 --- a/src/lib/legacy/Zikula/Doctrine2/Entity/Category.php +++ b/src/lib/legacy/Zikula/Doctrine2/Entity/Category.php @@ -14,7 +14,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\ORM\Mapping as ORM; -use Zikula\Module\CategoriesModule\Entity\CategoryAttributeEntity; +use Zikula\CategoriesModule\Entity\CategoryAttributeEntity; /** * Category doctrine2 entity. @@ -108,7 +108,7 @@ class Zikula_Doctrine2_Entity_Category extends Zikula_EntityAccess private $status; /** - * @ORM\OneToMany(targetEntity="Zikula\Module\CategoriesModule\Entity\CategoryAttributeEntity", + * @ORM\OneToMany(targetEntity="Zikula\CategoriesModule\Entity\CategoryAttributeEntity", * mappedBy="category", * cascade={"all"}, * orphanRemoval=true, diff --git a/src/lib/legacy/Zikula/Form/Plugin/CategorySelector.php b/src/lib/legacy/Zikula/Form/Plugin/CategorySelector.php index 49051a0deb..8da980f6de 100644 --- a/src/lib/legacy/Zikula/Form/Plugin/CategorySelector.php +++ b/src/lib/legacy/Zikula/Form/Plugin/CategorySelector.php @@ -278,7 +278,7 @@ public function saveValue(Zikula_Form_View $view, &$data) $categoryEntityClass = 'Zikula_Doctrine2_Entity_Category'; if (strpos($entityClass, '\\') !== false) { // if using namespaces, use new base class - $categoryEntityClass = 'Zikula\Module\CategoriesModule\Entity\CategoryEntity'; + $categoryEntityClass = 'Zikula\CategoriesModule\Entity\CategoryEntity'; } foreach ($selectedValues as $selectedValue) { diff --git a/src/lib/legacy/viewplugins/function.assignedcategorieslist.php b/src/lib/legacy/viewplugins/function.assignedcategorieslist.php index 16fe81f848..dce9969992 100644 --- a/src/lib/legacy/viewplugins/function.assignedcategorieslist.php +++ b/src/lib/legacy/viewplugins/function.assignedcategorieslist.php @@ -68,7 +68,7 @@ function smarty_function_assignedcategorieslist($params, Zikula_View $view) } $name = $category->getCategory()->getName(); $display_name = $category->getCategory()->getDisplay_name(); - } elseif ($category instanceof \Zikula\Module\CategoriesModule\Entity\CategoryEntity) { + } elseif ($category instanceof \Zikula\CategoriesModule\Entity\CategoryEntity) { $name = $category->getName(); $display_name = $category->getDisplay_name(); } diff --git a/src/lib/util/CategoryRegistryUtil.php b/src/lib/util/CategoryRegistryUtil.php index cdfc7def96..f5468b4e3f 100644 --- a/src/lib/util/CategoryRegistryUtil.php +++ b/src/lib/util/CategoryRegistryUtil.php @@ -12,7 +12,7 @@ * information regarding copyright and licensing. */ -use Zikula\Module\CategoriesModule\Entity\CategoryRegistryEntity; +use Zikula\CategoriesModule\Entity\CategoryRegistryEntity; /** * CategoryRegistryUtil diff --git a/src/lib/util/CategoryUtil.php b/src/lib/util/CategoryUtil.php index 681732c167..8567aa1cc1 100644 --- a/src/lib/util/CategoryUtil.php +++ b/src/lib/util/CategoryUtil.php @@ -47,7 +47,7 @@ public static function createCategory($rootPath, $name, $value=null, $displaynam $lang = ZLanguage::getLanguageCode(); - /** @var \Zikula\Module\CategoriesModule\Entity\CategoryEntity $rootCat */ + /** @var \Zikula\CategoriesModule\Entity\CategoryEntity $rootCat */ $rootCat = self::getCategoryByPath($rootPath); if (!$rootCat) { return LogUtil::registerError(__f("Error! Non-existing root category '%s' received", $rootPath)); @@ -55,7 +55,7 @@ public static function createCategory($rootPath, $name, $value=null, $displaynam $checkCat = self::getCategoryByPath("$rootPath/$name"); if (!$checkCat) { - $cat = new \Zikula\Module\CategoriesModule\Entity\CategoryEntity(); + $cat = new \Zikula\CategoriesModule\Entity\CategoryEntity(); $em = ServiceUtil::get('doctrine.entitymanager'); $em->persist($cat); $data = array(); @@ -158,7 +158,7 @@ public static function getCategories($where = '', $sort = '', $assocKey = '', $c $em = \ServiceUtil::get('doctrine.entitymanager'); - $dql = "SELECT $columns FROM Zikula\Module\CategoriesModule\Entity\CategoryEntity c $where $sort"; + $dql = "SELECT $columns FROM Zikula\CategoriesModule\Entity\CategoryEntity c $where $sort"; $query = $em->createQuery($dql); $categories = $query->getResult(); @@ -496,12 +496,12 @@ public static function deleteCategoryByID($cid) { $em = \ServiceUtil::get('doctrine.entitymanager'); - $dql = "DELETE FROM Zikula\Module\CategoriesModule\Entity\CategoryEntity c WHERE c.id = :cid"; + $dql = "DELETE FROM Zikula\CategoriesModule\Entity\CategoryEntity c WHERE c.id = :cid"; $query = $em->createQuery($dql); $query->setParameter('cid', $cid); $query->getResult(); - $dql = "DELETE FROM Zikula\Module\CategoriesModule\Entity\CategoryAttributeEntity a WHERE a.category = :cid"; + $dql = "DELETE FROM Zikula\CategoriesModule\Entity\CategoryAttributeEntity a WHERE a.category = :cid"; $query = $em->createQuery($dql); $query->setParameter('cid', $cid); $query->getResult(); @@ -523,7 +523,7 @@ public static function deleteCategoriesByPath($apath, $field = 'ipath') $em = \ServiceUtil::get('doctrine.entitymanager'); - $dql = "SELECT c.id FROM Zikula\Module\CategoriesModule\Entity\CategoryEntity c WHERE c.$field LIKE :apath"; + $dql = "SELECT c.id FROM Zikula\CategoriesModule\Entity\CategoryEntity c WHERE c.$field LIKE :apath"; $query = $em->createQuery($dql); $query->setParameter('apath', "{$apath}%"); $categories = $query->getResult(); @@ -610,7 +610,7 @@ public static function moveCategoriesByPath($apath, $newparent_id, $field = 'ipa $dql = " SELECT c - FROM Zikula\Module\CategoriesModule\Entity\CategoryEntity c + FROM Zikula\CategoriesModule\Entity\CategoryEntity c WHERE c.$pathField = :apath OR c.$pathField LIKE :apathwc"; $query = $em->createQuery($dql); $query->setParameter('apath', $apath); @@ -626,9 +626,9 @@ public static function moveCategoriesByPath($apath, $newparent_id, $field = 'ipa $pid = $cats[0]['id']; if ($includeRoot) { - $dql = "UPDATE Zikula\Module\CategoriesModule\Entity\CategoryEntity c SET c.parent = :newparent WHERE c.id = :pid"; + $dql = "UPDATE Zikula\CategoriesModule\Entity\CategoryEntity c SET c.parent = :newparent WHERE c.id = :pid"; } else { - $dql = "UPDATE Zikula\Module\CategoriesModule\Entity\CategoryEntity c SET c.parent = :newparent WHERE c.parent = :pid"; + $dql = "UPDATE Zikula\CategoriesModule\Entity\CategoryEntity c SET c.parent = :newparent WHERE c.parent = :pid"; } $query = $em->createQuery($dql); $query->setParameter('newparent', $newparent_id); @@ -769,7 +769,7 @@ public static function copyCategoriesByPath($apath, $newparent_id, $field = 'ipa $cat['id'] = ''; $cat['parent'] = isset($oldToNewID[$cat['parent']['id']]) ? $oldToNewID[$cat['parent']['id']] : $em->getReference('ZikulaCategoriesModule:CategoryEntity', $newParent['id']); - $catObj = new Zikula\Module\CategoriesModule\Entity\CategoryEntity; + $catObj = new Zikula\CategoriesModule\Entity\CategoryEntity; $catObj->merge($cat); $em->persist($catObj); $em->flush(); @@ -971,10 +971,10 @@ public static function getCategoryTreeJqueryJS($cats, $doReplaceRootCat = true, /** * create a JSON formatted object compatible with jsTree node structure for one category (includes children) * - * @param \Zikula\Module\CategoriesModule\Entity\CategoryEntity $category + * @param \Zikula\CategoriesModule\Entity\CategoryEntity $category * @return array */ - public static function getJsTreeNodeFromCategory(\Zikula\Module\CategoriesModule\Entity\CategoryEntity $category) + public static function getJsTreeNodeFromCategory(\Zikula\CategoriesModule\Entity\CategoryEntity $category) { $lang = ZLanguage::getLanguageCode(); return array( @@ -1598,7 +1598,7 @@ public static function rebuildPaths($field = 'path', $sourceField = 'name', $lea foreach ($cats as $k => $v) { if (isset($v[$field]) && isset($paths[$k]) && ($v[$field] != $paths[$k])) { - $dql = "UPDATE Zikula\Module\CategoriesModule\Entity\CategoryEntity c SET c.$field = :path WHERE c.id = :id"; + $dql = "UPDATE Zikula\CategoriesModule\Entity\CategoryEntity c SET c.$field = :path WHERE c.id = :id"; $query = $em->createQuery($dql); $query->setParameter('path', $paths[$k]); $query->setParameter('id', $k); diff --git a/src/system/Zikula/Module/CategoriesModule/.gitignore b/src/system/CategoriesModule/.gitignore similarity index 100% rename from src/system/Zikula/Module/CategoriesModule/.gitignore rename to src/system/CategoriesModule/.gitignore diff --git a/src/system/Zikula/Module/CategoriesModule/.travis.yml b/src/system/CategoriesModule/.travis.yml similarity index 100% rename from src/system/Zikula/Module/CategoriesModule/.travis.yml rename to src/system/CategoriesModule/.travis.yml diff --git a/src/system/Zikula/Module/CategoriesModule/Api/AccountApi.php b/src/system/CategoriesModule/Api/AccountApi.php similarity index 97% rename from src/system/Zikula/Module/CategoriesModule/Api/AccountApi.php rename to src/system/CategoriesModule/Api/AccountApi.php index 6da34e99e2..0283d81ce7 100644 --- a/src/system/Zikula/Module/CategoriesModule/Api/AccountApi.php +++ b/src/system/CategoriesModule/Api/AccountApi.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\CategoriesModule\Api; +namespace Zikula\CategoriesModule\Api; use System; use SessionUtil; diff --git a/src/system/Zikula/Module/CategoriesModule/Api/AdminApi.php b/src/system/CategoriesModule/Api/AdminApi.php similarity index 97% rename from src/system/Zikula/Module/CategoriesModule/Api/AdminApi.php rename to src/system/CategoriesModule/Api/AdminApi.php index eae2770c05..9dbb9f38e4 100644 --- a/src/system/Zikula/Module/CategoriesModule/Api/AdminApi.php +++ b/src/system/CategoriesModule/Api/AdminApi.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\CategoriesModule\Api; +namespace Zikula\CategoriesModule\Api; use ModUtil; use SecurityUtil; diff --git a/src/system/Zikula/Module/CategoriesModule/Api/UserApi.php b/src/system/CategoriesModule/Api/UserApi.php similarity index 98% rename from src/system/Zikula/Module/CategoriesModule/Api/UserApi.php rename to src/system/CategoriesModule/Api/UserApi.php index a1e8e3fa7c..a1a8c8c9b8 100644 --- a/src/system/Zikula/Module/CategoriesModule/Api/UserApi.php +++ b/src/system/CategoriesModule/Api/UserApi.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\CategoriesModule\Api; +namespace Zikula\CategoriesModule\Api; use LogUtil; use CategoryUtil; diff --git a/src/system/Zikula/Module/CategoriesModule/CategoriesModuleInstaller.php b/src/system/CategoriesModule/CategoriesModuleInstaller.php similarity index 98% rename from src/system/Zikula/Module/CategoriesModule/CategoriesModuleInstaller.php rename to src/system/CategoriesModule/CategoriesModuleInstaller.php index 22cca234b5..888cbb2ff4 100644 --- a/src/system/Zikula/Module/CategoriesModule/CategoriesModuleInstaller.php +++ b/src/system/CategoriesModule/CategoriesModuleInstaller.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\CategoriesModule; +namespace Zikula\CategoriesModule; use DBUtil; use Doctrine_Manager; @@ -19,7 +19,7 @@ use DoctrineHelper; use DataUtil; use ZLanguage; -use Zikula\Module\CategoriesModule\Entity\CategoryEntity; +use Zikula\CategoriesModule\Entity\CategoryEntity; /** * Installation and upgrade routines for the categories module @@ -35,9 +35,9 @@ public function install() { // create tables $classes = array( - 'Zikula\Module\CategoriesModule\Entity\CategoryEntity', - 'Zikula\Module\CategoriesModule\Entity\CategoryAttributeEntity', - 'Zikula\Module\CategoriesModule\Entity\CategoryRegistryEntity' + 'Zikula\CategoriesModule\Entity\CategoryEntity', + 'Zikula\CategoriesModule\Entity\CategoryAttributeEntity', + 'Zikula\CategoriesModule\Entity\CategoryRegistryEntity' ); try { @@ -52,7 +52,7 @@ public function install() * is being removed at 2.0.0 */ try { - DoctrineHelper::createSchema($this->entityManager, array('Zikula\Module\CategoriesModule\Entity\CategoriesMapobj')); + DoctrineHelper::createSchema($this->entityManager, array('Zikula\CategoriesModule\Entity\CategoriesMapobj')); } catch (\Exception $e) { return false; } @@ -108,7 +108,7 @@ public function upgrade($oldversion) case '1.2.1': case '1.2.2': try { - DoctrineHelper::createSchema($this->entityManager, array('Zikula\Module\CategoriesModule\Entity\CategoryAttributeEntity')); + DoctrineHelper::createSchema($this->entityManager, array('Zikula\CategoriesModule\Entity\CategoryAttributeEntity')); } catch (\Exception $e) { } // rename old tablename column for Core 1.4.0 diff --git a/src/system/Zikula/Module/CategoriesModule/CategoriesModuleVersion.php b/src/system/CategoriesModule/CategoriesModuleVersion.php similarity index 96% rename from src/system/Zikula/Module/CategoriesModule/CategoriesModuleVersion.php rename to src/system/CategoriesModule/CategoriesModuleVersion.php index 2b2254f867..64cfe5ca4b 100644 --- a/src/system/Zikula/Module/CategoriesModule/CategoriesModuleVersion.php +++ b/src/system/CategoriesModule/CategoriesModuleVersion.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\CategoriesModule; +namespace Zikula\CategoriesModule; /** * Version information for the categories module diff --git a/src/system/Zikula/Module/CategoriesModule/Controller/AdminController.php b/src/system/CategoriesModule/Controller/AdminController.php similarity index 98% rename from src/system/Zikula/Module/CategoriesModule/Controller/AdminController.php rename to src/system/CategoriesModule/Controller/AdminController.php index e02c6d30be..9694bbedf1 100644 --- a/src/system/Zikula/Module/CategoriesModule/Controller/AdminController.php +++ b/src/system/CategoriesModule/Controller/AdminController.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\CategoriesModule\Controller; +namespace Zikula\CategoriesModule\Controller; use Zikula_View; use FormUtil; @@ -20,8 +20,8 @@ use ZLanguage; use StringUtil; use System; -use Zikula\Module\CategoriesModule\Entity\CategoryEntity; -use Zikula\Module\CategoriesModule\Entity\CategoryRegistryEntity; +use Zikula\CategoriesModule\Entity\CategoryEntity; +use Zikula\CategoriesModule\Entity\CategoryRegistryEntity; use Symfony\Component\Security\Core\Exception\AccessDeniedException; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; diff --git a/src/system/Zikula/Module/CategoriesModule/Controller/AdminformController.php b/src/system/CategoriesModule/Controller/AdminformController.php similarity index 98% rename from src/system/Zikula/Module/CategoriesModule/Controller/AdminformController.php rename to src/system/CategoriesModule/Controller/AdminformController.php index 71182b447e..c4e206348a 100644 --- a/src/system/Zikula/Module/CategoriesModule/Controller/AdminformController.php +++ b/src/system/CategoriesModule/Controller/AdminformController.php @@ -11,14 +11,14 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\CategoriesModule\Controller; +namespace Zikula\CategoriesModule\Controller; use SecurityUtil; use System; use CategoryUtil; -use Zikula\Module\CategoriesModule\GenericUtil; -use Zikula\Module\CategoriesModule\Entity\CategoryEntity; -use Zikula\Module\CategoriesModule\Entity\CategoryRegistryEntity; +use Zikula\CategoriesModule\GenericUtil; +use Zikula\CategoriesModule\Entity\CategoryEntity; +use Zikula\CategoriesModule\Entity\CategoryRegistryEntity; use Symfony\Component\Security\Core\Exception\AccessDeniedException; use Symfony\Component\HttpFoundation\RedirectResponse; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; // used in annotations - do not remove diff --git a/src/system/Zikula/Module/CategoriesModule/Controller/AjaxController.php b/src/system/CategoriesModule/Controller/AjaxController.php similarity index 97% rename from src/system/Zikula/Module/CategoriesModule/Controller/AjaxController.php rename to src/system/CategoriesModule/Controller/AjaxController.php index 46f46179b3..d1f06a1171 100644 --- a/src/system/Zikula/Module/CategoriesModule/Controller/AjaxController.php +++ b/src/system/CategoriesModule/Controller/AjaxController.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\CategoriesModule\Controller; +namespace Zikula\CategoriesModule\Controller; use SecurityUtil; use CategoryUtil; @@ -23,7 +23,7 @@ use Zikula\Core\Response\Ajax\NotFoundResponse; use Zikula\Core\Response\Ajax\ForbiddenResponse; use Zikula\Core\Response\Ajax\BadDataResponse; -use Zikula\Module\CategoriesModule\GenericUtil; +use Zikula\CategoriesModule\GenericUtil; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; // used in annotations - do not remove use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method; // used in annotations - do not remove use Symfony\Component\Routing\RouterInterface; @@ -58,11 +58,11 @@ public function resequenceAction(Request $request) if (empty($catData)) { continue; } - /** @var \Zikula\Module\CategoriesModule\Entity\CategoryEntity $category */ + /** @var \Zikula\CategoriesModule\Entity\CategoryEntity $category */ $category = $this->entityManager->find('ZikulaCategoriesModule:CategoryEntity', $catData['id']); $category->setSort_value($catData['lineno']); if (!empty($catData['parent'])) { - /** @var \Zikula\Module\CategoriesModule\Entity\CategoryEntity $parent */ + /** @var \Zikula\CategoriesModule\Entity\CategoryEntity $parent */ $parent = $this->entityManager->find('ZikulaCategoriesModule:CategoryEntity', $catData['parent']); $category->setParent($parent); // reset paths @@ -183,7 +183,7 @@ public function copyAction(Request $request) // get the last added category in the parent $qb = $this->entityManager->createQueryBuilder(); $category = $qb->select('c') - ->from('Zikula\Module\CategoriesModule\Entity\CategoryEntity', 'c') + ->from('Zikula\CategoriesModule\Entity\CategoryEntity', 'c') ->where('c.parent = :parent_id') ->setParameter('parent_id', $parent) ->orderBy('c.id', 'DESC') @@ -454,7 +454,7 @@ public function saveAction(Request $request) if ($mode == 'edit') { $category = $this->entityManager->find('ZikulaCategoriesModule:CategoryEntity', $data['id']); } else { - $category = new \Zikula\Module\CategoriesModule\Entity\CategoryEntity; + $category = new \Zikula\CategoriesModule\Entity\CategoryEntity; } $prevCategoryName = $category['name']; $category->merge($data); diff --git a/src/system/Zikula/Module/CategoriesModule/Controller/UserController.php b/src/system/CategoriesModule/Controller/UserController.php similarity index 98% rename from src/system/Zikula/Module/CategoriesModule/Controller/UserController.php rename to src/system/CategoriesModule/Controller/UserController.php index f52862a7dd..a87271d679 100644 --- a/src/system/Zikula/Module/CategoriesModule/Controller/UserController.php +++ b/src/system/CategoriesModule/Controller/UserController.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\CategoriesModule\Controller; +namespace Zikula\CategoriesModule\Controller; use SecurityUtil; use System; @@ -263,7 +263,7 @@ public function edituserAction(Request $request) 'status' => 'A' ); - $obj = new \Zikula\Module\CategoriesModule\Entity\CategoryEntity; + $obj = new \Zikula\CategoriesModule\Entity\CategoryEntity; $obj->merge($cat); $this->entityManager->persist($obj); $this->entityManager->flush(); @@ -290,7 +290,7 @@ public function edituserAction(Request $request) 'status' => 'A' ); - $obj2 = new \Zikula\Module\CategoriesModule\Entity\CategoryEntity; + $obj2 = new \Zikula\CategoriesModule\Entity\CategoryEntity; $obj2->merge($cat); $this->entityManager->persist($obj2); $this->entityManager->flush(); diff --git a/src/system/Zikula/Module/CategoriesModule/Controller/UserformController.php b/src/system/CategoriesModule/Controller/UserformController.php similarity index 98% rename from src/system/Zikula/Module/CategoriesModule/Controller/UserformController.php rename to src/system/CategoriesModule/Controller/UserformController.php index ef08c8099e..fa583ea19e 100644 --- a/src/system/Zikula/Module/CategoriesModule/Controller/UserformController.php +++ b/src/system/CategoriesModule/Controller/UserformController.php @@ -11,14 +11,14 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\CategoriesModule\Controller; +namespace Zikula\CategoriesModule\Controller; use SecurityUtil; use System; use CategoryUtil; use ModUtil; use ObjectUtil; -use Zikula\Module\CategoriesModule\GenericUtil; +use Zikula\CategoriesModule\GenericUtil; use Symfony\Component\Security\Core\Exception\AccessDeniedException; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\RedirectResponse; @@ -276,7 +276,7 @@ public function newcatAction(Request $request) $data['sort_value'] = 0; // save category - $category = new \Zikula\Module\CategoriesModule\Entity\CategoryEntity; + $category = new \Zikula\CategoriesModule\Entity\CategoryEntity; $category->merge($data); $this->entityManager->persist($category); $this->entityManager->flush(); diff --git a/src/system/Zikula/Module/CategoriesModule/Entity/CategoriesMapobj.php b/src/system/CategoriesModule/Entity/CategoriesMapobj.php similarity index 99% rename from src/system/Zikula/Module/CategoriesModule/Entity/CategoriesMapobj.php rename to src/system/CategoriesModule/Entity/CategoriesMapobj.php index abe5de745c..fd31fae11c 100644 --- a/src/system/Zikula/Module/CategoriesModule/Entity/CategoriesMapobj.php +++ b/src/system/CategoriesModule/Entity/CategoriesMapobj.php @@ -1,6 +1,6 @@ 5.4.0" }, "extra": { "zikula": { - "class": "Zikula\\Module\\CategoriesModule\\ZikulaCategoriesModule" + "class": "Zikula\\CategoriesModule\\ZikulaCategoriesModule" } } } diff --git a/src/system/Zikula/Module/CategoriesModule/phpunit.xml.dist b/src/system/CategoriesModule/phpunit.xml.dist similarity index 100% rename from src/system/Zikula/Module/CategoriesModule/phpunit.xml.dist rename to src/system/CategoriesModule/phpunit.xml.dist diff --git a/src/system/Zikula/Module/CategoriesModule/tables.php b/src/system/CategoriesModule/tables.php similarity index 100% rename from src/system/Zikula/Module/CategoriesModule/tables.php rename to src/system/CategoriesModule/tables.php diff --git a/src/system/Zikula/Module/ExtensionsModule/.gitignore b/src/system/ExtensionsModule/.gitignore similarity index 100% rename from src/system/Zikula/Module/ExtensionsModule/.gitignore rename to src/system/ExtensionsModule/.gitignore diff --git a/src/system/Zikula/Module/ExtensionsModule/.travis.yml b/src/system/ExtensionsModule/.travis.yml similarity index 100% rename from src/system/Zikula/Module/ExtensionsModule/.travis.yml rename to src/system/ExtensionsModule/.travis.yml diff --git a/src/system/Zikula/Module/ExtensionsModule/Api/AdminApi.php b/src/system/ExtensionsModule/Api/AdminApi.php similarity index 99% rename from src/system/Zikula/Module/ExtensionsModule/Api/AdminApi.php rename to src/system/ExtensionsModule/Api/AdminApi.php index a34353f054..83012a37d1 100644 --- a/src/system/Zikula/Module/ExtensionsModule/Api/AdminApi.php +++ b/src/system/ExtensionsModule/Api/AdminApi.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\ExtensionsModule\Api; +namespace Zikula\ExtensionsModule\Api; use LogUtil; use SecurityUtil; @@ -22,7 +22,7 @@ use Zikula\Core\Event\GenericEvent; use Zikula\Core\Event\ModuleStateEvent; use ZLoader; -use Zikula\Module\ExtensionsModule\Util as ExtensionsUtil; +use Zikula\ExtensionsModule\Util as ExtensionsUtil; use ZLanguage; use ReflectionClass; use HookUtil; diff --git a/src/system/Zikula/Module/ExtensionsModule/Controller/AdminController.php b/src/system/ExtensionsModule/Controller/AdminController.php similarity index 99% rename from src/system/Zikula/Module/ExtensionsModule/Controller/AdminController.php rename to src/system/ExtensionsModule/Controller/AdminController.php index 79f68d9186..f330e5d31b 100644 --- a/src/system/Zikula/Module/ExtensionsModule/Controller/AdminController.php +++ b/src/system/ExtensionsModule/Controller/AdminController.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\ExtensionsModule\Controller; +namespace Zikula\ExtensionsModule\Controller; use Zikula\Core\Event\GenericEvent; use Zikula\Core\Event\ModuleStateEvent; @@ -20,7 +20,7 @@ use ModUtil; use SecurityUtil; use ZLanguage; -use Zikula\Module\ExtensionsModule\Util as ExtensionsUtil; +use Zikula\ExtensionsModule\Util as ExtensionsUtil; use System; use SessionUtil; use PluginUtil; diff --git a/src/system/Zikula/Module/ExtensionsModule/Controller/AdminpluginController.php b/src/system/ExtensionsModule/Controller/AdminpluginController.php similarity index 98% rename from src/system/Zikula/Module/ExtensionsModule/Controller/AdminpluginController.php rename to src/system/ExtensionsModule/Controller/AdminpluginController.php index 30080d455f..78a4b3cc6a 100644 --- a/src/system/Zikula/Module/ExtensionsModule/Controller/AdminpluginController.php +++ b/src/system/ExtensionsModule/Controller/AdminpluginController.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\ExtensionsModule\Controller; +namespace Zikula\ExtensionsModule\Controller; use SecurityUtil; use PluginUtil; diff --git a/src/system/Zikula/Module/ExtensionsModule/Controller/AjaxController.php b/src/system/ExtensionsModule/Controller/AjaxController.php similarity index 99% rename from src/system/Zikula/Module/ExtensionsModule/Controller/AjaxController.php rename to src/system/ExtensionsModule/Controller/AjaxController.php index 90f4215408..8a8f5f9dfc 100644 --- a/src/system/Zikula/Module/ExtensionsModule/Controller/AjaxController.php +++ b/src/system/ExtensionsModule/Controller/AjaxController.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\ExtensionsModule\Controller; +namespace Zikula\ExtensionsModule\Controller; use Symfony\Component\Security\Core\Exception\AccessDeniedException; use HookUtil; diff --git a/src/system/Zikula/Module/ExtensionsModule/ExtensionsModuleInstaller.php b/src/system/ExtensionsModule/ExtensionsModuleInstaller.php similarity index 97% rename from src/system/Zikula/Module/ExtensionsModule/ExtensionsModuleInstaller.php rename to src/system/ExtensionsModule/ExtensionsModuleInstaller.php index aec90950ee..d2e93d9282 100644 --- a/src/system/Zikula/Module/ExtensionsModule/ExtensionsModuleInstaller.php +++ b/src/system/ExtensionsModule/ExtensionsModuleInstaller.php @@ -11,13 +11,13 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\ExtensionsModule; +namespace Zikula\ExtensionsModule; use Doctrine_Core; use EventUtil; use System; use Zikula_Event; -use Zikula\Module\ExtensionsModule\ExtensionsModuleVersion; +use Zikula\ExtensionsModule\ExtensionsModuleVersion; use ModUtil; use Zikula\Core\Doctrine\Entity\ExtensionEntity; diff --git a/src/system/Zikula/Module/ExtensionsModule/ExtensionsModuleVersion.php b/src/system/ExtensionsModule/ExtensionsModuleVersion.php similarity index 96% rename from src/system/Zikula/Module/ExtensionsModule/ExtensionsModuleVersion.php rename to src/system/ExtensionsModule/ExtensionsModuleVersion.php index 40d8abea6d..2ce6aec4c6 100644 --- a/src/system/Zikula/Module/ExtensionsModule/ExtensionsModuleVersion.php +++ b/src/system/ExtensionsModule/ExtensionsModuleVersion.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\ExtensionsModule; +namespace Zikula\ExtensionsModule; /** * Version information for the extensions module diff --git a/src/system/Zikula/Module/ExtensionsModule/HookUI.php b/src/system/ExtensionsModule/HookUI.php similarity index 71% rename from src/system/Zikula/Module/ExtensionsModule/HookUI.php rename to src/system/ExtensionsModule/HookUI.php index e0ee1fac61..da3e58cba1 100644 --- a/src/system/Zikula/Module/ExtensionsModule/HookUI.php +++ b/src/system/ExtensionsModule/HookUI.php @@ -14,9 +14,9 @@ /** * HooksUI class. * - * @deprecated since 1.4.0 use Zikula\Module\ExtensionsModule\Listener\HookUiListener instead + * @deprecated since 1.4.0 use Zikula\ExtensionsModule\Listener\HookUiListener instead */ -class Extensions_HookUI extends Zikula\Module\ExtensionsModule\Listener\HookUiListener +class Extensions_HookUI extends Zikula\ExtensionsModule\Listener\HookUiListener { } diff --git a/src/system/Zikula/Module/ExtensionsModule/LICENSE b/src/system/ExtensionsModule/LICENSE similarity index 100% rename from src/system/Zikula/Module/ExtensionsModule/LICENSE rename to src/system/ExtensionsModule/LICENSE diff --git a/src/system/Zikula/Module/ExtensionsModule/README.md b/src/system/ExtensionsModule/README.md similarity index 100% rename from src/system/Zikula/Module/ExtensionsModule/README.md rename to src/system/ExtensionsModule/README.md diff --git a/src/system/Zikula/Module/ExtensionsModule/Resources/config/routing.yml b/src/system/ExtensionsModule/Resources/config/routing.yml similarity index 100% rename from src/system/Zikula/Module/ExtensionsModule/Resources/config/routing.yml rename to src/system/ExtensionsModule/Resources/config/routing.yml diff --git a/src/system/Zikula/Module/ExtensionsModule/Resources/public/css/hooks.css b/src/system/ExtensionsModule/Resources/public/css/hooks.css similarity index 100% rename from src/system/Zikula/Module/ExtensionsModule/Resources/public/css/hooks.css rename to src/system/ExtensionsModule/Resources/public/css/hooks.css diff --git a/src/system/Zikula/Module/ExtensionsModule/Resources/public/images/admin.png b/src/system/ExtensionsModule/Resources/public/images/admin.png similarity index 100% rename from src/system/Zikula/Module/ExtensionsModule/Resources/public/images/admin.png rename to src/system/ExtensionsModule/Resources/public/images/admin.png diff --git a/src/system/Zikula/Module/ExtensionsModule/Resources/public/js/hookui.js b/src/system/ExtensionsModule/Resources/public/js/hookui.js similarity index 100% rename from src/system/Zikula/Module/ExtensionsModule/Resources/public/js/hookui.js rename to src/system/ExtensionsModule/Resources/public/js/hookui.js diff --git a/src/system/Zikula/Module/ExtensionsModule/Resources/views/Admin/HookUi/hooks.tpl b/src/system/ExtensionsModule/Resources/views/Admin/HookUi/hooks.tpl similarity index 100% rename from src/system/Zikula/Module/ExtensionsModule/Resources/views/Admin/HookUi/hooks.tpl rename to src/system/ExtensionsModule/Resources/views/Admin/HookUi/hooks.tpl diff --git a/src/system/Zikula/Module/ExtensionsModule/Resources/views/Admin/HookUi/moduleservices.tpl b/src/system/ExtensionsModule/Resources/views/Admin/HookUi/moduleservices.tpl similarity index 100% rename from src/system/Zikula/Module/ExtensionsModule/Resources/views/Admin/HookUi/moduleservices.tpl rename to src/system/ExtensionsModule/Resources/views/Admin/HookUi/moduleservices.tpl diff --git a/src/system/Zikula/Module/ExtensionsModule/Resources/views/Admin/HookUi/provider.tpl b/src/system/ExtensionsModule/Resources/views/Admin/HookUi/provider.tpl similarity index 100% rename from src/system/Zikula/Module/ExtensionsModule/Resources/views/Admin/HookUi/provider.tpl rename to src/system/ExtensionsModule/Resources/views/Admin/HookUi/provider.tpl diff --git a/src/system/Zikula/Module/ExtensionsModule/Resources/views/Admin/HookUi/subscriber.tpl b/src/system/ExtensionsModule/Resources/views/Admin/HookUi/subscriber.tpl similarity index 100% rename from src/system/Zikula/Module/ExtensionsModule/Resources/views/Admin/HookUi/subscriber.tpl rename to src/system/ExtensionsModule/Resources/views/Admin/HookUi/subscriber.tpl diff --git a/src/system/Zikula/Module/ExtensionsModule/Resources/views/Admin/compinfo.tpl b/src/system/ExtensionsModule/Resources/views/Admin/compinfo.tpl similarity index 100% rename from src/system/Zikula/Module/ExtensionsModule/Resources/views/Admin/compinfo.tpl rename to src/system/ExtensionsModule/Resources/views/Admin/compinfo.tpl diff --git a/src/system/Zikula/Module/ExtensionsModule/Resources/views/Admin/initialise.tpl b/src/system/ExtensionsModule/Resources/views/Admin/initialise.tpl similarity index 100% rename from src/system/Zikula/Module/ExtensionsModule/Resources/views/Admin/initialise.tpl rename to src/system/ExtensionsModule/Resources/views/Admin/initialise.tpl diff --git a/src/system/Zikula/Module/ExtensionsModule/Resources/views/Admin/modify.tpl b/src/system/ExtensionsModule/Resources/views/Admin/modify.tpl similarity index 100% rename from src/system/Zikula/Module/ExtensionsModule/Resources/views/Admin/modify.tpl rename to src/system/ExtensionsModule/Resources/views/Admin/modify.tpl diff --git a/src/system/Zikula/Module/ExtensionsModule/Resources/views/Admin/modifyconfig.tpl b/src/system/ExtensionsModule/Resources/views/Admin/modifyconfig.tpl similarity index 100% rename from src/system/Zikula/Module/ExtensionsModule/Resources/views/Admin/modifyconfig.tpl rename to src/system/ExtensionsModule/Resources/views/Admin/modifyconfig.tpl diff --git a/src/system/Zikula/Module/ExtensionsModule/Resources/views/Admin/regenerate_errors.tpl b/src/system/ExtensionsModule/Resources/views/Admin/regenerate_errors.tpl similarity index 100% rename from src/system/Zikula/Module/ExtensionsModule/Resources/views/Admin/regenerate_errors.tpl rename to src/system/ExtensionsModule/Resources/views/Admin/regenerate_errors.tpl diff --git a/src/system/Zikula/Module/ExtensionsModule/Resources/views/Admin/remove.tpl b/src/system/ExtensionsModule/Resources/views/Admin/remove.tpl similarity index 100% rename from src/system/Zikula/Module/ExtensionsModule/Resources/views/Admin/remove.tpl rename to src/system/ExtensionsModule/Resources/views/Admin/remove.tpl diff --git a/src/system/Zikula/Module/ExtensionsModule/Resources/views/Admin/view.tpl b/src/system/ExtensionsModule/Resources/views/Admin/view.tpl similarity index 100% rename from src/system/Zikula/Module/ExtensionsModule/Resources/views/Admin/view.tpl rename to src/system/ExtensionsModule/Resources/views/Admin/view.tpl diff --git a/src/system/Zikula/Module/ExtensionsModule/Resources/views/Admin/viewPlugins.tpl b/src/system/ExtensionsModule/Resources/views/Admin/viewPlugins.tpl similarity index 100% rename from src/system/Zikula/Module/ExtensionsModule/Resources/views/Admin/viewPlugins.tpl rename to src/system/ExtensionsModule/Resources/views/Admin/viewPlugins.tpl diff --git a/src/system/Zikula/Module/ExtensionsModule/Util.php b/src/system/ExtensionsModule/Util.php similarity index 98% rename from src/system/Zikula/Module/ExtensionsModule/Util.php rename to src/system/ExtensionsModule/Util.php index 410ff409ee..f1b0435714 100644 --- a/src/system/Zikula/Module/ExtensionsModule/Util.php +++ b/src/system/ExtensionsModule/Util.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\ExtensionsModule; +namespace Zikula\ExtensionsModule; use Zikula_AbstractErrorHandler; use LogUtil; diff --git a/src/system/Zikula/Module/ExtensionsModule/ZikulaExtensionsModule.php b/src/system/ExtensionsModule/ZikulaExtensionsModule.php similarity index 93% rename from src/system/Zikula/Module/ExtensionsModule/ZikulaExtensionsModule.php rename to src/system/ExtensionsModule/ZikulaExtensionsModule.php index 33caf92563..aa91820357 100644 --- a/src/system/Zikula/Module/ExtensionsModule/ZikulaExtensionsModule.php +++ b/src/system/ExtensionsModule/ZikulaExtensionsModule.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\ExtensionsModule; +namespace Zikula\ExtensionsModule; use Zikula\Bundle\CoreBundle\Bundle\AbstractCoreModule; diff --git a/src/system/Zikula/Module/ExtensionsModule/composer.json b/src/system/ExtensionsModule/composer.json similarity index 73% rename from src/system/Zikula/Module/ExtensionsModule/composer.json rename to src/system/ExtensionsModule/composer.json index a4fc699a27..46769a380c 100644 --- a/src/system/Zikula/Module/ExtensionsModule/composer.json +++ b/src/system/ExtensionsModule/composer.json @@ -10,14 +10,14 @@ } ], "autoload": { - "psr-0": { "Zikula\\Module\\ExtensionsModule\\": "" } + "psr-4": { "Zikula\\ExtensionsModule\\": "" } }, "require": { "php": ">5.4.0" }, "extra": { "zikula": { - "class": "Zikula\\Module\\ExtensionsModule\\ZikulaExtensionsModule" + "class": "Zikula\\ExtensionsModule\\ZikulaExtensionsModule" } } } diff --git a/src/system/Zikula/Module/ExtensionsModule/phpunit.xml.dist b/src/system/ExtensionsModule/phpunit.xml.dist similarity index 100% rename from src/system/Zikula/Module/ExtensionsModule/phpunit.xml.dist rename to src/system/ExtensionsModule/phpunit.xml.dist diff --git a/src/system/Zikula/Module/ExtensionsModule/tables.php b/src/system/ExtensionsModule/tables.php similarity index 100% rename from src/system/Zikula/Module/ExtensionsModule/tables.php rename to src/system/ExtensionsModule/tables.php diff --git a/src/system/ZikulaRoutesModule/Listener/InstallerListener.php b/src/system/ZikulaRoutesModule/Listener/InstallerListener.php index 0719e6671e..ed6aceb89e 100644 --- a/src/system/ZikulaRoutesModule/Listener/InstallerListener.php +++ b/src/system/ZikulaRoutesModule/Listener/InstallerListener.php @@ -82,7 +82,7 @@ public function modulePostInstalled(ModuleStateEvent $event) $this->cacheClearer->clear('symfony.routing'); - // dumping the JS routes after module install occurs in \Zikula\Module\ExtensionsModule\Controller\AdminController::viewAction + // dumping the JS routes after module install occurs in \Zikula\ExtensionsModule\Controller\AdminController::viewAction } /** From ed47b77920891020e059e0a111f0eba02a4bbc62 Mon Sep 17 00:00:00 2001 From: Craig Heydenburg Date: Sun, 16 Aug 2015 18:07:16 -0400 Subject: [PATCH 05/35] correct plugin path for AdminModule --- src/lib/legacy/Zikula/View.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/legacy/Zikula/View.php b/src/lib/legacy/Zikula/View.php index 8ceb6e60ae..1cf36db32f 100644 --- a/src/lib/legacy/Zikula/View.php +++ b/src/lib/legacy/Zikula/View.php @@ -242,7 +242,7 @@ public function __construct(Zikula_ServiceManager $serviceManager, $moduleName = // array if ($type === 'admin' || $type === 'adminplugin') { if (!$this instanceof Zikula_View_Theme) { - $this->addPluginDir('system/Zikula/Module/AdminModule/Resources/views/plugins'); + $this->addPluginDir('system/AdminModule/Resources/views/plugins'); } else { $this->load_filter('output', 'admintitle'); } From 623130436806aa05e202b7bb11246a8c2e79bc04 Mon Sep 17 00:00:00 2001 From: Craig Heydenburg Date: Sun, 16 Aug 2015 18:10:02 -0400 Subject: [PATCH 06/35] convert GroupsModule to psr-4 --- composer.json | 3 ++- src/app/ZikulaKernel.php | 2 +- .../{Zikula/Module => }/GroupsModule/.gitignore | 0 .../{Zikula/Module => }/GroupsModule/.travis.yml | 0 .../Module => }/GroupsModule/Api/AccountApi.php | 2 +- .../Module => }/GroupsModule/Api/AdminApi.php | 10 +++++----- .../Module => }/GroupsModule/Api/UserApi.php | 8 ++++---- .../GroupsModule/Controller/AdminController.php | 4 ++-- .../GroupsModule/Controller/AjaxController.php | 4 ++-- .../GroupsModule/Controller/UserController.php | 4 ++-- .../GroupsModule/Entity/GroupApplicationEntity.php | 2 +- .../Module => }/GroupsModule/Entity/GroupEntity.php | 2 +- .../GroupsModule/Entity/GroupMembershipEntity.php | 2 +- .../GroupsModule/GroupsModuleInstaller.php | 12 ++++++------ .../GroupsModule/GroupsModuleVersion.php | 2 +- .../GroupsModule/Helper/CommonHelper.php | 2 +- src/system/{Zikula/Module => }/GroupsModule/LICENSE | 0 .../{Zikula/Module => }/GroupsModule/README.md | 0 .../GroupsModule/Resources/config/routing.yml | 0 .../GroupsModule/Resources/public/css/style.css | 0 .../GroupsModule/Resources/public/images/admin.png | Bin .../GroupsModule/Resources/public/js/groups.js | 0 .../GroupsModule/Resources/views/Admin/delete.tpl | 0 .../Resources/views/Admin/groupmembership.tpl | 0 .../GroupsModule/Resources/views/Admin/modify.tpl | 0 .../Resources/views/Admin/modifyconfig.tpl | 0 .../GroupsModule/Resources/views/Admin/new.tpl | 0 .../Resources/views/Admin/removeuser.tpl | 0 .../Resources/views/Admin/userpending.tpl | 0 .../GroupsModule/Resources/views/Admin/view.tpl | 0 .../Resources/views/User/grouprow_overview.tpl | 0 .../Resources/views/User/grouprow_read.tpl | 0 .../GroupsModule/Resources/views/User/main.tpl | 0 .../Resources/views/User/membership.tpl | 0 .../Resources/views/User/memberslist.tpl | 0 .../GroupsModule/Resources/views/User/menu.tpl | 0 .../GroupsModule/Resources/views/User/view.tpl | 0 .../Module => }/GroupsModule/ZikulaGroupsModule.php | 2 +- .../{Zikula/Module => }/GroupsModule/composer.json | 4 ++-- .../Module => }/GroupsModule/phpunit.xml.dist | 0 .../{Zikula/Module => }/GroupsModule/tables.php | 0 41 files changed, 33 insertions(+), 32 deletions(-) rename src/system/{Zikula/Module => }/GroupsModule/.gitignore (100%) rename src/system/{Zikula/Module => }/GroupsModule/.travis.yml (100%) rename src/system/{Zikula/Module => }/GroupsModule/Api/AccountApi.php (96%) rename src/system/{Zikula/Module => }/GroupsModule/Api/AdminApi.php (98%) rename src/system/{Zikula/Module => }/GroupsModule/Api/UserApi.php (99%) rename src/system/{Zikula/Module => }/GroupsModule/Controller/AdminController.php (99%) rename src/system/{Zikula/Module => }/GroupsModule/Controller/AjaxController.php (98%) rename src/system/{Zikula/Module => }/GroupsModule/Controller/UserController.php (99%) rename src/system/{Zikula/Module => }/GroupsModule/Entity/GroupApplicationEntity.php (98%) rename src/system/{Zikula/Module => }/GroupsModule/Entity/GroupEntity.php (99%) rename src/system/{Zikula/Module => }/GroupsModule/Entity/GroupMembershipEntity.php (97%) rename src/system/{Zikula/Module => }/GroupsModule/GroupsModuleInstaller.php (90%) rename src/system/{Zikula/Module => }/GroupsModule/GroupsModuleVersion.php (96%) rename src/system/{Zikula/Module => }/GroupsModule/Helper/CommonHelper.php (98%) rename src/system/{Zikula/Module => }/GroupsModule/LICENSE (100%) rename src/system/{Zikula/Module => }/GroupsModule/README.md (100%) rename src/system/{Zikula/Module => }/GroupsModule/Resources/config/routing.yml (100%) rename src/system/{Zikula/Module => }/GroupsModule/Resources/public/css/style.css (100%) rename src/system/{Zikula/Module => }/GroupsModule/Resources/public/images/admin.png (100%) rename src/system/{Zikula/Module => }/GroupsModule/Resources/public/js/groups.js (100%) rename src/system/{Zikula/Module => }/GroupsModule/Resources/views/Admin/delete.tpl (100%) rename src/system/{Zikula/Module => }/GroupsModule/Resources/views/Admin/groupmembership.tpl (100%) rename src/system/{Zikula/Module => }/GroupsModule/Resources/views/Admin/modify.tpl (100%) rename src/system/{Zikula/Module => }/GroupsModule/Resources/views/Admin/modifyconfig.tpl (100%) rename src/system/{Zikula/Module => }/GroupsModule/Resources/views/Admin/new.tpl (100%) rename src/system/{Zikula/Module => }/GroupsModule/Resources/views/Admin/removeuser.tpl (100%) rename src/system/{Zikula/Module => }/GroupsModule/Resources/views/Admin/userpending.tpl (100%) rename src/system/{Zikula/Module => }/GroupsModule/Resources/views/Admin/view.tpl (100%) rename src/system/{Zikula/Module => }/GroupsModule/Resources/views/User/grouprow_overview.tpl (100%) rename src/system/{Zikula/Module => }/GroupsModule/Resources/views/User/grouprow_read.tpl (100%) rename src/system/{Zikula/Module => }/GroupsModule/Resources/views/User/main.tpl (100%) rename src/system/{Zikula/Module => }/GroupsModule/Resources/views/User/membership.tpl (100%) rename src/system/{Zikula/Module => }/GroupsModule/Resources/views/User/memberslist.tpl (100%) rename src/system/{Zikula/Module => }/GroupsModule/Resources/views/User/menu.tpl (100%) rename src/system/{Zikula/Module => }/GroupsModule/Resources/views/User/view.tpl (100%) rename src/system/{Zikula/Module => }/GroupsModule/ZikulaGroupsModule.php (93%) rename src/system/{Zikula/Module => }/GroupsModule/composer.json (75%) rename src/system/{Zikula/Module => }/GroupsModule/phpunit.xml.dist (100%) rename src/system/{Zikula/Module => }/GroupsModule/tables.php (100%) diff --git a/composer.json b/composer.json index ba3938e628..5cf2ec5322 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,8 @@ "Zikula\\AdminModule\\": "src/system/AdminModule", "Zikula\\BlocksModule\\": "src/system/BlocksModule", "Zikula\\CategoriesModule\\": "src/system/CategoriesModule", - "Zikula\\ExtensionsModule\\": "src/system/ExtensionsModule" + "Zikula\\ExtensionsModule\\": "src/system/ExtensionsModule", + "Zikula\\GroupsModule\\": "src/system/GroupsModule" }, "classmap": [ "src/lib/util/", diff --git a/src/app/ZikulaKernel.php b/src/app/ZikulaKernel.php index b1cb8268cc..69c15b52a0 100644 --- a/src/app/ZikulaKernel.php +++ b/src/app/ZikulaKernel.php @@ -67,7 +67,7 @@ private function registerCoreModules(array &$bundles) $bundles[] = new Zikula\BlocksModule\ZikulaBlocksModule(); $bundles[] = new Zikula\CategoriesModule\ZikulaCategoriesModule(); $bundles[] = new Zikula\ExtensionsModule\ZikulaExtensionsModule(); - $bundles[] = new Zikula\Module\GroupsModule\ZikulaGroupsModule(); + $bundles[] = new Zikula\GroupsModule\ZikulaGroupsModule(); $bundles[] = new Zikula\Module\MailerModule\ZikulaMailerModule(); $bundles[] = new Zikula\Module\PageLockModule\ZikulaPageLockModule(); $bundles[] = new Zikula\Module\PermissionsModule\ZikulaPermissionsModule(); diff --git a/src/system/Zikula/Module/GroupsModule/.gitignore b/src/system/GroupsModule/.gitignore similarity index 100% rename from src/system/Zikula/Module/GroupsModule/.gitignore rename to src/system/GroupsModule/.gitignore diff --git a/src/system/Zikula/Module/GroupsModule/.travis.yml b/src/system/GroupsModule/.travis.yml similarity index 100% rename from src/system/Zikula/Module/GroupsModule/.travis.yml rename to src/system/GroupsModule/.travis.yml diff --git a/src/system/Zikula/Module/GroupsModule/Api/AccountApi.php b/src/system/GroupsModule/Api/AccountApi.php similarity index 96% rename from src/system/Zikula/Module/GroupsModule/Api/AccountApi.php rename to src/system/GroupsModule/Api/AccountApi.php index cd3aa8020f..a98d7ed4c6 100644 --- a/src/system/Zikula/Module/GroupsModule/Api/AccountApi.php +++ b/src/system/GroupsModule/Api/AccountApi.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\GroupsModule\Api; +namespace Zikula\GroupsModule\Api; use ModUtil; diff --git a/src/system/Zikula/Module/GroupsModule/Api/AdminApi.php b/src/system/GroupsModule/Api/AdminApi.php similarity index 98% rename from src/system/Zikula/Module/GroupsModule/Api/AdminApi.php rename to src/system/GroupsModule/Api/AdminApi.php index feb78c6644..308e8aaaac 100644 --- a/src/system/Zikula/Module/GroupsModule/Api/AdminApi.php +++ b/src/system/GroupsModule/Api/AdminApi.php @@ -11,12 +11,12 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\GroupsModule\Api; +namespace Zikula\GroupsModule\Api; use Zikula\Core\Event\GenericEvent; -use Zikula\Module\GroupsModule\Entity\GroupEntity; -use Zikula\Module\GroupsModule\Entity\GroupMembershipEntity; -use Zikula\Module\GroupsModule\Helper\CommonHelper; +use Zikula\GroupsModule\Entity\GroupEntity; +use Zikula\GroupsModule\Entity\GroupMembershipEntity; +use Zikula\GroupsModule\Helper\CommonHelper; use SecurityUtil; use Zikula; use ModUtil; @@ -394,7 +394,7 @@ public function getnamebygid($args) // add select and from params $qb->select('g') - ->from('Zikula\Module\GroupsModule\Entity\GroupEntity', 'g'); + ->from('Zikula\GroupsModule\Entity\GroupEntity', 'g'); // add clause for filtering name $qb->andWhere($qb->expr()->eq('g.gid', ':ggid'))->setParameter('ggid', $args['gid']); diff --git a/src/system/Zikula/Module/GroupsModule/Api/UserApi.php b/src/system/GroupsModule/Api/UserApi.php similarity index 99% rename from src/system/Zikula/Module/GroupsModule/Api/UserApi.php rename to src/system/GroupsModule/Api/UserApi.php index 8d0747eb56..2ff873405e 100644 --- a/src/system/Zikula/Module/GroupsModule/Api/UserApi.php +++ b/src/system/GroupsModule/Api/UserApi.php @@ -11,12 +11,12 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\GroupsModule\Api; +namespace Zikula\GroupsModule\Api; use Zikula\Core\Event\GenericEvent; -use Zikula\Module\GroupsModule\Helper\CommonHelper; -use Zikula\Module\GroupsModule\Entity\GroupApplicationEntity; -use Zikula\Module\GroupsModule\Entity\GroupMembershipEntity; +use Zikula\GroupsModule\Helper\CommonHelper; +use Zikula\GroupsModule\Entity\GroupApplicationEntity; +use Zikula\GroupsModule\Entity\GroupMembershipEntity; use SecurityUtil; use UserUtil; use ModUtil; diff --git a/src/system/Zikula/Module/GroupsModule/Controller/AdminController.php b/src/system/GroupsModule/Controller/AdminController.php similarity index 99% rename from src/system/Zikula/Module/GroupsModule/Controller/AdminController.php rename to src/system/GroupsModule/Controller/AdminController.php index 2f6558bd61..6a1e28ba37 100644 --- a/src/system/Zikula/Module/GroupsModule/Controller/AdminController.php +++ b/src/system/GroupsModule/Controller/AdminController.php @@ -11,12 +11,12 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\GroupsModule\Controller; +namespace Zikula\GroupsModule\Controller; use Zikula_View; use ModUtil; use SecurityUtil; -use Zikula\Module\GroupsModule\Helper\CommonHelper; +use Zikula\GroupsModule\Helper\CommonHelper; use UserUtil; use Users_Constant; use System; diff --git a/src/system/Zikula/Module/GroupsModule/Controller/AjaxController.php b/src/system/GroupsModule/Controller/AjaxController.php similarity index 98% rename from src/system/Zikula/Module/GroupsModule/Controller/AjaxController.php rename to src/system/GroupsModule/Controller/AjaxController.php index b9c618340b..b23505ae5c 100644 --- a/src/system/Zikula/Module/GroupsModule/Controller/AjaxController.php +++ b/src/system/GroupsModule/Controller/AjaxController.php @@ -11,12 +11,12 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\GroupsModule\Controller; +namespace Zikula\GroupsModule\Controller; use Zikula\Core\Response\Ajax\AjaxResponse; use Zikula\Core\Response\Ajax\FatalResponse; use Zikula\Core\Response\Ajax\ForbiddenResponse; -use Zikula\Module\GroupsModule\Helper\CommonHelper; +use Zikula\GroupsModule\Helper\CommonHelper; use SecurityUtil; use ModUtil; use LogUtil; diff --git a/src/system/Zikula/Module/GroupsModule/Controller/UserController.php b/src/system/GroupsModule/Controller/UserController.php similarity index 99% rename from src/system/Zikula/Module/GroupsModule/Controller/UserController.php rename to src/system/GroupsModule/Controller/UserController.php index 080c8a3dfe..8d6264117a 100644 --- a/src/system/Zikula/Module/GroupsModule/Controller/UserController.php +++ b/src/system/GroupsModule/Controller/UserController.php @@ -11,13 +11,13 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\GroupsModule\Controller; +namespace Zikula\GroupsModule\Controller; use ModUtil; use SecurityUtil; use UserUtil; use Zikula_View; -use Zikula\Module\GroupsModule\Helper\CommonHelper; +use Zikula\GroupsModule\Helper\CommonHelper; use DataUtil; use System; use Symfony\Component\Security\Core\Exception\AccessDeniedException; diff --git a/src/system/Zikula/Module/GroupsModule/Entity/GroupApplicationEntity.php b/src/system/GroupsModule/Entity/GroupApplicationEntity.php similarity index 98% rename from src/system/Zikula/Module/GroupsModule/Entity/GroupApplicationEntity.php rename to src/system/GroupsModule/Entity/GroupApplicationEntity.php index 56ff6cf60c..e5cb1370ca 100644 --- a/src/system/Zikula/Module/GroupsModule/Entity/GroupApplicationEntity.php +++ b/src/system/GroupsModule/Entity/GroupApplicationEntity.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\GroupsModule\Entity; +namespace Zikula\GroupsModule\Entity; use Zikula\Core\Doctrine\EntityAccess; use Doctrine\ORM\Mapping as ORM; diff --git a/src/system/Zikula/Module/GroupsModule/Entity/GroupEntity.php b/src/system/GroupsModule/Entity/GroupEntity.php similarity index 99% rename from src/system/Zikula/Module/GroupsModule/Entity/GroupEntity.php rename to src/system/GroupsModule/Entity/GroupEntity.php index a779193e4e..8361597723 100644 --- a/src/system/Zikula/Module/GroupsModule/Entity/GroupEntity.php +++ b/src/system/GroupsModule/Entity/GroupEntity.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\GroupsModule\Entity; +namespace Zikula\GroupsModule\Entity; use Zikula\Core\Doctrine\EntityAccess; use Doctrine\ORM\Mapping as ORM; diff --git a/src/system/Zikula/Module/GroupsModule/Entity/GroupMembershipEntity.php b/src/system/GroupsModule/Entity/GroupMembershipEntity.php similarity index 97% rename from src/system/Zikula/Module/GroupsModule/Entity/GroupMembershipEntity.php rename to src/system/GroupsModule/Entity/GroupMembershipEntity.php index 82f1426f26..0c19292ad3 100644 --- a/src/system/Zikula/Module/GroupsModule/Entity/GroupMembershipEntity.php +++ b/src/system/GroupsModule/Entity/GroupMembershipEntity.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\GroupsModule\Entity; +namespace Zikula\GroupsModule\Entity; use Zikula\Core\Doctrine\EntityAccess; use Doctrine\ORM\Mapping as ORM; diff --git a/src/system/Zikula/Module/GroupsModule/GroupsModuleInstaller.php b/src/system/GroupsModule/GroupsModuleInstaller.php similarity index 90% rename from src/system/Zikula/Module/GroupsModule/GroupsModuleInstaller.php rename to src/system/GroupsModule/GroupsModuleInstaller.php index a2c4ac5b7a..2a41e8228b 100644 --- a/src/system/Zikula/Module/GroupsModule/GroupsModuleInstaller.php +++ b/src/system/GroupsModule/GroupsModuleInstaller.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\GroupsModule; +namespace Zikula\GroupsModule; use DoctrineHelper; @@ -29,9 +29,9 @@ public function install() { // create tables $classes = array( - 'Zikula\Module\GroupsModule\Entity\GroupEntity', - 'Zikula\Module\GroupsModule\Entity\GroupMembershipEntity', - 'Zikula\Module\GroupsModule\Entity\GroupApplicationEntity' + 'Zikula\GroupsModule\Entity\GroupEntity', + 'Zikula\GroupsModule\Entity\GroupMembershipEntity', + 'Zikula\GroupsModule\Entity\GroupApplicationEntity' ); try { @@ -104,7 +104,7 @@ public function defaultdata() ); foreach ($records as $record) { - $item = new \Zikula\Module\GroupsModule\Entity\GroupEntity; + $item = new \Zikula\GroupsModule\Entity\GroupEntity; $item['name'] = $record['name']; $item['description'] = $record['description']; $item['prefix'] = $record['prefix']; @@ -126,7 +126,7 @@ public function defaultdata() ); foreach ($records as $record) { - $item = new \Zikula\Module\GroupsModule\Entity\GroupMembershipEntity; + $item = new \Zikula\GroupsModule\Entity\GroupMembershipEntity; $item['gid'] = $record['gid']; $item['uid'] = $record['uid']; $this->entityManager->persist($item); diff --git a/src/system/Zikula/Module/GroupsModule/GroupsModuleVersion.php b/src/system/GroupsModule/GroupsModuleVersion.php similarity index 96% rename from src/system/Zikula/Module/GroupsModule/GroupsModuleVersion.php rename to src/system/GroupsModule/GroupsModuleVersion.php index 2198c94d61..e26bc08bf5 100644 --- a/src/system/Zikula/Module/GroupsModule/GroupsModuleVersion.php +++ b/src/system/GroupsModule/GroupsModuleVersion.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\GroupsModule; +namespace Zikula\GroupsModule; /** * Version information for the groups module diff --git a/src/system/Zikula/Module/GroupsModule/Helper/CommonHelper.php b/src/system/GroupsModule/Helper/CommonHelper.php similarity index 98% rename from src/system/Zikula/Module/GroupsModule/Helper/CommonHelper.php rename to src/system/GroupsModule/Helper/CommonHelper.php index 9f9109a00d..c45d63045f 100644 --- a/src/system/Zikula/Module/GroupsModule/Helper/CommonHelper.php +++ b/src/system/GroupsModule/Helper/CommonHelper.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\GroupsModule\Helper; +namespace Zikula\GroupsModule\Helper; /** * Common helper functions and constants. diff --git a/src/system/Zikula/Module/GroupsModule/LICENSE b/src/system/GroupsModule/LICENSE similarity index 100% rename from src/system/Zikula/Module/GroupsModule/LICENSE rename to src/system/GroupsModule/LICENSE diff --git a/src/system/Zikula/Module/GroupsModule/README.md b/src/system/GroupsModule/README.md similarity index 100% rename from src/system/Zikula/Module/GroupsModule/README.md rename to src/system/GroupsModule/README.md diff --git a/src/system/Zikula/Module/GroupsModule/Resources/config/routing.yml b/src/system/GroupsModule/Resources/config/routing.yml similarity index 100% rename from src/system/Zikula/Module/GroupsModule/Resources/config/routing.yml rename to src/system/GroupsModule/Resources/config/routing.yml diff --git a/src/system/Zikula/Module/GroupsModule/Resources/public/css/style.css b/src/system/GroupsModule/Resources/public/css/style.css similarity index 100% rename from src/system/Zikula/Module/GroupsModule/Resources/public/css/style.css rename to src/system/GroupsModule/Resources/public/css/style.css diff --git a/src/system/Zikula/Module/GroupsModule/Resources/public/images/admin.png b/src/system/GroupsModule/Resources/public/images/admin.png similarity index 100% rename from src/system/Zikula/Module/GroupsModule/Resources/public/images/admin.png rename to src/system/GroupsModule/Resources/public/images/admin.png diff --git a/src/system/Zikula/Module/GroupsModule/Resources/public/js/groups.js b/src/system/GroupsModule/Resources/public/js/groups.js similarity index 100% rename from src/system/Zikula/Module/GroupsModule/Resources/public/js/groups.js rename to src/system/GroupsModule/Resources/public/js/groups.js diff --git a/src/system/Zikula/Module/GroupsModule/Resources/views/Admin/delete.tpl b/src/system/GroupsModule/Resources/views/Admin/delete.tpl similarity index 100% rename from src/system/Zikula/Module/GroupsModule/Resources/views/Admin/delete.tpl rename to src/system/GroupsModule/Resources/views/Admin/delete.tpl diff --git a/src/system/Zikula/Module/GroupsModule/Resources/views/Admin/groupmembership.tpl b/src/system/GroupsModule/Resources/views/Admin/groupmembership.tpl similarity index 100% rename from src/system/Zikula/Module/GroupsModule/Resources/views/Admin/groupmembership.tpl rename to src/system/GroupsModule/Resources/views/Admin/groupmembership.tpl diff --git a/src/system/Zikula/Module/GroupsModule/Resources/views/Admin/modify.tpl b/src/system/GroupsModule/Resources/views/Admin/modify.tpl similarity index 100% rename from src/system/Zikula/Module/GroupsModule/Resources/views/Admin/modify.tpl rename to src/system/GroupsModule/Resources/views/Admin/modify.tpl diff --git a/src/system/Zikula/Module/GroupsModule/Resources/views/Admin/modifyconfig.tpl b/src/system/GroupsModule/Resources/views/Admin/modifyconfig.tpl similarity index 100% rename from src/system/Zikula/Module/GroupsModule/Resources/views/Admin/modifyconfig.tpl rename to src/system/GroupsModule/Resources/views/Admin/modifyconfig.tpl diff --git a/src/system/Zikula/Module/GroupsModule/Resources/views/Admin/new.tpl b/src/system/GroupsModule/Resources/views/Admin/new.tpl similarity index 100% rename from src/system/Zikula/Module/GroupsModule/Resources/views/Admin/new.tpl rename to src/system/GroupsModule/Resources/views/Admin/new.tpl diff --git a/src/system/Zikula/Module/GroupsModule/Resources/views/Admin/removeuser.tpl b/src/system/GroupsModule/Resources/views/Admin/removeuser.tpl similarity index 100% rename from src/system/Zikula/Module/GroupsModule/Resources/views/Admin/removeuser.tpl rename to src/system/GroupsModule/Resources/views/Admin/removeuser.tpl diff --git a/src/system/Zikula/Module/GroupsModule/Resources/views/Admin/userpending.tpl b/src/system/GroupsModule/Resources/views/Admin/userpending.tpl similarity index 100% rename from src/system/Zikula/Module/GroupsModule/Resources/views/Admin/userpending.tpl rename to src/system/GroupsModule/Resources/views/Admin/userpending.tpl diff --git a/src/system/Zikula/Module/GroupsModule/Resources/views/Admin/view.tpl b/src/system/GroupsModule/Resources/views/Admin/view.tpl similarity index 100% rename from src/system/Zikula/Module/GroupsModule/Resources/views/Admin/view.tpl rename to src/system/GroupsModule/Resources/views/Admin/view.tpl diff --git a/src/system/Zikula/Module/GroupsModule/Resources/views/User/grouprow_overview.tpl b/src/system/GroupsModule/Resources/views/User/grouprow_overview.tpl similarity index 100% rename from src/system/Zikula/Module/GroupsModule/Resources/views/User/grouprow_overview.tpl rename to src/system/GroupsModule/Resources/views/User/grouprow_overview.tpl diff --git a/src/system/Zikula/Module/GroupsModule/Resources/views/User/grouprow_read.tpl b/src/system/GroupsModule/Resources/views/User/grouprow_read.tpl similarity index 100% rename from src/system/Zikula/Module/GroupsModule/Resources/views/User/grouprow_read.tpl rename to src/system/GroupsModule/Resources/views/User/grouprow_read.tpl diff --git a/src/system/Zikula/Module/GroupsModule/Resources/views/User/main.tpl b/src/system/GroupsModule/Resources/views/User/main.tpl similarity index 100% rename from src/system/Zikula/Module/GroupsModule/Resources/views/User/main.tpl rename to src/system/GroupsModule/Resources/views/User/main.tpl diff --git a/src/system/Zikula/Module/GroupsModule/Resources/views/User/membership.tpl b/src/system/GroupsModule/Resources/views/User/membership.tpl similarity index 100% rename from src/system/Zikula/Module/GroupsModule/Resources/views/User/membership.tpl rename to src/system/GroupsModule/Resources/views/User/membership.tpl diff --git a/src/system/Zikula/Module/GroupsModule/Resources/views/User/memberslist.tpl b/src/system/GroupsModule/Resources/views/User/memberslist.tpl similarity index 100% rename from src/system/Zikula/Module/GroupsModule/Resources/views/User/memberslist.tpl rename to src/system/GroupsModule/Resources/views/User/memberslist.tpl diff --git a/src/system/Zikula/Module/GroupsModule/Resources/views/User/menu.tpl b/src/system/GroupsModule/Resources/views/User/menu.tpl similarity index 100% rename from src/system/Zikula/Module/GroupsModule/Resources/views/User/menu.tpl rename to src/system/GroupsModule/Resources/views/User/menu.tpl diff --git a/src/system/Zikula/Module/GroupsModule/Resources/views/User/view.tpl b/src/system/GroupsModule/Resources/views/User/view.tpl similarity index 100% rename from src/system/Zikula/Module/GroupsModule/Resources/views/User/view.tpl rename to src/system/GroupsModule/Resources/views/User/view.tpl diff --git a/src/system/Zikula/Module/GroupsModule/ZikulaGroupsModule.php b/src/system/GroupsModule/ZikulaGroupsModule.php similarity index 93% rename from src/system/Zikula/Module/GroupsModule/ZikulaGroupsModule.php rename to src/system/GroupsModule/ZikulaGroupsModule.php index 3d9816f877..1a7065472f 100644 --- a/src/system/Zikula/Module/GroupsModule/ZikulaGroupsModule.php +++ b/src/system/GroupsModule/ZikulaGroupsModule.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\GroupsModule; +namespace Zikula\GroupsModule; use Zikula\Bundle\CoreBundle\Bundle\AbstractCoreModule; diff --git a/src/system/Zikula/Module/GroupsModule/composer.json b/src/system/GroupsModule/composer.json similarity index 75% rename from src/system/Zikula/Module/GroupsModule/composer.json rename to src/system/GroupsModule/composer.json index d5be0d48fb..d3834bbf93 100644 --- a/src/system/Zikula/Module/GroupsModule/composer.json +++ b/src/system/GroupsModule/composer.json @@ -10,14 +10,14 @@ } ], "autoload": { - "psr-0": { "Zikula\\Module\\GroupsModule\\": "" } + "psr-4": { "Zikula\\GroupsModule\\": "" } }, "require": { "php": ">5.4.0" }, "extra": { "zikula": { - "class": "Zikula\\Module\\GroupsModule\\ZikulaGroupsModule" + "class": "Zikula\\GroupsModule\\ZikulaGroupsModule" } } } diff --git a/src/system/Zikula/Module/GroupsModule/phpunit.xml.dist b/src/system/GroupsModule/phpunit.xml.dist similarity index 100% rename from src/system/Zikula/Module/GroupsModule/phpunit.xml.dist rename to src/system/GroupsModule/phpunit.xml.dist diff --git a/src/system/Zikula/Module/GroupsModule/tables.php b/src/system/GroupsModule/tables.php similarity index 100% rename from src/system/Zikula/Module/GroupsModule/tables.php rename to src/system/GroupsModule/tables.php From 4b78c42157fd0a90dee5c5a81c2de8fa50ab2e66 Mon Sep 17 00:00:00 2001 From: Craig Heydenburg Date: Sun, 16 Aug 2015 18:14:31 -0400 Subject: [PATCH 07/35] convert PageLockModule to psr-4 --- composer.json | 4 +++- src/app/ZikulaKernel.php | 4 ++-- .../{Zikula/Module => }/MailerModule/.gitignore | 0 .../{Zikula/Module => }/MailerModule/.travis.yml | 0 .../Module => }/MailerModule/Api/AdminApi.php | 2 +- .../Module => }/MailerModule/Api/UserApi.php | 2 +- .../MailerModule/Controller/AdminController.php | 6 +++--- .../Form/Handler/ModifyConfigHandler.php | 2 +- .../MailerModule/Form/Handler/TestConfigHandler.php | 2 +- src/system/{Zikula/Module => }/MailerModule/LICENSE | 0 .../MailerModule/MailerModuleInstaller.php | 2 +- .../MailerModule/MailerModuleVersion.php | 2 +- .../{Zikula/Module => }/MailerModule/README.md | 0 .../MailerModule/Resources/config/routing.yml | 0 .../MailerModule/Resources/public/images/admin.png | Bin .../Resources/views/Admin/modifyconfig.tpl | 0 .../Resources/views/Admin/testconfig.tpl | 0 .../Module => }/MailerModule/ZikulaMailerModule.php | 2 +- .../{Zikula/Module => }/MailerModule/composer.json | 4 ++-- .../Module => }/MailerModule/phpunit.xml.dist | 0 .../{Zikula/Module => }/PageLockModule/.gitignore | 0 .../{Zikula/Module => }/PageLockModule/.travis.yml | 0 .../Module => }/PageLockModule/Api/UserApi.php | 4 ++-- .../PageLockModule/Controller/AjaxController.php | 2 +- .../PageLockModule/Entity/PageLockEntity.php | 2 +- .../{Zikula/Module => }/PageLockModule/LICENSE | 0 .../PageLockModule/PageLockModuleInstaller.php | 6 +++--- .../PageLockModule/PageLockModuleVersion.php | 2 +- .../{Zikula/Module => }/PageLockModule/README.md | 0 .../PageLockModule/Resources/config/routing.yml | 0 .../PageLockModule/Resources/public/css/style.css | 0 .../PageLockModule/Resources/public/js/PageLock.js | 0 .../PageLockModule/Resources/views/lockedWindow.tpl | 0 .../PageLockModule/ZikulaPageLockModule.php | 2 +- .../Module => }/PageLockModule/composer.json | 4 ++-- .../Module => }/PageLockModule/phpunit.xml.dist | 0 .../{Zikula/Module => }/PageLockModule/tables.php | 0 37 files changed, 28 insertions(+), 26 deletions(-) rename src/system/{Zikula/Module => }/MailerModule/.gitignore (100%) rename src/system/{Zikula/Module => }/MailerModule/.travis.yml (100%) rename src/system/{Zikula/Module => }/MailerModule/Api/AdminApi.php (97%) rename src/system/{Zikula/Module => }/MailerModule/Api/UserApi.php (99%) rename src/system/{Zikula/Module => }/MailerModule/Controller/AdminController.php (94%) rename src/system/{Zikula/Module => }/MailerModule/Form/Handler/ModifyConfigHandler.php (99%) rename src/system/{Zikula/Module => }/MailerModule/Form/Handler/TestConfigHandler.php (98%) rename src/system/{Zikula/Module => }/MailerModule/LICENSE (100%) rename src/system/{Zikula/Module => }/MailerModule/MailerModuleInstaller.php (99%) rename src/system/{Zikula/Module => }/MailerModule/MailerModuleVersion.php (97%) rename src/system/{Zikula/Module => }/MailerModule/README.md (100%) rename src/system/{Zikula/Module => }/MailerModule/Resources/config/routing.yml (100%) rename src/system/{Zikula/Module => }/MailerModule/Resources/public/images/admin.png (100%) rename src/system/{Zikula/Module => }/MailerModule/Resources/views/Admin/modifyconfig.tpl (100%) rename src/system/{Zikula/Module => }/MailerModule/Resources/views/Admin/testconfig.tpl (100%) rename src/system/{Zikula/Module => }/MailerModule/ZikulaMailerModule.php (94%) rename src/system/{Zikula/Module => }/MailerModule/composer.json (74%) rename src/system/{Zikula/Module => }/MailerModule/phpunit.xml.dist (100%) rename src/system/{Zikula/Module => }/PageLockModule/.gitignore (100%) rename src/system/{Zikula/Module => }/PageLockModule/.travis.yml (100%) rename src/system/{Zikula/Module => }/PageLockModule/Api/UserApi.php (99%) rename src/system/{Zikula/Module => }/PageLockModule/Controller/AjaxController.php (98%) rename src/system/{Zikula/Module => }/PageLockModule/Entity/PageLockEntity.php (98%) rename src/system/{Zikula/Module => }/PageLockModule/LICENSE (100%) rename src/system/{Zikula/Module => }/PageLockModule/PageLockModuleInstaller.php (91%) rename src/system/{Zikula/Module => }/PageLockModule/PageLockModuleVersion.php (96%) rename src/system/{Zikula/Module => }/PageLockModule/README.md (100%) rename src/system/{Zikula/Module => }/PageLockModule/Resources/config/routing.yml (100%) rename src/system/{Zikula/Module => }/PageLockModule/Resources/public/css/style.css (100%) rename src/system/{Zikula/Module => }/PageLockModule/Resources/public/js/PageLock.js (100%) rename src/system/{Zikula/Module => }/PageLockModule/Resources/views/lockedWindow.tpl (100%) rename src/system/{Zikula/Module => }/PageLockModule/ZikulaPageLockModule.php (93%) rename src/system/{Zikula/Module => }/PageLockModule/composer.json (74%) rename src/system/{Zikula/Module => }/PageLockModule/phpunit.xml.dist (100%) rename src/system/{Zikula/Module => }/PageLockModule/tables.php (100%) diff --git a/composer.json b/composer.json index 5cf2ec5322..6e856bb21f 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,9 @@ "Zikula\\BlocksModule\\": "src/system/BlocksModule", "Zikula\\CategoriesModule\\": "src/system/CategoriesModule", "Zikula\\ExtensionsModule\\": "src/system/ExtensionsModule", - "Zikula\\GroupsModule\\": "src/system/GroupsModule" + "Zikula\\GroupsModule\\": "src/system/GroupsModule", + "Zikula\\MailerModule\\": "src/system/MailerModule", + "Zikula\\PageLockModule\\": "src/system/PageLockModule" }, "classmap": [ "src/lib/util/", diff --git a/src/app/ZikulaKernel.php b/src/app/ZikulaKernel.php index 69c15b52a0..dc6a05835c 100644 --- a/src/app/ZikulaKernel.php +++ b/src/app/ZikulaKernel.php @@ -68,8 +68,8 @@ private function registerCoreModules(array &$bundles) $bundles[] = new Zikula\CategoriesModule\ZikulaCategoriesModule(); $bundles[] = new Zikula\ExtensionsModule\ZikulaExtensionsModule(); $bundles[] = new Zikula\GroupsModule\ZikulaGroupsModule(); - $bundles[] = new Zikula\Module\MailerModule\ZikulaMailerModule(); - $bundles[] = new Zikula\Module\PageLockModule\ZikulaPageLockModule(); + $bundles[] = new Zikula\MailerModule\ZikulaMailerModule(); + $bundles[] = new Zikula\PageLockModule\ZikulaPageLockModule(); $bundles[] = new Zikula\Module\PermissionsModule\ZikulaPermissionsModule(); $bundles[] = new Zikula\Module\SearchModule\ZikulaSearchModule(); $bundles[] = new Zikula\Module\SecurityCenterModule\ZikulaSecurityCenterModule(); diff --git a/src/system/Zikula/Module/MailerModule/.gitignore b/src/system/MailerModule/.gitignore similarity index 100% rename from src/system/Zikula/Module/MailerModule/.gitignore rename to src/system/MailerModule/.gitignore diff --git a/src/system/Zikula/Module/MailerModule/.travis.yml b/src/system/MailerModule/.travis.yml similarity index 100% rename from src/system/Zikula/Module/MailerModule/.travis.yml rename to src/system/MailerModule/.travis.yml diff --git a/src/system/Zikula/Module/MailerModule/Api/AdminApi.php b/src/system/MailerModule/Api/AdminApi.php similarity index 97% rename from src/system/Zikula/Module/MailerModule/Api/AdminApi.php rename to src/system/MailerModule/Api/AdminApi.php index 3114d91b51..2cd5c5d87f 100644 --- a/src/system/Zikula/Module/MailerModule/Api/AdminApi.php +++ b/src/system/MailerModule/Api/AdminApi.php @@ -12,7 +12,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\MailerModule\Api; +namespace Zikula\MailerModule\Api; use ModUtil; use SecurityUtil; diff --git a/src/system/Zikula/Module/MailerModule/Api/UserApi.php b/src/system/MailerModule/Api/UserApi.php similarity index 99% rename from src/system/Zikula/Module/MailerModule/Api/UserApi.php rename to src/system/MailerModule/Api/UserApi.php index b4afffb041..7b05aaa3e3 100644 --- a/src/system/Zikula/Module/MailerModule/Api/UserApi.php +++ b/src/system/MailerModule/Api/UserApi.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\MailerModule\Api; +namespace Zikula\MailerModule\Api; use LogUtil; use Zikula; diff --git a/src/system/Zikula/Module/MailerModule/Controller/AdminController.php b/src/system/MailerModule/Controller/AdminController.php similarity index 94% rename from src/system/Zikula/Module/MailerModule/Controller/AdminController.php rename to src/system/MailerModule/Controller/AdminController.php index 59356d3d58..0a5c800806 100644 --- a/src/system/Zikula/Module/MailerModule/Controller/AdminController.php +++ b/src/system/MailerModule/Controller/AdminController.php @@ -11,15 +11,15 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\MailerModule\Controller; +namespace Zikula\MailerModule\Controller; use Symfony\Component\Security\Core\Exception\AccessDeniedException; use Zikula_View; use SecurityUtil; use FormUtil; use System; -use Zikula\Module\MailerModule\Form\Handler\ModifyConfigHandler; -use Zikula\Module\MailerModule\Form\Handler\TestConfigHandler; +use Zikula\MailerModule\Form\Handler\ModifyConfigHandler; +use Zikula\MailerModule\Form\Handler\TestConfigHandler; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\RedirectResponse; use Symfony\Component\Routing\RouterInterface; diff --git a/src/system/Zikula/Module/MailerModule/Form/Handler/ModifyConfigHandler.php b/src/system/MailerModule/Form/Handler/ModifyConfigHandler.php similarity index 99% rename from src/system/Zikula/Module/MailerModule/Form/Handler/ModifyConfigHandler.php rename to src/system/MailerModule/Form/Handler/ModifyConfigHandler.php index 99345c5e6c..e618854543 100644 --- a/src/system/Zikula/Module/MailerModule/Form/Handler/ModifyConfigHandler.php +++ b/src/system/MailerModule/Form/Handler/ModifyConfigHandler.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\MailerModule\Form\Handler; +namespace Zikula\MailerModule\Form\Handler; use Zikula_Form_View; use SecurityUtil; diff --git a/src/system/Zikula/Module/MailerModule/Form/Handler/TestConfigHandler.php b/src/system/MailerModule/Form/Handler/TestConfigHandler.php similarity index 98% rename from src/system/Zikula/Module/MailerModule/Form/Handler/TestConfigHandler.php rename to src/system/MailerModule/Form/Handler/TestConfigHandler.php index e8dba0cb3a..78a5ba6ec2 100644 --- a/src/system/Zikula/Module/MailerModule/Form/Handler/TestConfigHandler.php +++ b/src/system/MailerModule/Form/Handler/TestConfigHandler.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\MailerModule\Form\Handler; +namespace Zikula\MailerModule\Form\Handler; use Zikula_Form_View; use SecurityUtil; diff --git a/src/system/Zikula/Module/MailerModule/LICENSE b/src/system/MailerModule/LICENSE similarity index 100% rename from src/system/Zikula/Module/MailerModule/LICENSE rename to src/system/MailerModule/LICENSE diff --git a/src/system/Zikula/Module/MailerModule/MailerModuleInstaller.php b/src/system/MailerModule/MailerModuleInstaller.php similarity index 99% rename from src/system/Zikula/Module/MailerModule/MailerModuleInstaller.php rename to src/system/MailerModule/MailerModuleInstaller.php index 342f344cde..61b66982c4 100644 --- a/src/system/Zikula/Module/MailerModule/MailerModuleInstaller.php +++ b/src/system/MailerModule/MailerModuleInstaller.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\MailerModule; +namespace Zikula\MailerModule; use ZLanguage; use HookUtil; diff --git a/src/system/Zikula/Module/MailerModule/MailerModuleVersion.php b/src/system/MailerModule/MailerModuleVersion.php similarity index 97% rename from src/system/Zikula/Module/MailerModule/MailerModuleVersion.php rename to src/system/MailerModule/MailerModuleVersion.php index 14f228f12c..c59030a3fb 100644 --- a/src/system/Zikula/Module/MailerModule/MailerModuleVersion.php +++ b/src/system/MailerModule/MailerModuleVersion.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\MailerModule; +namespace Zikula\MailerModule; use HookUtil; use Zikula\Component\HookDispatcher\SubscriberBundle; diff --git a/src/system/Zikula/Module/MailerModule/README.md b/src/system/MailerModule/README.md similarity index 100% rename from src/system/Zikula/Module/MailerModule/README.md rename to src/system/MailerModule/README.md diff --git a/src/system/Zikula/Module/MailerModule/Resources/config/routing.yml b/src/system/MailerModule/Resources/config/routing.yml similarity index 100% rename from src/system/Zikula/Module/MailerModule/Resources/config/routing.yml rename to src/system/MailerModule/Resources/config/routing.yml diff --git a/src/system/Zikula/Module/MailerModule/Resources/public/images/admin.png b/src/system/MailerModule/Resources/public/images/admin.png similarity index 100% rename from src/system/Zikula/Module/MailerModule/Resources/public/images/admin.png rename to src/system/MailerModule/Resources/public/images/admin.png diff --git a/src/system/Zikula/Module/MailerModule/Resources/views/Admin/modifyconfig.tpl b/src/system/MailerModule/Resources/views/Admin/modifyconfig.tpl similarity index 100% rename from src/system/Zikula/Module/MailerModule/Resources/views/Admin/modifyconfig.tpl rename to src/system/MailerModule/Resources/views/Admin/modifyconfig.tpl diff --git a/src/system/Zikula/Module/MailerModule/Resources/views/Admin/testconfig.tpl b/src/system/MailerModule/Resources/views/Admin/testconfig.tpl similarity index 100% rename from src/system/Zikula/Module/MailerModule/Resources/views/Admin/testconfig.tpl rename to src/system/MailerModule/Resources/views/Admin/testconfig.tpl diff --git a/src/system/Zikula/Module/MailerModule/ZikulaMailerModule.php b/src/system/MailerModule/ZikulaMailerModule.php similarity index 94% rename from src/system/Zikula/Module/MailerModule/ZikulaMailerModule.php rename to src/system/MailerModule/ZikulaMailerModule.php index c26ac4373b..363bf58281 100644 --- a/src/system/Zikula/Module/MailerModule/ZikulaMailerModule.php +++ b/src/system/MailerModule/ZikulaMailerModule.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\MailerModule; +namespace Zikula\MailerModule; use Zikula\Bundle\CoreBundle\Bundle\AbstractCoreModule; diff --git a/src/system/Zikula/Module/MailerModule/composer.json b/src/system/MailerModule/composer.json similarity index 74% rename from src/system/Zikula/Module/MailerModule/composer.json rename to src/system/MailerModule/composer.json index a268a74f47..b91bf8e0e3 100644 --- a/src/system/Zikula/Module/MailerModule/composer.json +++ b/src/system/MailerModule/composer.json @@ -10,14 +10,14 @@ } ], "autoload": { - "psr-0": { "Zikula\\Module\\MailerModule\\": "" } + "psr-0": { "Zikula\\MailerModule\\": "" } }, "require": { "php": ">5.4.0" }, "extra": { "zikula": { - "class": "Zikula\\Module\\MailerModule\\ZikulaMailerModule" + "class": "Zikula\\MailerModule\\ZikulaMailerModule" } } } diff --git a/src/system/Zikula/Module/MailerModule/phpunit.xml.dist b/src/system/MailerModule/phpunit.xml.dist similarity index 100% rename from src/system/Zikula/Module/MailerModule/phpunit.xml.dist rename to src/system/MailerModule/phpunit.xml.dist diff --git a/src/system/Zikula/Module/PageLockModule/.gitignore b/src/system/PageLockModule/.gitignore similarity index 100% rename from src/system/Zikula/Module/PageLockModule/.gitignore rename to src/system/PageLockModule/.gitignore diff --git a/src/system/Zikula/Module/PageLockModule/.travis.yml b/src/system/PageLockModule/.travis.yml similarity index 100% rename from src/system/Zikula/Module/PageLockModule/.travis.yml rename to src/system/PageLockModule/.travis.yml diff --git a/src/system/Zikula/Module/PageLockModule/Api/UserApi.php b/src/system/PageLockModule/Api/UserApi.php similarity index 99% rename from src/system/Zikula/Module/PageLockModule/Api/UserApi.php rename to src/system/PageLockModule/Api/UserApi.php index c2e95f1ea2..c48e84a4bd 100644 --- a/src/system/Zikula/Module/PageLockModule/Api/UserApi.php +++ b/src/system/PageLockModule/Api/UserApi.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\PageLockModule\Api; +namespace Zikula\PageLockModule\Api; use UserUtil; use PageUtil; @@ -21,7 +21,7 @@ use DataUtil; use DateUtil; use ServiceUtil; -use Zikula\Module\PageLockModule\Entity\PageLockEntity; +use Zikula\PageLockModule\Entity\PageLockEntity; /** * API functions used by user controllers diff --git a/src/system/Zikula/Module/PageLockModule/Controller/AjaxController.php b/src/system/PageLockModule/Controller/AjaxController.php similarity index 98% rename from src/system/Zikula/Module/PageLockModule/Controller/AjaxController.php rename to src/system/PageLockModule/Controller/AjaxController.php index 37e80dc011..4d16f9bd99 100644 --- a/src/system/Zikula/Module/PageLockModule/Controller/AjaxController.php +++ b/src/system/PageLockModule/Controller/AjaxController.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\PageLockModule\Controller; +namespace Zikula\PageLockModule\Controller; use UserUtil; use ModUtil; diff --git a/src/system/Zikula/Module/PageLockModule/Entity/PageLockEntity.php b/src/system/PageLockModule/Entity/PageLockEntity.php similarity index 98% rename from src/system/Zikula/Module/PageLockModule/Entity/PageLockEntity.php rename to src/system/PageLockModule/Entity/PageLockEntity.php index 28d981453a..6150cad5aa 100644 --- a/src/system/Zikula/Module/PageLockModule/Entity/PageLockEntity.php +++ b/src/system/PageLockModule/Entity/PageLockEntity.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\PageLockModule\Entity; +namespace Zikula\PageLockModule\Entity; use Doctrine\ORM\Mapping as ORM; diff --git a/src/system/Zikula/Module/PageLockModule/LICENSE b/src/system/PageLockModule/LICENSE similarity index 100% rename from src/system/Zikula/Module/PageLockModule/LICENSE rename to src/system/PageLockModule/LICENSE diff --git a/src/system/Zikula/Module/PageLockModule/PageLockModuleInstaller.php b/src/system/PageLockModule/PageLockModuleInstaller.php similarity index 91% rename from src/system/Zikula/Module/PageLockModule/PageLockModuleInstaller.php rename to src/system/PageLockModule/PageLockModuleInstaller.php index 2df5821338..2569075365 100644 --- a/src/system/Zikula/Module/PageLockModule/PageLockModuleInstaller.php +++ b/src/system/PageLockModule/PageLockModuleInstaller.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\PageLockModule; +namespace Zikula\PageLockModule; use DoctrineHelper; @@ -30,7 +30,7 @@ public function install() { try { DoctrineHelper::createSchema($this->entityManager, array( - 'Zikula\Module\PageLockModule\Entity\PageLockEntity', + 'Zikula\PageLockModule\Entity\PageLockEntity', )); } catch (\Exception $e) { return false; @@ -60,7 +60,7 @@ public function uninstall() { try { - DoctrineHelper::dropSchema($this->entityManager, array('Zikula\Module\PageLockModule\Entity\PageLockEntity')); + DoctrineHelper::dropSchema($this->entityManager, array('Zikula\PageLockModule\Entity\PageLockEntity')); } catch (\PDOException $e) { $this->request->getSession()->getFlashBag()->add('error', $e->getMessage()); diff --git a/src/system/Zikula/Module/PageLockModule/PageLockModuleVersion.php b/src/system/PageLockModule/PageLockModuleVersion.php similarity index 96% rename from src/system/Zikula/Module/PageLockModule/PageLockModuleVersion.php rename to src/system/PageLockModule/PageLockModuleVersion.php index 54ac1d2cf5..9e2c574d06 100644 --- a/src/system/Zikula/Module/PageLockModule/PageLockModuleVersion.php +++ b/src/system/PageLockModule/PageLockModuleVersion.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\PageLockModule; +namespace Zikula\PageLockModule; /** * Version information for the pagelock module diff --git a/src/system/Zikula/Module/PageLockModule/README.md b/src/system/PageLockModule/README.md similarity index 100% rename from src/system/Zikula/Module/PageLockModule/README.md rename to src/system/PageLockModule/README.md diff --git a/src/system/Zikula/Module/PageLockModule/Resources/config/routing.yml b/src/system/PageLockModule/Resources/config/routing.yml similarity index 100% rename from src/system/Zikula/Module/PageLockModule/Resources/config/routing.yml rename to src/system/PageLockModule/Resources/config/routing.yml diff --git a/src/system/Zikula/Module/PageLockModule/Resources/public/css/style.css b/src/system/PageLockModule/Resources/public/css/style.css similarity index 100% rename from src/system/Zikula/Module/PageLockModule/Resources/public/css/style.css rename to src/system/PageLockModule/Resources/public/css/style.css diff --git a/src/system/Zikula/Module/PageLockModule/Resources/public/js/PageLock.js b/src/system/PageLockModule/Resources/public/js/PageLock.js similarity index 100% rename from src/system/Zikula/Module/PageLockModule/Resources/public/js/PageLock.js rename to src/system/PageLockModule/Resources/public/js/PageLock.js diff --git a/src/system/Zikula/Module/PageLockModule/Resources/views/lockedWindow.tpl b/src/system/PageLockModule/Resources/views/lockedWindow.tpl similarity index 100% rename from src/system/Zikula/Module/PageLockModule/Resources/views/lockedWindow.tpl rename to src/system/PageLockModule/Resources/views/lockedWindow.tpl diff --git a/src/system/Zikula/Module/PageLockModule/ZikulaPageLockModule.php b/src/system/PageLockModule/ZikulaPageLockModule.php similarity index 93% rename from src/system/Zikula/Module/PageLockModule/ZikulaPageLockModule.php rename to src/system/PageLockModule/ZikulaPageLockModule.php index ccd13de493..ef4067e426 100644 --- a/src/system/Zikula/Module/PageLockModule/ZikulaPageLockModule.php +++ b/src/system/PageLockModule/ZikulaPageLockModule.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\PageLockModule; +namespace Zikula\PageLockModule; use Zikula\Bundle\CoreBundle\Bundle\AbstractCoreModule; diff --git a/src/system/Zikula/Module/PageLockModule/composer.json b/src/system/PageLockModule/composer.json similarity index 74% rename from src/system/Zikula/Module/PageLockModule/composer.json rename to src/system/PageLockModule/composer.json index 63335f9506..bed2d3eb14 100644 --- a/src/system/Zikula/Module/PageLockModule/composer.json +++ b/src/system/PageLockModule/composer.json @@ -10,14 +10,14 @@ } ], "autoload": { - "psr-0": { "Zikula\\Module\\PageLockModule\\": "" } + "psr-4": { "Zikula\\PageLockModule\\": "" } }, "require": { "php": ">5.4.0" }, "extra": { "zikula": { - "class": "Zikula\\Module\\PageLockModule\\ZikulaPageLockModule" + "class": "Zikula\\PageLockModule\\ZikulaPageLockModule" } } } diff --git a/src/system/Zikula/Module/PageLockModule/phpunit.xml.dist b/src/system/PageLockModule/phpunit.xml.dist similarity index 100% rename from src/system/Zikula/Module/PageLockModule/phpunit.xml.dist rename to src/system/PageLockModule/phpunit.xml.dist diff --git a/src/system/Zikula/Module/PageLockModule/tables.php b/src/system/PageLockModule/tables.php similarity index 100% rename from src/system/Zikula/Module/PageLockModule/tables.php rename to src/system/PageLockModule/tables.php From 4488b83613cc846bca953d64b58ca0efff48a8a7 Mon Sep 17 00:00:00 2001 From: Craig Heydenburg Date: Sun, 16 Aug 2015 18:17:11 -0400 Subject: [PATCH 08/35] convert PermissionsModule to psr-4 --- composer.json | 3 ++- src/app/ZikulaKernel.php | 2 +- .../Module => }/PermissionsModule/.gitignore | 0 .../Module => }/PermissionsModule/.travis.yml | 0 .../Module => }/PermissionsModule/Api/AdminApi.php | 4 ++-- .../Controller/AdminController.php | 2 +- .../PermissionsModule/Controller/AjaxController.php | 2 +- .../PermissionsModule/Entity/PermissionEntity.php | 2 +- .../{Zikula/Module => }/PermissionsModule/LICENSE | 0 .../PermissionsModuleInstaller.php | 6 +++--- .../PermissionsModule/PermissionsModuleVersion.php | 2 +- .../{Zikula/Module => }/PermissionsModule/README.md | 0 .../PermissionsModule/Resources/config/routing.yml | 0 .../Resources/public/css/style.css | 0 .../Resources/public/images/admin.png | Bin .../js/Zikula.Permission.Admin.ModifyConfig.js | 0 .../public/js/Zikula.Permission.Admin.View.js | 0 .../Resources/views/Admin/delete.tpl | 0 .../Resources/views/Admin/instanceinfo.tpl | 0 .../Resources/views/Admin/listedit.tpl | 0 .../Resources/views/Admin/modifyconfig.tpl | 0 .../Resources/views/Admin/view.tpl | 0 .../Resources/views/Admin/viewinstanceinfo.tpl | 0 .../PermissionsModule/ZikulaPermissionsModule.php | 2 +- .../Module => }/PermissionsModule/composer.json | 4 ++-- .../Module => }/PermissionsModule/phpunit.xml.dist | 0 .../Module => }/PermissionsModule/tables.php | 0 27 files changed, 15 insertions(+), 14 deletions(-) rename src/system/{Zikula/Module => }/PermissionsModule/.gitignore (100%) rename src/system/{Zikula/Module => }/PermissionsModule/.travis.yml (100%) rename src/system/{Zikula/Module => }/PermissionsModule/Api/AdminApi.php (99%) rename src/system/{Zikula/Module => }/PermissionsModule/Controller/AdminController.php (99%) rename src/system/{Zikula/Module => }/PermissionsModule/Controller/AjaxController.php (99%) rename src/system/{Zikula/Module => }/PermissionsModule/Entity/PermissionEntity.php (99%) rename src/system/{Zikula/Module => }/PermissionsModule/LICENSE (100%) rename src/system/{Zikula/Module => }/PermissionsModule/PermissionsModuleInstaller.php (96%) rename src/system/{Zikula/Module => }/PermissionsModule/PermissionsModuleVersion.php (96%) rename src/system/{Zikula/Module => }/PermissionsModule/README.md (100%) rename src/system/{Zikula/Module => }/PermissionsModule/Resources/config/routing.yml (100%) rename src/system/{Zikula/Module => }/PermissionsModule/Resources/public/css/style.css (100%) rename src/system/{Zikula/Module => }/PermissionsModule/Resources/public/images/admin.png (100%) rename src/system/{Zikula/Module => }/PermissionsModule/Resources/public/js/Zikula.Permission.Admin.ModifyConfig.js (100%) rename src/system/{Zikula/Module => }/PermissionsModule/Resources/public/js/Zikula.Permission.Admin.View.js (100%) rename src/system/{Zikula/Module => }/PermissionsModule/Resources/views/Admin/delete.tpl (100%) rename src/system/{Zikula/Module => }/PermissionsModule/Resources/views/Admin/instanceinfo.tpl (100%) rename src/system/{Zikula/Module => }/PermissionsModule/Resources/views/Admin/listedit.tpl (100%) rename src/system/{Zikula/Module => }/PermissionsModule/Resources/views/Admin/modifyconfig.tpl (100%) rename src/system/{Zikula/Module => }/PermissionsModule/Resources/views/Admin/view.tpl (100%) rename src/system/{Zikula/Module => }/PermissionsModule/Resources/views/Admin/viewinstanceinfo.tpl (100%) rename src/system/{Zikula/Module => }/PermissionsModule/ZikulaPermissionsModule.php (93%) rename src/system/{Zikula/Module => }/PermissionsModule/composer.json (73%) rename src/system/{Zikula/Module => }/PermissionsModule/phpunit.xml.dist (100%) rename src/system/{Zikula/Module => }/PermissionsModule/tables.php (100%) diff --git a/composer.json b/composer.json index 6e856bb21f..dfcccc3eff 100644 --- a/composer.json +++ b/composer.json @@ -24,7 +24,8 @@ "Zikula\\ExtensionsModule\\": "src/system/ExtensionsModule", "Zikula\\GroupsModule\\": "src/system/GroupsModule", "Zikula\\MailerModule\\": "src/system/MailerModule", - "Zikula\\PageLockModule\\": "src/system/PageLockModule" + "Zikula\\PageLockModule\\": "src/system/PageLockModule", + "Zikula\\PermissionsModule\\": "src/system/PermissionsModule" }, "classmap": [ "src/lib/util/", diff --git a/src/app/ZikulaKernel.php b/src/app/ZikulaKernel.php index dc6a05835c..21b5e73335 100644 --- a/src/app/ZikulaKernel.php +++ b/src/app/ZikulaKernel.php @@ -70,7 +70,7 @@ private function registerCoreModules(array &$bundles) $bundles[] = new Zikula\GroupsModule\ZikulaGroupsModule(); $bundles[] = new Zikula\MailerModule\ZikulaMailerModule(); $bundles[] = new Zikula\PageLockModule\ZikulaPageLockModule(); - $bundles[] = new Zikula\Module\PermissionsModule\ZikulaPermissionsModule(); + $bundles[] = new Zikula\PermissionsModule\ZikulaPermissionsModule(); $bundles[] = new Zikula\Module\SearchModule\ZikulaSearchModule(); $bundles[] = new Zikula\Module\SecurityCenterModule\ZikulaSecurityCenterModule(); $bundles[] = new Zikula\Module\SettingsModule\ZikulaSettingsModule(); diff --git a/src/system/Zikula/Module/PermissionsModule/.gitignore b/src/system/PermissionsModule/.gitignore similarity index 100% rename from src/system/Zikula/Module/PermissionsModule/.gitignore rename to src/system/PermissionsModule/.gitignore diff --git a/src/system/Zikula/Module/PermissionsModule/.travis.yml b/src/system/PermissionsModule/.travis.yml similarity index 100% rename from src/system/Zikula/Module/PermissionsModule/.travis.yml rename to src/system/PermissionsModule/.travis.yml diff --git a/src/system/Zikula/Module/PermissionsModule/Api/AdminApi.php b/src/system/PermissionsModule/Api/AdminApi.php similarity index 99% rename from src/system/Zikula/Module/PermissionsModule/Api/AdminApi.php rename to src/system/PermissionsModule/Api/AdminApi.php index 87c05b2748..a653c1ad33 100644 --- a/src/system/Zikula/Module/PermissionsModule/Api/AdminApi.php +++ b/src/system/PermissionsModule/Api/AdminApi.php @@ -11,12 +11,12 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\PermissionsModule\Api; +namespace Zikula\PermissionsModule\Api; use SecurityUtil; use BlockUtil; use ModUtil; -use Zikula\Module\PermissionsModule\Entity\PermissionEntity; +use Zikula\PermissionsModule\Entity\PermissionEntity; use Symfony\Component\Security\Core\Exception\AccessDeniedException; /** diff --git a/src/system/Zikula/Module/PermissionsModule/Controller/AdminController.php b/src/system/PermissionsModule/Controller/AdminController.php similarity index 99% rename from src/system/Zikula/Module/PermissionsModule/Controller/AdminController.php rename to src/system/PermissionsModule/Controller/AdminController.php index 616118fd48..aa0cc84d87 100644 --- a/src/system/Zikula/Module/PermissionsModule/Controller/AdminController.php +++ b/src/system/PermissionsModule/Controller/AdminController.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\PermissionsModule\Controller; +namespace Zikula\PermissionsModule\Controller; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; diff --git a/src/system/Zikula/Module/PermissionsModule/Controller/AjaxController.php b/src/system/PermissionsModule/Controller/AjaxController.php similarity index 99% rename from src/system/Zikula/Module/PermissionsModule/Controller/AjaxController.php rename to src/system/PermissionsModule/Controller/AjaxController.php index f4fcb055dc..41614288ea 100644 --- a/src/system/Zikula/Module/PermissionsModule/Controller/AjaxController.php +++ b/src/system/PermissionsModule/Controller/AjaxController.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\PermissionsModule\Controller; +namespace Zikula\PermissionsModule\Controller; use SecurityUtil; use ModUtil; diff --git a/src/system/Zikula/Module/PermissionsModule/Entity/PermissionEntity.php b/src/system/PermissionsModule/Entity/PermissionEntity.php similarity index 99% rename from src/system/Zikula/Module/PermissionsModule/Entity/PermissionEntity.php rename to src/system/PermissionsModule/Entity/PermissionEntity.php index b9f3f9571c..bde8ce3eba 100644 --- a/src/system/Zikula/Module/PermissionsModule/Entity/PermissionEntity.php +++ b/src/system/PermissionsModule/Entity/PermissionEntity.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\PermissionsModule\Entity; +namespace Zikula\PermissionsModule\Entity; use Zikula\Core\Doctrine\EntityAccess; use Doctrine\ORM\Mapping as ORM; diff --git a/src/system/Zikula/Module/PermissionsModule/LICENSE b/src/system/PermissionsModule/LICENSE similarity index 100% rename from src/system/Zikula/Module/PermissionsModule/LICENSE rename to src/system/PermissionsModule/LICENSE diff --git a/src/system/Zikula/Module/PermissionsModule/PermissionsModuleInstaller.php b/src/system/PermissionsModule/PermissionsModuleInstaller.php similarity index 96% rename from src/system/Zikula/Module/PermissionsModule/PermissionsModuleInstaller.php rename to src/system/PermissionsModule/PermissionsModuleInstaller.php index d6e56a6743..dc8aa5103e 100644 --- a/src/system/Zikula/Module/PermissionsModule/PermissionsModuleInstaller.php +++ b/src/system/PermissionsModule/PermissionsModuleInstaller.php @@ -11,9 +11,9 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\PermissionsModule; +namespace Zikula\PermissionsModule; -use Zikula\Module\PermissionsModule\Entity\PermissionEntity; +use Zikula\PermissionsModule\Entity\PermissionEntity; /** * Installation and upgrade routines for the permissions module @@ -32,7 +32,7 @@ public function install() { // create the table try { - \DoctrineHelper::createSchema($this->entityManager, array('Zikula\Module\PermissionsModule\Entity\PermissionEntity')); + \DoctrineHelper::createSchema($this->entityManager, array('Zikula\PermissionsModule\Entity\PermissionEntity')); } catch (\Exception $e) { return false; } diff --git a/src/system/Zikula/Module/PermissionsModule/PermissionsModuleVersion.php b/src/system/PermissionsModule/PermissionsModuleVersion.php similarity index 96% rename from src/system/Zikula/Module/PermissionsModule/PermissionsModuleVersion.php rename to src/system/PermissionsModule/PermissionsModuleVersion.php index 5231fd50e7..b9c1a72810 100644 --- a/src/system/Zikula/Module/PermissionsModule/PermissionsModuleVersion.php +++ b/src/system/PermissionsModule/PermissionsModuleVersion.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\PermissionsModule; +namespace Zikula\PermissionsModule; /** * Version information for the permissions module diff --git a/src/system/Zikula/Module/PermissionsModule/README.md b/src/system/PermissionsModule/README.md similarity index 100% rename from src/system/Zikula/Module/PermissionsModule/README.md rename to src/system/PermissionsModule/README.md diff --git a/src/system/Zikula/Module/PermissionsModule/Resources/config/routing.yml b/src/system/PermissionsModule/Resources/config/routing.yml similarity index 100% rename from src/system/Zikula/Module/PermissionsModule/Resources/config/routing.yml rename to src/system/PermissionsModule/Resources/config/routing.yml diff --git a/src/system/Zikula/Module/PermissionsModule/Resources/public/css/style.css b/src/system/PermissionsModule/Resources/public/css/style.css similarity index 100% rename from src/system/Zikula/Module/PermissionsModule/Resources/public/css/style.css rename to src/system/PermissionsModule/Resources/public/css/style.css diff --git a/src/system/Zikula/Module/PermissionsModule/Resources/public/images/admin.png b/src/system/PermissionsModule/Resources/public/images/admin.png similarity index 100% rename from src/system/Zikula/Module/PermissionsModule/Resources/public/images/admin.png rename to src/system/PermissionsModule/Resources/public/images/admin.png diff --git a/src/system/Zikula/Module/PermissionsModule/Resources/public/js/Zikula.Permission.Admin.ModifyConfig.js b/src/system/PermissionsModule/Resources/public/js/Zikula.Permission.Admin.ModifyConfig.js similarity index 100% rename from src/system/Zikula/Module/PermissionsModule/Resources/public/js/Zikula.Permission.Admin.ModifyConfig.js rename to src/system/PermissionsModule/Resources/public/js/Zikula.Permission.Admin.ModifyConfig.js diff --git a/src/system/Zikula/Module/PermissionsModule/Resources/public/js/Zikula.Permission.Admin.View.js b/src/system/PermissionsModule/Resources/public/js/Zikula.Permission.Admin.View.js similarity index 100% rename from src/system/Zikula/Module/PermissionsModule/Resources/public/js/Zikula.Permission.Admin.View.js rename to src/system/PermissionsModule/Resources/public/js/Zikula.Permission.Admin.View.js diff --git a/src/system/Zikula/Module/PermissionsModule/Resources/views/Admin/delete.tpl b/src/system/PermissionsModule/Resources/views/Admin/delete.tpl similarity index 100% rename from src/system/Zikula/Module/PermissionsModule/Resources/views/Admin/delete.tpl rename to src/system/PermissionsModule/Resources/views/Admin/delete.tpl diff --git a/src/system/Zikula/Module/PermissionsModule/Resources/views/Admin/instanceinfo.tpl b/src/system/PermissionsModule/Resources/views/Admin/instanceinfo.tpl similarity index 100% rename from src/system/Zikula/Module/PermissionsModule/Resources/views/Admin/instanceinfo.tpl rename to src/system/PermissionsModule/Resources/views/Admin/instanceinfo.tpl diff --git a/src/system/Zikula/Module/PermissionsModule/Resources/views/Admin/listedit.tpl b/src/system/PermissionsModule/Resources/views/Admin/listedit.tpl similarity index 100% rename from src/system/Zikula/Module/PermissionsModule/Resources/views/Admin/listedit.tpl rename to src/system/PermissionsModule/Resources/views/Admin/listedit.tpl diff --git a/src/system/Zikula/Module/PermissionsModule/Resources/views/Admin/modifyconfig.tpl b/src/system/PermissionsModule/Resources/views/Admin/modifyconfig.tpl similarity index 100% rename from src/system/Zikula/Module/PermissionsModule/Resources/views/Admin/modifyconfig.tpl rename to src/system/PermissionsModule/Resources/views/Admin/modifyconfig.tpl diff --git a/src/system/Zikula/Module/PermissionsModule/Resources/views/Admin/view.tpl b/src/system/PermissionsModule/Resources/views/Admin/view.tpl similarity index 100% rename from src/system/Zikula/Module/PermissionsModule/Resources/views/Admin/view.tpl rename to src/system/PermissionsModule/Resources/views/Admin/view.tpl diff --git a/src/system/Zikula/Module/PermissionsModule/Resources/views/Admin/viewinstanceinfo.tpl b/src/system/PermissionsModule/Resources/views/Admin/viewinstanceinfo.tpl similarity index 100% rename from src/system/Zikula/Module/PermissionsModule/Resources/views/Admin/viewinstanceinfo.tpl rename to src/system/PermissionsModule/Resources/views/Admin/viewinstanceinfo.tpl diff --git a/src/system/Zikula/Module/PermissionsModule/ZikulaPermissionsModule.php b/src/system/PermissionsModule/ZikulaPermissionsModule.php similarity index 93% rename from src/system/Zikula/Module/PermissionsModule/ZikulaPermissionsModule.php rename to src/system/PermissionsModule/ZikulaPermissionsModule.php index a7e33bac44..13435770b7 100644 --- a/src/system/Zikula/Module/PermissionsModule/ZikulaPermissionsModule.php +++ b/src/system/PermissionsModule/ZikulaPermissionsModule.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\PermissionsModule; +namespace Zikula\PermissionsModule; use Zikula\Bundle\CoreBundle\Bundle\AbstractCoreModule; diff --git a/src/system/Zikula/Module/PermissionsModule/composer.json b/src/system/PermissionsModule/composer.json similarity index 73% rename from src/system/Zikula/Module/PermissionsModule/composer.json rename to src/system/PermissionsModule/composer.json index b6f538ad99..0ff4c029ac 100644 --- a/src/system/Zikula/Module/PermissionsModule/composer.json +++ b/src/system/PermissionsModule/composer.json @@ -10,14 +10,14 @@ } ], "autoload": { - "psr-0": { "Zikula\\Module\\PermissionsModule\\": "" } + "psr-4": { "Zikula\\PermissionsModule\\": "" } }, "require": { "php": ">5.4.0" }, "extra": { "zikula": { - "class": "Zikula\\Module\\PermissionsModule\\ZikulaPermissionsModule" + "class": "Zikula\\PermissionsModule\\ZikulaPermissionsModule" } } } diff --git a/src/system/Zikula/Module/PermissionsModule/phpunit.xml.dist b/src/system/PermissionsModule/phpunit.xml.dist similarity index 100% rename from src/system/Zikula/Module/PermissionsModule/phpunit.xml.dist rename to src/system/PermissionsModule/phpunit.xml.dist diff --git a/src/system/Zikula/Module/PermissionsModule/tables.php b/src/system/PermissionsModule/tables.php similarity index 100% rename from src/system/Zikula/Module/PermissionsModule/tables.php rename to src/system/PermissionsModule/tables.php From 1efbad930f753520f7d2b5fe85962f2b4f1ff8bd Mon Sep 17 00:00:00 2001 From: Craig Heydenburg Date: Sun, 16 Aug 2015 18:20:18 -0400 Subject: [PATCH 09/35] reorganize composer file --- composer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index dfcccc3eff..90188b3ab4 100644 --- a/composer.json +++ b/composer.json @@ -16,8 +16,6 @@ "CustomBundle\\": "src/app/custom" }, "psr-4": { - "Zikula\\RoutesModule\\": "src/system/ZikulaRoutesModule", - "Zikula\\ThemeModule\\": "src/system/ThemeModule", "Zikula\\AdminModule\\": "src/system/AdminModule", "Zikula\\BlocksModule\\": "src/system/BlocksModule", "Zikula\\CategoriesModule\\": "src/system/CategoriesModule", @@ -25,7 +23,9 @@ "Zikula\\GroupsModule\\": "src/system/GroupsModule", "Zikula\\MailerModule\\": "src/system/MailerModule", "Zikula\\PageLockModule\\": "src/system/PageLockModule", - "Zikula\\PermissionsModule\\": "src/system/PermissionsModule" + "Zikula\\PermissionsModule\\": "src/system/PermissionsModule", + "Zikula\\RoutesModule\\": "src/system/ZikulaRoutesModule", + "Zikula\\ThemeModule\\": "src/system/ThemeModule" }, "classmap": [ "src/lib/util/", From 201b066b6701ff29c8889d809cbf4d3cbb70cdc3 Mon Sep 17 00:00:00 2001 From: Craig Heydenburg Date: Sun, 16 Aug 2015 18:32:57 -0400 Subject: [PATCH 10/35] convert SearchModule to psr-4 (@Guite note change to AbstractSearchable for MOST) --- composer.json | 1 + src/app/ZikulaKernel.php | 2 +- src/docs/en/dev/UPGRADE-1.4.0.md | 7 +++++-- .../SearchModule/AbstractSearchable.php | 19 ++++++++++++++++++ .../Module => }/SearchModule/.gitignore | 0 .../Module => }/SearchModule/.travis.yml | 0 .../SearchModule/AbstractSearchable.php | 2 +- .../Module => }/SearchModule/Api/AdminApi.php | 2 +- .../Module => }/SearchModule/Api/UserApi.php | 12 +++++------ .../SearchModule/Block/SearchBlock.php | 2 +- .../Controller/AdminController.php | 4 ++-- .../Controller/UserController.php | 4 ++-- .../ZikulaSearchExtension.php | 2 +- .../Entity/SearchResultEntity.php | 2 +- .../SearchModule/Entity/SearchStatEntity.php | 2 +- .../SearchModule/EventHandlers.php | 4 ++-- .../{Zikula/Module => }/SearchModule/LICENSE | 0 .../Listener/FrontControllerListener.php | 2 +- .../Listener/ModuleEventListener.php | 2 +- .../Module => }/SearchModule/README.md | 0 .../SearchModule/Resources/config/routing.yml | 0 .../Resources/config/services.xml | 4 ++-- .../Resources/public/css/style.css | 0 .../Resources/public/images/admin.png | Bin .../public/js/ZikulaSearchModule.User.Form.js | 0 .../Resources/views/Admin/modifyconfig.tpl | 0 .../Resources/views/Block/search.tpl | 0 .../Resources/views/Block/search_modify.tpl | 0 .../Resources/views/User/form.tpl | 0 .../Resources/views/User/menu.tpl | 0 .../Resources/views/User/noplugins.tpl | 0 .../Resources/views/User/opensearch.xml | 0 .../Resources/views/User/recent.tpl | 0 .../Resources/views/User/results.tpl | 0 .../function.searchvartofieldnames.php | 0 .../plugins/modifier.google_highlight.php | 0 .../Module => }/SearchModule/ResultHelper.php | 2 +- .../SearchModule/SearchModuleInstaller.php | 14 ++++++------- .../SearchModule/SearchModuleVersion.php | 2 +- .../SearchModule/ZikulaSearchModule.php | 6 +++--- .../Module => }/SearchModule/composer.json | 4 ++-- .../Module => }/SearchModule/phpunit.xml.dist | 0 .../Module => }/SearchModule/tables.php | 0 .../UsersModule/Helper/SearchHelper.php | 2 +- .../Module/UsersModule/UsersModuleVersion.php | 2 +- .../Base/RoutesModuleVersion.php | 2 +- 46 files changed, 65 insertions(+), 42 deletions(-) create mode 100644 src/lib/legacy/Zikula/Module/SearchModule/AbstractSearchable.php rename src/system/{Zikula/Module => }/SearchModule/.gitignore (100%) rename src/system/{Zikula/Module => }/SearchModule/.travis.yml (100%) rename src/system/{Zikula/Module => }/SearchModule/AbstractSearchable.php (98%) rename src/system/{Zikula/Module => }/SearchModule/Api/AdminApi.php (96%) rename src/system/{Zikula/Module => }/SearchModule/Api/UserApi.php (97%) rename src/system/{Zikula/Module => }/SearchModule/Block/SearchBlock.php (99%) rename src/system/{Zikula/Module => }/SearchModule/Controller/AdminController.php (98%) rename src/system/{Zikula/Module => }/SearchModule/Controller/UserController.php (99%) rename src/system/{Zikula/Module => }/SearchModule/DependencyInjection/ZikulaSearchExtension.php (94%) rename src/system/{Zikula/Module => }/SearchModule/Entity/SearchResultEntity.php (99%) rename src/system/{Zikula/Module => }/SearchModule/Entity/SearchStatEntity.php (98%) rename src/system/{Zikula/Module => }/SearchModule/EventHandlers.php (72%) rename src/system/{Zikula/Module => }/SearchModule/LICENSE (100%) rename src/system/{Zikula/Module => }/SearchModule/Listener/FrontControllerListener.php (97%) rename src/system/{Zikula/Module => }/SearchModule/Listener/ModuleEventListener.php (97%) rename src/system/{Zikula/Module => }/SearchModule/README.md (100%) rename src/system/{Zikula/Module => }/SearchModule/Resources/config/routing.yml (100%) rename src/system/{Zikula/Module => }/SearchModule/Resources/config/services.xml (85%) rename src/system/{Zikula/Module => }/SearchModule/Resources/public/css/style.css (100%) rename src/system/{Zikula/Module => }/SearchModule/Resources/public/images/admin.png (100%) rename src/system/{Zikula/Module => }/SearchModule/Resources/public/js/ZikulaSearchModule.User.Form.js (100%) rename src/system/{Zikula/Module => }/SearchModule/Resources/views/Admin/modifyconfig.tpl (100%) rename src/system/{Zikula/Module => }/SearchModule/Resources/views/Block/search.tpl (100%) rename src/system/{Zikula/Module => }/SearchModule/Resources/views/Block/search_modify.tpl (100%) rename src/system/{Zikula/Module => }/SearchModule/Resources/views/User/form.tpl (100%) rename src/system/{Zikula/Module => }/SearchModule/Resources/views/User/menu.tpl (100%) rename src/system/{Zikula/Module => }/SearchModule/Resources/views/User/noplugins.tpl (100%) rename src/system/{Zikula/Module => }/SearchModule/Resources/views/User/opensearch.xml (100%) rename src/system/{Zikula/Module => }/SearchModule/Resources/views/User/recent.tpl (100%) rename src/system/{Zikula/Module => }/SearchModule/Resources/views/User/results.tpl (100%) rename src/system/{Zikula/Module => }/SearchModule/Resources/views/plugins/function.searchvartofieldnames.php (100%) rename src/system/{Zikula/Module => }/SearchModule/Resources/views/plugins/modifier.google_highlight.php (100%) rename src/system/{Zikula/Module => }/SearchModule/ResultHelper.php (98%) rename src/system/{Zikula/Module => }/SearchModule/SearchModuleInstaller.php (87%) rename src/system/{Zikula/Module => }/SearchModule/SearchModuleVersion.php (96%) rename src/system/{Zikula/Module => }/SearchModule/ZikulaSearchModule.php (80%) rename src/system/{Zikula/Module => }/SearchModule/composer.json (74%) rename src/system/{Zikula/Module => }/SearchModule/phpunit.xml.dist (100%) rename src/system/{Zikula/Module => }/SearchModule/tables.php (100%) diff --git a/composer.json b/composer.json index 90188b3ab4..d3303f50ab 100644 --- a/composer.json +++ b/composer.json @@ -25,6 +25,7 @@ "Zikula\\PageLockModule\\": "src/system/PageLockModule", "Zikula\\PermissionsModule\\": "src/system/PermissionsModule", "Zikula\\RoutesModule\\": "src/system/ZikulaRoutesModule", + "Zikula\\SearchModule\\": "src/system/SearchModule", "Zikula\\ThemeModule\\": "src/system/ThemeModule" }, "classmap": [ diff --git a/src/app/ZikulaKernel.php b/src/app/ZikulaKernel.php index 21b5e73335..59963e65cc 100644 --- a/src/app/ZikulaKernel.php +++ b/src/app/ZikulaKernel.php @@ -71,7 +71,7 @@ private function registerCoreModules(array &$bundles) $bundles[] = new Zikula\MailerModule\ZikulaMailerModule(); $bundles[] = new Zikula\PageLockModule\ZikulaPageLockModule(); $bundles[] = new Zikula\PermissionsModule\ZikulaPermissionsModule(); - $bundles[] = new Zikula\Module\SearchModule\ZikulaSearchModule(); + $bundles[] = new Zikula\SearchModule\ZikulaSearchModule(); $bundles[] = new Zikula\Module\SecurityCenterModule\ZikulaSecurityCenterModule(); $bundles[] = new Zikula\Module\SettingsModule\ZikulaSettingsModule(); $bundles[] = new Zikula\ThemeModule\ZikulaThemeModule(); diff --git a/src/docs/en/dev/UPGRADE-1.4.0.md b/src/docs/en/dev/UPGRADE-1.4.0.md index 34e6edcbfd..0365dacbf4 100644 --- a/src/docs/en/dev/UPGRADE-1.4.0.md +++ b/src/docs/en/dev/UPGRADE-1.4.0.md @@ -797,13 +797,13 @@ fully functional) in favor of a dedicated class that is identified in the Versio $meta['capabilities'][AbstractSearchable::SEARCHABLE] = array('class' => 'Zikula\Module\UsersModule\Helper\SearchHelper'); ``` -The `class` key must point to a helper class that extends `Zikula\Module\SearchModule\AbstractSearchable` and defines +The `class` key must point to a helper class that extends `Zikula\SearchModule\AbstractSearchable` and defines both the `getOptions()` method and the `getResults()` method. These two functions are similar to the old Api methods of similar names, but now have specific parameters set. Please see `AbstractSearchable` for documentation of the parameters. The main difference now is that the `getResults()` method **MUST** return an array of arrays containing the module's result set and the sub-arrays **MUST** have keys matching the field names of the -`Zikula\Module\SearchModule\Entity\SearchResultEntity` for merging and persisting the results (be sure to check `sesid`). +`Zikula\SearchModule\Entity\SearchResultEntity` for merging and persisting the results (be sure to check `sesid`). **Modules are no longer responsible for persisting their own search results**. Additional differences include the addition of a `url` field to the result set (results are no longer post-processed), @@ -814,6 +814,9 @@ is invalid for your module. The **UsersModule** has implemented the new Search method and can be used as a reference. +1.4.1 Note: The class was originally implemented as `Zikula\Module\SearchModule\AbstractSearchable` and has been +refactored as of Core 1.4.1 as `Zikula\SearchModule\AbstractSearchable`. The old class is still functional but deprecated. + Version File diff --git a/src/lib/legacy/Zikula/Module/SearchModule/AbstractSearchable.php b/src/lib/legacy/Zikula/Module/SearchModule/AbstractSearchable.php new file mode 100644 index 0000000000..c6f057f62a --- /dev/null +++ b/src/lib/legacy/Zikula/Module/SearchModule/AbstractSearchable.php @@ -0,0 +1,19 @@ +entityManager->createQuery("DELETE Zikula\Module\SearchModule\Entity\SearchResultEntity s WHERE s.sesid = :sid OR DATE_ADD(s.found, 1, 'DAY') < CURRENT_TIMESTAMP()"); + $query = $this->entityManager->createQuery("DELETE Zikula\SearchModule\Entity\SearchResultEntity s WHERE s.sesid = :sid OR DATE_ADD(s.found, 1, 'DAY') < CURRENT_TIMESTAMP()"); $query->setParameter('sid', $sessionId); $query->execute(); diff --git a/src/system/Zikula/Module/SearchModule/Block/SearchBlock.php b/src/system/SearchModule/Block/SearchBlock.php similarity index 99% rename from src/system/Zikula/Module/SearchModule/Block/SearchBlock.php rename to src/system/SearchModule/Block/SearchBlock.php index db7d991787..2a3568272f 100644 --- a/src/system/Zikula/Module/SearchModule/Block/SearchBlock.php +++ b/src/system/SearchModule/Block/SearchBlock.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\SearchModule\Block; +namespace Zikula\SearchModule\Block; use SecurityUtil; use BlockUtil; diff --git a/src/system/Zikula/Module/SearchModule/Controller/AdminController.php b/src/system/SearchModule/Controller/AdminController.php similarity index 98% rename from src/system/Zikula/Module/SearchModule/Controller/AdminController.php rename to src/system/SearchModule/Controller/AdminController.php index 9d41c350ff..a3efe5cd73 100644 --- a/src/system/Zikula/Module/SearchModule/Controller/AdminController.php +++ b/src/system/SearchModule/Controller/AdminController.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\SearchModule\Controller; +namespace Zikula\SearchModule\Controller; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; @@ -23,7 +23,7 @@ use Symfony\Component\Security\Core\Exception\AccessDeniedException; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\RedirectResponse; -use Zikula\Module\SearchModule\AbstractSearchable; +use Zikula\SearchModule\AbstractSearchable; /** * @Route("/admin") diff --git a/src/system/Zikula/Module/SearchModule/Controller/UserController.php b/src/system/SearchModule/Controller/UserController.php similarity index 99% rename from src/system/Zikula/Module/SearchModule/Controller/UserController.php rename to src/system/SearchModule/Controller/UserController.php index 9539353a07..c69e00e52c 100644 --- a/src/system/Zikula/Module/SearchModule/Controller/UserController.php +++ b/src/system/SearchModule/Controller/UserController.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\SearchModule\Controller; +namespace Zikula\SearchModule\Controller; use ModUtil; use SecurityUtil; @@ -25,7 +25,7 @@ use Symfony\Component\Security\Core\Exception\AccessDeniedException; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\RedirectResponse; -use Zikula\Module\SearchModule\AbstractSearchable; +use Zikula\SearchModule\AbstractSearchable; /** * User controllers for the search module diff --git a/src/system/Zikula/Module/SearchModule/DependencyInjection/ZikulaSearchExtension.php b/src/system/SearchModule/DependencyInjection/ZikulaSearchExtension.php similarity index 94% rename from src/system/Zikula/Module/SearchModule/DependencyInjection/ZikulaSearchExtension.php rename to src/system/SearchModule/DependencyInjection/ZikulaSearchExtension.php index 31ef84ea5a..39bdbc9284 100644 --- a/src/system/Zikula/Module/SearchModule/DependencyInjection/ZikulaSearchExtension.php +++ b/src/system/SearchModule/DependencyInjection/ZikulaSearchExtension.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\SearchModule\DependencyInjection; +namespace Zikula\SearchModule\DependencyInjection; use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Loader\XmlFileLoader; diff --git a/src/system/Zikula/Module/SearchModule/Entity/SearchResultEntity.php b/src/system/SearchModule/Entity/SearchResultEntity.php similarity index 99% rename from src/system/Zikula/Module/SearchModule/Entity/SearchResultEntity.php rename to src/system/SearchModule/Entity/SearchResultEntity.php index 030acee9dc..1428453982 100644 --- a/src/system/Zikula/Module/SearchModule/Entity/SearchResultEntity.php +++ b/src/system/SearchModule/Entity/SearchResultEntity.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\SearchModule\Entity; +namespace Zikula\SearchModule\Entity; use Doctrine\ORM\Mapping as ORM; use Zikula\Core\UrlInterface; diff --git a/src/system/Zikula/Module/SearchModule/Entity/SearchStatEntity.php b/src/system/SearchModule/Entity/SearchStatEntity.php similarity index 98% rename from src/system/Zikula/Module/SearchModule/Entity/SearchStatEntity.php rename to src/system/SearchModule/Entity/SearchStatEntity.php index 51d19d0594..020c459504 100644 --- a/src/system/Zikula/Module/SearchModule/Entity/SearchStatEntity.php +++ b/src/system/SearchModule/Entity/SearchStatEntity.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\SearchModule\Entity; +namespace Zikula\SearchModule\Entity; use Doctrine\ORM\Mapping as ORM; use Zikula\Core\Doctrine\EntityAccess; diff --git a/src/system/Zikula/Module/SearchModule/EventHandlers.php b/src/system/SearchModule/EventHandlers.php similarity index 72% rename from src/system/Zikula/Module/SearchModule/EventHandlers.php rename to src/system/SearchModule/EventHandlers.php index 4bf6804322..1aedadd171 100644 --- a/src/system/Zikula/Module/SearchModule/EventHandlers.php +++ b/src/system/SearchModule/EventHandlers.php @@ -14,8 +14,8 @@ /** * BC class * - * @deprecated since 1.4.0 use Zikula\Module\SearchModule\Listener\ModuleListener instead + * @deprecated since 1.4.0 use Zikula\SearchModule\Listener\ModuleListener instead */ -class Search_EventHandler extends Zikula\Module\SearchModule\Listener\ModuleListener +class Search_EventHandler extends Zikula\SearchModule\Listener\ModuleListener { } diff --git a/src/system/Zikula/Module/SearchModule/LICENSE b/src/system/SearchModule/LICENSE similarity index 100% rename from src/system/Zikula/Module/SearchModule/LICENSE rename to src/system/SearchModule/LICENSE diff --git a/src/system/Zikula/Module/SearchModule/Listener/FrontControllerListener.php b/src/system/SearchModule/Listener/FrontControllerListener.php similarity index 97% rename from src/system/Zikula/Module/SearchModule/Listener/FrontControllerListener.php rename to src/system/SearchModule/Listener/FrontControllerListener.php index 931a25ca5d..94df508e32 100644 --- a/src/system/Zikula/Module/SearchModule/Listener/FrontControllerListener.php +++ b/src/system/SearchModule/Listener/FrontControllerListener.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\SearchModule\Listener; +namespace Zikula\SearchModule\Listener; use ModUtil; use PageUtil; diff --git a/src/system/Zikula/Module/SearchModule/Listener/ModuleEventListener.php b/src/system/SearchModule/Listener/ModuleEventListener.php similarity index 97% rename from src/system/Zikula/Module/SearchModule/Listener/ModuleEventListener.php rename to src/system/SearchModule/Listener/ModuleEventListener.php index 63ac5b01ce..b0c6bd82be 100644 --- a/src/system/Zikula/Module/SearchModule/Listener/ModuleEventListener.php +++ b/src/system/SearchModule/Listener/ModuleEventListener.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\SearchModule\Listener; +namespace Zikula\SearchModule\Listener; use ModUtil; use BlockUtil; diff --git a/src/system/Zikula/Module/SearchModule/README.md b/src/system/SearchModule/README.md similarity index 100% rename from src/system/Zikula/Module/SearchModule/README.md rename to src/system/SearchModule/README.md diff --git a/src/system/Zikula/Module/SearchModule/Resources/config/routing.yml b/src/system/SearchModule/Resources/config/routing.yml similarity index 100% rename from src/system/Zikula/Module/SearchModule/Resources/config/routing.yml rename to src/system/SearchModule/Resources/config/routing.yml diff --git a/src/system/Zikula/Module/SearchModule/Resources/config/services.xml b/src/system/SearchModule/Resources/config/services.xml similarity index 85% rename from src/system/Zikula/Module/SearchModule/Resources/config/services.xml rename to src/system/SearchModule/Resources/config/services.xml index 55fd8d42d3..1d9f7a1663 100644 --- a/src/system/Zikula/Module/SearchModule/Resources/config/services.xml +++ b/src/system/SearchModule/Resources/config/services.xml @@ -5,8 +5,8 @@ xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"> - Zikula\Module\SearchModule\Listener\FrontControllerListener - Zikula\Module\SearchModule\Listener\ModuleEventListener + Zikula\SearchModule\Listener\FrontControllerListener + Zikula\SearchModule\Listener\ModuleEventListener diff --git a/src/system/Zikula/Module/SearchModule/Resources/public/css/style.css b/src/system/SearchModule/Resources/public/css/style.css similarity index 100% rename from src/system/Zikula/Module/SearchModule/Resources/public/css/style.css rename to src/system/SearchModule/Resources/public/css/style.css diff --git a/src/system/Zikula/Module/SearchModule/Resources/public/images/admin.png b/src/system/SearchModule/Resources/public/images/admin.png similarity index 100% rename from src/system/Zikula/Module/SearchModule/Resources/public/images/admin.png rename to src/system/SearchModule/Resources/public/images/admin.png diff --git a/src/system/Zikula/Module/SearchModule/Resources/public/js/ZikulaSearchModule.User.Form.js b/src/system/SearchModule/Resources/public/js/ZikulaSearchModule.User.Form.js similarity index 100% rename from src/system/Zikula/Module/SearchModule/Resources/public/js/ZikulaSearchModule.User.Form.js rename to src/system/SearchModule/Resources/public/js/ZikulaSearchModule.User.Form.js diff --git a/src/system/Zikula/Module/SearchModule/Resources/views/Admin/modifyconfig.tpl b/src/system/SearchModule/Resources/views/Admin/modifyconfig.tpl similarity index 100% rename from src/system/Zikula/Module/SearchModule/Resources/views/Admin/modifyconfig.tpl rename to src/system/SearchModule/Resources/views/Admin/modifyconfig.tpl diff --git a/src/system/Zikula/Module/SearchModule/Resources/views/Block/search.tpl b/src/system/SearchModule/Resources/views/Block/search.tpl similarity index 100% rename from src/system/Zikula/Module/SearchModule/Resources/views/Block/search.tpl rename to src/system/SearchModule/Resources/views/Block/search.tpl diff --git a/src/system/Zikula/Module/SearchModule/Resources/views/Block/search_modify.tpl b/src/system/SearchModule/Resources/views/Block/search_modify.tpl similarity index 100% rename from src/system/Zikula/Module/SearchModule/Resources/views/Block/search_modify.tpl rename to src/system/SearchModule/Resources/views/Block/search_modify.tpl diff --git a/src/system/Zikula/Module/SearchModule/Resources/views/User/form.tpl b/src/system/SearchModule/Resources/views/User/form.tpl similarity index 100% rename from src/system/Zikula/Module/SearchModule/Resources/views/User/form.tpl rename to src/system/SearchModule/Resources/views/User/form.tpl diff --git a/src/system/Zikula/Module/SearchModule/Resources/views/User/menu.tpl b/src/system/SearchModule/Resources/views/User/menu.tpl similarity index 100% rename from src/system/Zikula/Module/SearchModule/Resources/views/User/menu.tpl rename to src/system/SearchModule/Resources/views/User/menu.tpl diff --git a/src/system/Zikula/Module/SearchModule/Resources/views/User/noplugins.tpl b/src/system/SearchModule/Resources/views/User/noplugins.tpl similarity index 100% rename from src/system/Zikula/Module/SearchModule/Resources/views/User/noplugins.tpl rename to src/system/SearchModule/Resources/views/User/noplugins.tpl diff --git a/src/system/Zikula/Module/SearchModule/Resources/views/User/opensearch.xml b/src/system/SearchModule/Resources/views/User/opensearch.xml similarity index 100% rename from src/system/Zikula/Module/SearchModule/Resources/views/User/opensearch.xml rename to src/system/SearchModule/Resources/views/User/opensearch.xml diff --git a/src/system/Zikula/Module/SearchModule/Resources/views/User/recent.tpl b/src/system/SearchModule/Resources/views/User/recent.tpl similarity index 100% rename from src/system/Zikula/Module/SearchModule/Resources/views/User/recent.tpl rename to src/system/SearchModule/Resources/views/User/recent.tpl diff --git a/src/system/Zikula/Module/SearchModule/Resources/views/User/results.tpl b/src/system/SearchModule/Resources/views/User/results.tpl similarity index 100% rename from src/system/Zikula/Module/SearchModule/Resources/views/User/results.tpl rename to src/system/SearchModule/Resources/views/User/results.tpl diff --git a/src/system/Zikula/Module/SearchModule/Resources/views/plugins/function.searchvartofieldnames.php b/src/system/SearchModule/Resources/views/plugins/function.searchvartofieldnames.php similarity index 100% rename from src/system/Zikula/Module/SearchModule/Resources/views/plugins/function.searchvartofieldnames.php rename to src/system/SearchModule/Resources/views/plugins/function.searchvartofieldnames.php diff --git a/src/system/Zikula/Module/SearchModule/Resources/views/plugins/modifier.google_highlight.php b/src/system/SearchModule/Resources/views/plugins/modifier.google_highlight.php similarity index 100% rename from src/system/Zikula/Module/SearchModule/Resources/views/plugins/modifier.google_highlight.php rename to src/system/SearchModule/Resources/views/plugins/modifier.google_highlight.php diff --git a/src/system/Zikula/Module/SearchModule/ResultHelper.php b/src/system/SearchModule/ResultHelper.php similarity index 98% rename from src/system/Zikula/Module/SearchModule/ResultHelper.php rename to src/system/SearchModule/ResultHelper.php index 10f74e5f4c..52c9f8321b 100644 --- a/src/system/Zikula/Module/SearchModule/ResultHelper.php +++ b/src/system/SearchModule/ResultHelper.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\SearchModule; +namespace Zikula\SearchModule; use ModUtil; diff --git a/src/system/Zikula/Module/SearchModule/SearchModuleInstaller.php b/src/system/SearchModule/SearchModuleInstaller.php similarity index 87% rename from src/system/Zikula/Module/SearchModule/SearchModuleInstaller.php rename to src/system/SearchModule/SearchModuleInstaller.php index afe8a71ff2..42cf6489a2 100644 --- a/src/system/Zikula/Module/SearchModule/SearchModuleInstaller.php +++ b/src/system/SearchModule/SearchModuleInstaller.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\SearchModule; +namespace Zikula\SearchModule; use LogUtil; use DoctrineHelper; @@ -34,8 +34,8 @@ public function install() // create schema try { DoctrineHelper::createSchema($this->entityManager, array( - 'Zikula\Module\SearchModule\Entity\SearchResultEntity', - 'Zikula\Module\SearchModule\Entity\SearchStatEntity', + 'Zikula\SearchModule\Entity\SearchResultEntity', + 'Zikula\SearchModule\Entity\SearchStatEntity', )); } catch (\Exception $e) { return false; @@ -72,7 +72,7 @@ public function upgrade($oldversion) // update schema try { DoctrineHelper::updateSchema($this->entityManager, array( - 'Zikula\Module\SearchModule\Entity\SearchResultEntity', + 'Zikula\SearchModule\Entity\SearchResultEntity', )); } catch (\Exception $e) { return LogUtil::registerError($e->getMessage()); @@ -81,7 +81,7 @@ public function upgrade($oldversion) // update schema try { DoctrineHelper::updateSchema($this->entityManager, array( - 'Zikula\Module\SearchModule\Entity\SearchResultEntity', + 'Zikula\SearchModule\Entity\SearchResultEntity', )); } catch (\Exception $e) { return LogUtil::registerError($e->getMessage()); @@ -106,8 +106,8 @@ public function uninstall() { try { DoctrineHelper::dropSchema($this->entityManager, array( - 'Zikula\Module\SearchModule\Entity\SearchResultEntity', - 'Zikula\Module\SearchModule\Entity\SearchStatEntity', + 'Zikula\SearchModule\Entity\SearchResultEntity', + 'Zikula\SearchModule\Entity\SearchStatEntity', )); } catch (\Exception $e) { return false; diff --git a/src/system/Zikula/Module/SearchModule/SearchModuleVersion.php b/src/system/SearchModule/SearchModuleVersion.php similarity index 96% rename from src/system/Zikula/Module/SearchModule/SearchModuleVersion.php rename to src/system/SearchModule/SearchModuleVersion.php index fc7d88a33c..24857263d9 100644 --- a/src/system/Zikula/Module/SearchModule/SearchModuleVersion.php +++ b/src/system/SearchModule/SearchModuleVersion.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\SearchModule; +namespace Zikula\SearchModule; /** * Version information for the search module diff --git a/src/system/Zikula/Module/SearchModule/ZikulaSearchModule.php b/src/system/SearchModule/ZikulaSearchModule.php similarity index 80% rename from src/system/Zikula/Module/SearchModule/ZikulaSearchModule.php rename to src/system/SearchModule/ZikulaSearchModule.php index 4b425d46cb..1981ca8fbe 100644 --- a/src/system/Zikula/Module/SearchModule/ZikulaSearchModule.php +++ b/src/system/SearchModule/ZikulaSearchModule.php @@ -14,7 +14,7 @@ /** * Base module definition for the search module */ -namespace Zikula\Module\SearchModule { +namespace Zikula\SearchModule { use Zikula\Bundle\CoreBundle\Bundle\AbstractCoreModule; @@ -33,9 +33,9 @@ class ZikulaSearchModule extends AbstractCoreModule /** * user api functions for the search module * - * @deprecated since 1.4.0 use \Zikula\Module\SearchModule\Api\UserApi instead + * @deprecated since 1.4.0 use \Zikula\SearchModule\Api\UserApi instead */ - class Search_Api_User extends \Zikula\Module\SearchModule\Api\UserApi + class Search_Api_User extends \Zikula\SearchModule\Api\UserApi { } } \ No newline at end of file diff --git a/src/system/Zikula/Module/SearchModule/composer.json b/src/system/SearchModule/composer.json similarity index 74% rename from src/system/Zikula/Module/SearchModule/composer.json rename to src/system/SearchModule/composer.json index 7b680ee1bf..e12a203483 100644 --- a/src/system/Zikula/Module/SearchModule/composer.json +++ b/src/system/SearchModule/composer.json @@ -10,14 +10,14 @@ } ], "autoload": { - "psr-0": { "Zikula\\Module\\SearchModule\\": "" } + "psr-4": { "Zikula\\SearchModule\\": "" } }, "require": { "php": ">5.4.0" }, "extra": { "zikula": { - "class": "Zikula\\Module\\SearchModule\\ZikulaSearchModule" + "class": "Zikula\\SearchModule\\ZikulaSearchModule" } } } diff --git a/src/system/Zikula/Module/SearchModule/phpunit.xml.dist b/src/system/SearchModule/phpunit.xml.dist similarity index 100% rename from src/system/Zikula/Module/SearchModule/phpunit.xml.dist rename to src/system/SearchModule/phpunit.xml.dist diff --git a/src/system/Zikula/Module/SearchModule/tables.php b/src/system/SearchModule/tables.php similarity index 100% rename from src/system/Zikula/Module/SearchModule/tables.php rename to src/system/SearchModule/tables.php diff --git a/src/system/Zikula/Module/UsersModule/Helper/SearchHelper.php b/src/system/Zikula/Module/UsersModule/Helper/SearchHelper.php index d181794b75..e4f808a2bd 100644 --- a/src/system/Zikula/Module/UsersModule/Helper/SearchHelper.php +++ b/src/system/Zikula/Module/UsersModule/Helper/SearchHelper.php @@ -13,7 +13,7 @@ namespace Zikula\Module\UsersModule\Helper; -use Zikula\Module\SearchModule\AbstractSearchable; +use Zikula\SearchModule\AbstractSearchable; use SecurityUtil; use System; use Zikula\Module\UsersModule\Constant as UsersConstant; diff --git a/src/system/Zikula/Module/UsersModule/UsersModuleVersion.php b/src/system/Zikula/Module/UsersModule/UsersModuleVersion.php index 6ee44b0bc9..0b326be5db 100644 --- a/src/system/Zikula/Module/UsersModule/UsersModuleVersion.php +++ b/src/system/Zikula/Module/UsersModule/UsersModuleVersion.php @@ -15,7 +15,7 @@ use Zikula\Module\UsersModule\Constant as UsersConstant; use HookUtil; -use Zikula\Module\SearchModule\AbstractSearchable; +use Zikula\SearchModule\AbstractSearchable; use Zikula_HookManager_SubscriberBundle; /** diff --git a/src/system/ZikulaRoutesModule/Base/RoutesModuleVersion.php b/src/system/ZikulaRoutesModule/Base/RoutesModuleVersion.php index fda6021e9c..704a1f669b 100644 --- a/src/system/ZikulaRoutesModule/Base/RoutesModuleVersion.php +++ b/src/system/ZikulaRoutesModule/Base/RoutesModuleVersion.php @@ -16,7 +16,7 @@ use Zikula_AbstractVersion; use Zikula\Component\HookDispatcher\ProviderBundle; use Zikula\Component\HookDispatcher\SubscriberBundle; -use Zikula\Module\SearchModule\AbstractSearchable; +use Zikula\SearchModule\AbstractSearchable; /** * Version information base class. From 1e92c767e52b158088714cb2e44de35527a011ef Mon Sep 17 00:00:00 2001 From: Craig Heydenburg Date: Sun, 16 Aug 2015 18:35:21 -0400 Subject: [PATCH 11/35] convert SecurityCenterModule to psr-4 --- composer.json | 1 + src/app/ZikulaKernel.php | 2 +- .../Module => }/SecurityCenterModule/.gitignore | 0 .../Module => }/SecurityCenterModule/.travis.yml | 0 .../SecurityCenterModule/Api/AdminApi.php | 2 +- .../Controller/AdminController.php | 4 ++-- .../Controller/AdminformController.php | 2 +- .../Entity/IntrusionEntity.php | 2 +- .../Module => }/SecurityCenterModule/LICENSE | 0 .../Listener/FilterListener.php | 6 +++--- .../Module => }/SecurityCenterModule/README.md | 0 .../Resources/config/phpids_zikula_default.xml | 0 .../Resources/config/routing.yml | 0 .../Resources/public/css/style.css | 0 .../Resources/public/images/admin.png | Bin .../public/js/securitycenter_admin_allowedhtm.js | 0 .../js/securitycenter_admin_purifierconfig.js | 0 .../Resources/views/Admin/allowedhtml.tpl | 0 .../Resources/views/Admin/display.tpl | 0 .../Resources/views/Admin/exportidslog.tpl | 0 .../Resources/views/Admin/modifyconfig.tpl | 0 .../Resources/views/Admin/purgeidslog.tpl | 0 .../Resources/views/Admin/purifierconfig.tpl | 0 .../Resources/views/Admin/viewidslog.tpl | 14 +++++++------- .../SecurityCenterModuleInstaller.php | 6 +++--- .../SecurityCenterModuleVersion.php | 2 +- .../Module => }/SecurityCenterModule/Util.php | 2 +- .../ZikulaSecurityCenterModule.php | 2 +- .../SecurityCenterModule/bootstrap.php | 2 +- .../SecurityCenterModule/composer.json | 4 ++-- .../SecurityCenterModule/phpunit.xml.dist | 0 .../Module => }/SecurityCenterModule/tables.php | 0 32 files changed, 26 insertions(+), 25 deletions(-) rename src/system/{Zikula/Module => }/SecurityCenterModule/.gitignore (100%) rename src/system/{Zikula/Module => }/SecurityCenterModule/.travis.yml (100%) rename src/system/{Zikula/Module => }/SecurityCenterModule/Api/AdminApi.php (99%) rename src/system/{Zikula/Module => }/SecurityCenterModule/Controller/AdminController.php (99%) rename src/system/{Zikula/Module => }/SecurityCenterModule/Controller/AdminformController.php (97%) rename src/system/{Zikula/Module => }/SecurityCenterModule/Entity/IntrusionEntity.php (99%) rename src/system/{Zikula/Module => }/SecurityCenterModule/LICENSE (100%) rename src/system/{Zikula/Module => }/SecurityCenterModule/Listener/FilterListener.php (98%) rename src/system/{Zikula/Module => }/SecurityCenterModule/README.md (100%) rename src/system/{Zikula/Module => }/SecurityCenterModule/Resources/config/phpids_zikula_default.xml (100%) rename src/system/{Zikula/Module => }/SecurityCenterModule/Resources/config/routing.yml (100%) rename src/system/{Zikula/Module => }/SecurityCenterModule/Resources/public/css/style.css (100%) rename src/system/{Zikula/Module => }/SecurityCenterModule/Resources/public/images/admin.png (100%) rename src/system/{Zikula/Module => }/SecurityCenterModule/Resources/public/js/securitycenter_admin_allowedhtm.js (100%) rename src/system/{Zikula/Module => }/SecurityCenterModule/Resources/public/js/securitycenter_admin_purifierconfig.js (100%) rename src/system/{Zikula/Module => }/SecurityCenterModule/Resources/views/Admin/allowedhtml.tpl (100%) rename src/system/{Zikula/Module => }/SecurityCenterModule/Resources/views/Admin/display.tpl (100%) rename src/system/{Zikula/Module => }/SecurityCenterModule/Resources/views/Admin/exportidslog.tpl (100%) rename src/system/{Zikula/Module => }/SecurityCenterModule/Resources/views/Admin/modifyconfig.tpl (100%) rename src/system/{Zikula/Module => }/SecurityCenterModule/Resources/views/Admin/purgeidslog.tpl (100%) rename src/system/{Zikula/Module => }/SecurityCenterModule/Resources/views/Admin/purifierconfig.tpl (100%) rename src/system/{Zikula/Module => }/SecurityCenterModule/Resources/views/Admin/viewidslog.tpl (80%) rename src/system/{Zikula/Module => }/SecurityCenterModule/SecurityCenterModuleInstaller.php (97%) rename src/system/{Zikula/Module => }/SecurityCenterModule/SecurityCenterModuleVersion.php (96%) rename src/system/{Zikula/Module => }/SecurityCenterModule/Util.php (99%) rename src/system/{Zikula/Module => }/SecurityCenterModule/ZikulaSecurityCenterModule.php (93%) rename src/system/{Zikula/Module => }/SecurityCenterModule/bootstrap.php (82%) rename src/system/{Zikula/Module => }/SecurityCenterModule/composer.json (72%) rename src/system/{Zikula/Module => }/SecurityCenterModule/phpunit.xml.dist (100%) rename src/system/{Zikula/Module => }/SecurityCenterModule/tables.php (100%) diff --git a/composer.json b/composer.json index d3303f50ab..8f0de6f806 100644 --- a/composer.json +++ b/composer.json @@ -26,6 +26,7 @@ "Zikula\\PermissionsModule\\": "src/system/PermissionsModule", "Zikula\\RoutesModule\\": "src/system/ZikulaRoutesModule", "Zikula\\SearchModule\\": "src/system/SearchModule", + "Zikula\\SecurityCenterModule\\": "src/system/SecurityCenterModule", "Zikula\\ThemeModule\\": "src/system/ThemeModule" }, "classmap": [ diff --git a/src/app/ZikulaKernel.php b/src/app/ZikulaKernel.php index 59963e65cc..1c013057ae 100644 --- a/src/app/ZikulaKernel.php +++ b/src/app/ZikulaKernel.php @@ -72,7 +72,7 @@ private function registerCoreModules(array &$bundles) $bundles[] = new Zikula\PageLockModule\ZikulaPageLockModule(); $bundles[] = new Zikula\PermissionsModule\ZikulaPermissionsModule(); $bundles[] = new Zikula\SearchModule\ZikulaSearchModule(); - $bundles[] = new Zikula\Module\SecurityCenterModule\ZikulaSecurityCenterModule(); + $bundles[] = new Zikula\SecurityCenterModule\ZikulaSecurityCenterModule(); $bundles[] = new Zikula\Module\SettingsModule\ZikulaSettingsModule(); $bundles[] = new Zikula\ThemeModule\ZikulaThemeModule(); $bundles[] = new Zikula\Module\UsersModule\ZikulaUsersModule(); diff --git a/src/system/Zikula/Module/SecurityCenterModule/.gitignore b/src/system/SecurityCenterModule/.gitignore similarity index 100% rename from src/system/Zikula/Module/SecurityCenterModule/.gitignore rename to src/system/SecurityCenterModule/.gitignore diff --git a/src/system/Zikula/Module/SecurityCenterModule/.travis.yml b/src/system/SecurityCenterModule/.travis.yml similarity index 100% rename from src/system/Zikula/Module/SecurityCenterModule/.travis.yml rename to src/system/SecurityCenterModule/.travis.yml diff --git a/src/system/Zikula/Module/SecurityCenterModule/Api/AdminApi.php b/src/system/SecurityCenterModule/Api/AdminApi.php similarity index 99% rename from src/system/Zikula/Module/SecurityCenterModule/Api/AdminApi.php rename to src/system/SecurityCenterModule/Api/AdminApi.php index e739fdf686..c387090dbf 100644 --- a/src/system/Zikula/Module/SecurityCenterModule/Api/AdminApi.php +++ b/src/system/SecurityCenterModule/Api/AdminApi.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\SecurityCenterModule\Api; +namespace Zikula\SecurityCenterModule\Api; use SecurityUtil; use ModUtil; diff --git a/src/system/Zikula/Module/SecurityCenterModule/Controller/AdminController.php b/src/system/SecurityCenterModule/Controller/AdminController.php similarity index 99% rename from src/system/Zikula/Module/SecurityCenterModule/Controller/AdminController.php rename to src/system/SecurityCenterModule/Controller/AdminController.php index 8ac2188c2c..363e16c0f4 100644 --- a/src/system/Zikula/Module/SecurityCenterModule/Controller/AdminController.php +++ b/src/system/SecurityCenterModule/Controller/AdminController.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\SecurityCenterModule\Controller; +namespace Zikula\SecurityCenterModule\Controller; use Zikula_View; use ModUtil; @@ -21,7 +21,7 @@ use CacheUtil; use DataUtil; use UserUtil; -use Zikula\Module\SecurityCenterModule\Util as SecurityCenterUtil; +use Zikula\SecurityCenterModule\Util as SecurityCenterUtil; use HTMLPurifier; use HTMLPurifier_Config; use HTMLPurifier_VarParser; diff --git a/src/system/Zikula/Module/SecurityCenterModule/Controller/AdminformController.php b/src/system/SecurityCenterModule/Controller/AdminformController.php similarity index 97% rename from src/system/Zikula/Module/SecurityCenterModule/Controller/AdminformController.php rename to src/system/SecurityCenterModule/Controller/AdminformController.php index 1082b1bf65..05105137f2 100644 --- a/src/system/Zikula/Module/SecurityCenterModule/Controller/AdminformController.php +++ b/src/system/SecurityCenterModule/Controller/AdminformController.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\SecurityCenterModule\Controller; +namespace Zikula\SecurityCenterModule\Controller; use SecurityUtil; use ModUtil; diff --git a/src/system/Zikula/Module/SecurityCenterModule/Entity/IntrusionEntity.php b/src/system/SecurityCenterModule/Entity/IntrusionEntity.php similarity index 99% rename from src/system/Zikula/Module/SecurityCenterModule/Entity/IntrusionEntity.php rename to src/system/SecurityCenterModule/Entity/IntrusionEntity.php index 89db3172de..082817a7d6 100644 --- a/src/system/Zikula/Module/SecurityCenterModule/Entity/IntrusionEntity.php +++ b/src/system/SecurityCenterModule/Entity/IntrusionEntity.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\SecurityCenterModule\Entity; +namespace Zikula\SecurityCenterModule\Entity; use Zikula\Core\Doctrine\EntityAccess; use Doctrine\ORM\Mapping as ORM; diff --git a/src/system/Zikula/Module/SecurityCenterModule/LICENSE b/src/system/SecurityCenterModule/LICENSE similarity index 100% rename from src/system/Zikula/Module/SecurityCenterModule/LICENSE rename to src/system/SecurityCenterModule/LICENSE diff --git a/src/system/Zikula/Module/SecurityCenterModule/Listener/FilterListener.php b/src/system/SecurityCenterModule/Listener/FilterListener.php similarity index 98% rename from src/system/Zikula/Module/SecurityCenterModule/Listener/FilterListener.php rename to src/system/SecurityCenterModule/Listener/FilterListener.php index 766a4d45e9..c804c048cd 100644 --- a/src/system/Zikula/Module/SecurityCenterModule/Listener/FilterListener.php +++ b/src/system/SecurityCenterModule/Listener/FilterListener.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\SecurityCenterModule\Listener; +namespace Zikula\SecurityCenterModule\Listener; use Zikula_Core; use System; @@ -21,9 +21,9 @@ use DateUtil; use ModUtil; use ServiceUtil; -use Zikula\Module\SecurityCenterModule\Util as SecurityCenterUtil; +use Zikula\SecurityCenterModule\Util as SecurityCenterUtil; use Zikula_Event; -use Zikula\Module\SecurityCenterModule\Entity\IntrusionEntity; +use Zikula\SecurityCenterModule\Entity\IntrusionEntity; use Symfony\Component\Security\Core\Exception\AccessDeniedException; /** diff --git a/src/system/Zikula/Module/SecurityCenterModule/README.md b/src/system/SecurityCenterModule/README.md similarity index 100% rename from src/system/Zikula/Module/SecurityCenterModule/README.md rename to src/system/SecurityCenterModule/README.md diff --git a/src/system/Zikula/Module/SecurityCenterModule/Resources/config/phpids_zikula_default.xml b/src/system/SecurityCenterModule/Resources/config/phpids_zikula_default.xml similarity index 100% rename from src/system/Zikula/Module/SecurityCenterModule/Resources/config/phpids_zikula_default.xml rename to src/system/SecurityCenterModule/Resources/config/phpids_zikula_default.xml diff --git a/src/system/Zikula/Module/SecurityCenterModule/Resources/config/routing.yml b/src/system/SecurityCenterModule/Resources/config/routing.yml similarity index 100% rename from src/system/Zikula/Module/SecurityCenterModule/Resources/config/routing.yml rename to src/system/SecurityCenterModule/Resources/config/routing.yml diff --git a/src/system/Zikula/Module/SecurityCenterModule/Resources/public/css/style.css b/src/system/SecurityCenterModule/Resources/public/css/style.css similarity index 100% rename from src/system/Zikula/Module/SecurityCenterModule/Resources/public/css/style.css rename to src/system/SecurityCenterModule/Resources/public/css/style.css diff --git a/src/system/Zikula/Module/SecurityCenterModule/Resources/public/images/admin.png b/src/system/SecurityCenterModule/Resources/public/images/admin.png similarity index 100% rename from src/system/Zikula/Module/SecurityCenterModule/Resources/public/images/admin.png rename to src/system/SecurityCenterModule/Resources/public/images/admin.png diff --git a/src/system/Zikula/Module/SecurityCenterModule/Resources/public/js/securitycenter_admin_allowedhtm.js b/src/system/SecurityCenterModule/Resources/public/js/securitycenter_admin_allowedhtm.js similarity index 100% rename from src/system/Zikula/Module/SecurityCenterModule/Resources/public/js/securitycenter_admin_allowedhtm.js rename to src/system/SecurityCenterModule/Resources/public/js/securitycenter_admin_allowedhtm.js diff --git a/src/system/Zikula/Module/SecurityCenterModule/Resources/public/js/securitycenter_admin_purifierconfig.js b/src/system/SecurityCenterModule/Resources/public/js/securitycenter_admin_purifierconfig.js similarity index 100% rename from src/system/Zikula/Module/SecurityCenterModule/Resources/public/js/securitycenter_admin_purifierconfig.js rename to src/system/SecurityCenterModule/Resources/public/js/securitycenter_admin_purifierconfig.js diff --git a/src/system/Zikula/Module/SecurityCenterModule/Resources/views/Admin/allowedhtml.tpl b/src/system/SecurityCenterModule/Resources/views/Admin/allowedhtml.tpl similarity index 100% rename from src/system/Zikula/Module/SecurityCenterModule/Resources/views/Admin/allowedhtml.tpl rename to src/system/SecurityCenterModule/Resources/views/Admin/allowedhtml.tpl diff --git a/src/system/Zikula/Module/SecurityCenterModule/Resources/views/Admin/display.tpl b/src/system/SecurityCenterModule/Resources/views/Admin/display.tpl similarity index 100% rename from src/system/Zikula/Module/SecurityCenterModule/Resources/views/Admin/display.tpl rename to src/system/SecurityCenterModule/Resources/views/Admin/display.tpl diff --git a/src/system/Zikula/Module/SecurityCenterModule/Resources/views/Admin/exportidslog.tpl b/src/system/SecurityCenterModule/Resources/views/Admin/exportidslog.tpl similarity index 100% rename from src/system/Zikula/Module/SecurityCenterModule/Resources/views/Admin/exportidslog.tpl rename to src/system/SecurityCenterModule/Resources/views/Admin/exportidslog.tpl diff --git a/src/system/Zikula/Module/SecurityCenterModule/Resources/views/Admin/modifyconfig.tpl b/src/system/SecurityCenterModule/Resources/views/Admin/modifyconfig.tpl similarity index 100% rename from src/system/Zikula/Module/SecurityCenterModule/Resources/views/Admin/modifyconfig.tpl rename to src/system/SecurityCenterModule/Resources/views/Admin/modifyconfig.tpl diff --git a/src/system/Zikula/Module/SecurityCenterModule/Resources/views/Admin/purgeidslog.tpl b/src/system/SecurityCenterModule/Resources/views/Admin/purgeidslog.tpl similarity index 100% rename from src/system/Zikula/Module/SecurityCenterModule/Resources/views/Admin/purgeidslog.tpl rename to src/system/SecurityCenterModule/Resources/views/Admin/purgeidslog.tpl diff --git a/src/system/Zikula/Module/SecurityCenterModule/Resources/views/Admin/purifierconfig.tpl b/src/system/SecurityCenterModule/Resources/views/Admin/purifierconfig.tpl similarity index 100% rename from src/system/Zikula/Module/SecurityCenterModule/Resources/views/Admin/purifierconfig.tpl rename to src/system/SecurityCenterModule/Resources/views/Admin/purifierconfig.tpl diff --git a/src/system/Zikula/Module/SecurityCenterModule/Resources/views/Admin/viewidslog.tpl b/src/system/SecurityCenterModule/Resources/views/Admin/viewidslog.tpl similarity index 80% rename from src/system/Zikula/Module/SecurityCenterModule/Resources/views/Admin/viewidslog.tpl rename to src/system/SecurityCenterModule/Resources/views/Admin/viewidslog.tpl index da55ec9678..7766ba83b5 100644 --- a/src/system/Zikula/Module/SecurityCenterModule/Resources/views/Admin/viewidslog.tpl +++ b/src/system/SecurityCenterModule/Resources/views/Admin/viewidslog.tpl @@ -15,19 +15,19 @@
{gt text='Filter'} - {selector_object_array entity=1 name='filter[uid]' modname='SecurityCenter' class='Zikula\Module\SecurityCenterModule\Entity\IntrusionEntity' field='uid' displayField='username' selectedValue=$filter.uid defaultValue='0' defaultText=$lblAll distinct='1' submit='1'} + {selector_object_array entity=1 name='filter[uid]' modname='SecurityCenter' class='Zikula\SecurityCenterModule\Entity\IntrusionEntity' field='uid' displayField='username' selectedValue=$filter.uid defaultValue='0' defaultText=$lblAll distinct='1' submit='1'} - {selector_object_array entity=1 name='filter[name]' modname='SecurityCenter' class='Zikula\Module\SecurityCenterModule\Entity\IntrusionEntity' field='name' displayField='name' selectedValue=$filter.name defaultValue='0' defaultText=$lblAll distinct='1' submit='1'} + {selector_object_array entity=1 name='filter[name]' modname='SecurityCenter' class='Zikula\SecurityCenterModule\Entity\IntrusionEntity' field='name' displayField='name' selectedValue=$filter.name defaultValue='0' defaultText=$lblAll distinct='1' submit='1'} - {selector_object_array entity=1 name='filter[tag]' modname='SecurityCenter' class='Zikula\Module\SecurityCenterModule\Entity\IntrusionEntity' field='tag' displayField='tag' selectedValue=$filter.tag defaultValue='0' defaultText=$lblAll distinct='1' submit='1'} + {selector_object_array entity=1 name='filter[tag]' modname='SecurityCenter' class='Zikula\SecurityCenterModule\Entity\IntrusionEntity' field='tag' displayField='tag' selectedValue=$filter.tag defaultValue='0' defaultText=$lblAll distinct='1' submit='1'} - {selector_object_array entity=1 name='filter[value]' modname='SecurityCenter' class='Zikula\Module\SecurityCenterModule\Entity\IntrusionEntity' field='value' displayField='value' selectedValue=$filter.value defaultValue='0' defaultText=$lblAll distinct='1' submit='1'} + {selector_object_array entity=1 name='filter[value]' modname='SecurityCenter' class='Zikula\SecurityCenterModule\Entity\IntrusionEntity' field='value' displayField='value' selectedValue=$filter.value defaultValue='0' defaultText=$lblAll distinct='1' submit='1'} - {selector_object_array entity=1 name='filter[page]' modname='SecurityCenter' class='Zikula\Module\SecurityCenterModule\Entity\IntrusionEntity' field='page' displayField='page' selectedValue=$filter.page defaultValue='0' defaultText=$lblAll distinct='1' submit='1'} + {selector_object_array entity=1 name='filter[page]' modname='SecurityCenter' class='Zikula\SecurityCenterModule\Entity\IntrusionEntity' field='page' displayField='page' selectedValue=$filter.page defaultValue='0' defaultText=$lblAll distinct='1' submit='1'} - {selector_object_array entity=1 name='filter[ip]' modname='SecurityCenter' class='Zikula\Module\SecurityCenterModule\Entity\IntrusionEntity' field='ip' displayField='ip' selectedValue=$filter.ip defaultValue='0' defaultText=$lblAll distinct='1' submit='1'} + {selector_object_array entity=1 name='filter[ip]' modname='SecurityCenter' class='Zikula\SecurityCenterModule\Entity\IntrusionEntity' field='ip' displayField='ip' selectedValue=$filter.ip defaultValue='0' defaultText=$lblAll distinct='1' submit='1'} - {selector_object_array entity=1 name='filter[impact]' modname='SecurityCenter' class='Zikula\Module\SecurityCenterModule\Entity\IntrusionEntity' field='impact' displayField='impact' selectedValue=$filter.impact defaultValue='0' defaultText=$lblAll distinct='1' submit='1'} + {selector_object_array entity=1 name='filter[impact]' modname='SecurityCenter' class='Zikula\SecurityCenterModule\Entity\IntrusionEntity' field='impact' displayField='impact' selectedValue=$filter.impact defaultValue='0' defaultText=$lblAll distinct='1' submit='1'} {if ($filter.uid || $filter.name || $filter.tag || $filter.value || $filter.page || $filter.ip || $filter.impact)} {img src='button_cancel.png' modname='core' set='icons/extrasmall' __alt='Clear filter' __title='Clear filter'} {/if} diff --git a/src/system/Zikula/Module/SecurityCenterModule/SecurityCenterModuleInstaller.php b/src/system/SecurityCenterModule/SecurityCenterModuleInstaller.php similarity index 97% rename from src/system/Zikula/Module/SecurityCenterModule/SecurityCenterModuleInstaller.php rename to src/system/SecurityCenterModule/SecurityCenterModuleInstaller.php index d8d4f62cf6..0fb611b8ac 100644 --- a/src/system/Zikula/Module/SecurityCenterModule/SecurityCenterModuleInstaller.php +++ b/src/system/SecurityCenterModule/SecurityCenterModuleInstaller.php @@ -11,12 +11,12 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\SecurityCenterModule; +namespace Zikula\SecurityCenterModule; use System; use Zikula_Core; use CacheUtil; -use Zikula\Module\SecurityCenterModule\Util as SecurityCenterUtil; +use Zikula\SecurityCenterModule\Util as SecurityCenterUtil; use DoctrineHelper; /** @@ -33,7 +33,7 @@ public function install() { // create the table try { - DoctrineHelper::createSchema($this->entityManager, array('Zikula\Module\SecurityCenterModule\Entity\IntrusionEntity')); + DoctrineHelper::createSchema($this->entityManager, array('Zikula\SecurityCenterModule\Entity\IntrusionEntity')); } catch (\Exception $e) { return false; } diff --git a/src/system/Zikula/Module/SecurityCenterModule/SecurityCenterModuleVersion.php b/src/system/SecurityCenterModule/SecurityCenterModuleVersion.php similarity index 96% rename from src/system/Zikula/Module/SecurityCenterModule/SecurityCenterModuleVersion.php rename to src/system/SecurityCenterModule/SecurityCenterModuleVersion.php index 7b07d99570..cd92bc8b60 100644 --- a/src/system/Zikula/Module/SecurityCenterModule/SecurityCenterModuleVersion.php +++ b/src/system/SecurityCenterModule/SecurityCenterModuleVersion.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\SecurityCenterModule; +namespace Zikula\SecurityCenterModule; /** * Version information for the security centre module diff --git a/src/system/Zikula/Module/SecurityCenterModule/Util.php b/src/system/SecurityCenterModule/Util.php similarity index 99% rename from src/system/Zikula/Module/SecurityCenterModule/Util.php rename to src/system/SecurityCenterModule/Util.php index b159c44b76..90312aeb52 100644 --- a/src/system/Zikula/Module/SecurityCenterModule/Util.php +++ b/src/system/SecurityCenterModule/Util.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\SecurityCenterModule; +namespace Zikula\SecurityCenterModule; use HTMLPurifier_Config; use ZLanguage; diff --git a/src/system/Zikula/Module/SecurityCenterModule/ZikulaSecurityCenterModule.php b/src/system/SecurityCenterModule/ZikulaSecurityCenterModule.php similarity index 93% rename from src/system/Zikula/Module/SecurityCenterModule/ZikulaSecurityCenterModule.php rename to src/system/SecurityCenterModule/ZikulaSecurityCenterModule.php index 464b6bc5df..fcdf88fd88 100644 --- a/src/system/Zikula/Module/SecurityCenterModule/ZikulaSecurityCenterModule.php +++ b/src/system/SecurityCenterModule/ZikulaSecurityCenterModule.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\SecurityCenterModule; +namespace Zikula\SecurityCenterModule; use Zikula\Bundle\CoreBundle\Bundle\AbstractCoreModule; diff --git a/src/system/Zikula/Module/SecurityCenterModule/bootstrap.php b/src/system/SecurityCenterModule/bootstrap.php similarity index 82% rename from src/system/Zikula/Module/SecurityCenterModule/bootstrap.php rename to src/system/SecurityCenterModule/bootstrap.php index d750ae3032..33d9b6bfc1 100644 --- a/src/system/Zikula/Module/SecurityCenterModule/bootstrap.php +++ b/src/system/SecurityCenterModule/bootstrap.php @@ -12,4 +12,4 @@ */ // register event handlers -EventUtil::attachEventHandler('Zikula\Module\SecurityCenterModule\Listener\FilterListener'); +EventUtil::attachEventHandler('Zikula\SecurityCenterModule\Listener\FilterListener'); diff --git a/src/system/Zikula/Module/SecurityCenterModule/composer.json b/src/system/SecurityCenterModule/composer.json similarity index 72% rename from src/system/Zikula/Module/SecurityCenterModule/composer.json rename to src/system/SecurityCenterModule/composer.json index 11c1d75085..ba6fc3f0dd 100644 --- a/src/system/Zikula/Module/SecurityCenterModule/composer.json +++ b/src/system/SecurityCenterModule/composer.json @@ -10,14 +10,14 @@ } ], "autoload": { - "psr-0": { "Zikula\\Module\\SecurityCenterModule\\": "" } + "psr-4": { "Zikula\\SecurityCenterModule\\": "" } }, "require": { "php": ">5.4.0" }, "extra": { "zikula": { - "class": "Zikula\\Module\\SecurityCenterModule\\ZikulaSecurityCenterModule" + "class": "Zikula\\SecurityCenterModule\\ZikulaSecurityCenterModule" } } } diff --git a/src/system/Zikula/Module/SecurityCenterModule/phpunit.xml.dist b/src/system/SecurityCenterModule/phpunit.xml.dist similarity index 100% rename from src/system/Zikula/Module/SecurityCenterModule/phpunit.xml.dist rename to src/system/SecurityCenterModule/phpunit.xml.dist diff --git a/src/system/Zikula/Module/SecurityCenterModule/tables.php b/src/system/SecurityCenterModule/tables.php similarity index 100% rename from src/system/Zikula/Module/SecurityCenterModule/tables.php rename to src/system/SecurityCenterModule/tables.php From de2f251a69ac89a39b8c38d36ea820739f88ba94 Mon Sep 17 00:00:00 2001 From: Craig Heydenburg Date: Sun, 16 Aug 2015 18:40:26 -0400 Subject: [PATCH 12/35] convert SettingsModule to psr-4 --- composer.json | 1 + src/app/ZikulaKernel.php | 2 +- .../{Zikula/Module => }/SettingsModule/.gitignore | 0 .../{Zikula/Module => }/SettingsModule/.travis.yml | 0 .../Module => }/SettingsModule/Api/AdminApi.php | 2 +- .../SettingsModule/Controller/AdminController.php | 2 +- .../DependencyInjection/ZikulaSettingsExtension.php | 2 +- .../SettingsModule/Entity/ObjectdataAttributes.php | 2 +- .../SettingsModule/Entity/ObjectdataLog.php | 2 +- .../SettingsModule/Entity/ObjectdataMeta.php | 2 +- .../{Zikula/Module => }/SettingsModule/LICENSE | 0 .../SettingsModule/Listener/ModuleListener.php | 2 +- .../{Zikula/Module => }/SettingsModule/README.md | 0 .../SettingsModule/Resources/config/routing.yml | 0 .../SettingsModule/Resources/config/services.xml | 2 +- .../SettingsModule/Resources/public/css/style.css | 0 .../Resources/public/images/admin.png | Bin .../public/js/ZikulaSettingsModule.Admin.Phpinfo.js | 0 .../Resources/views/Admin/modifyconfig.tpl | 0 .../Resources/views/Admin/multilingual.tpl | 0 .../Resources/views/Admin/phpinfo.tpl | 0 .../SettingsModule/SettingsModuleInstaller.php | 10 +++++----- .../SettingsModule/SettingsModuleVersion.php | 2 +- .../SettingsModule/ZikulaSettingsModule.php | 2 +- .../Module => }/SettingsModule/composer.json | 4 ++-- .../Module => }/SettingsModule/phpunit.xml.dist | 0 .../{Zikula/Module => }/SettingsModule/tables.php | 0 27 files changed, 19 insertions(+), 18 deletions(-) rename src/system/{Zikula/Module => }/SettingsModule/.gitignore (100%) rename src/system/{Zikula/Module => }/SettingsModule/.travis.yml (100%) rename src/system/{Zikula/Module => }/SettingsModule/Api/AdminApi.php (98%) rename src/system/{Zikula/Module => }/SettingsModule/Controller/AdminController.php (99%) rename src/system/{Zikula/Module => }/SettingsModule/DependencyInjection/ZikulaSettingsExtension.php (94%) rename src/system/{Zikula/Module => }/SettingsModule/Entity/ObjectdataAttributes.php (99%) rename src/system/{Zikula/Module => }/SettingsModule/Entity/ObjectdataLog.php (99%) rename src/system/{Zikula/Module => }/SettingsModule/Entity/ObjectdataMeta.php (99%) rename src/system/{Zikula/Module => }/SettingsModule/LICENSE (100%) rename src/system/{Zikula/Module => }/SettingsModule/Listener/ModuleListener.php (96%) rename src/system/{Zikula/Module => }/SettingsModule/README.md (100%) rename src/system/{Zikula/Module => }/SettingsModule/Resources/config/routing.yml (100%) rename src/system/{Zikula/Module => }/SettingsModule/Resources/config/services.xml (89%) rename src/system/{Zikula/Module => }/SettingsModule/Resources/public/css/style.css (100%) rename src/system/{Zikula/Module => }/SettingsModule/Resources/public/images/admin.png (100%) rename src/system/{Zikula/Module => }/SettingsModule/Resources/public/js/ZikulaSettingsModule.Admin.Phpinfo.js (100%) rename src/system/{Zikula/Module => }/SettingsModule/Resources/views/Admin/modifyconfig.tpl (100%) rename src/system/{Zikula/Module => }/SettingsModule/Resources/views/Admin/multilingual.tpl (100%) rename src/system/{Zikula/Module => }/SettingsModule/Resources/views/Admin/phpinfo.tpl (100%) rename src/system/{Zikula/Module => }/SettingsModule/SettingsModuleInstaller.php (95%) rename src/system/{Zikula/Module => }/SettingsModule/SettingsModuleVersion.php (96%) rename src/system/{Zikula/Module => }/SettingsModule/ZikulaSettingsModule.php (93%) rename src/system/{Zikula/Module => }/SettingsModule/composer.json (74%) rename src/system/{Zikula/Module => }/SettingsModule/phpunit.xml.dist (100%) rename src/system/{Zikula/Module => }/SettingsModule/tables.php (100%) diff --git a/composer.json b/composer.json index 8f0de6f806..bc9706ad69 100644 --- a/composer.json +++ b/composer.json @@ -27,6 +27,7 @@ "Zikula\\RoutesModule\\": "src/system/ZikulaRoutesModule", "Zikula\\SearchModule\\": "src/system/SearchModule", "Zikula\\SecurityCenterModule\\": "src/system/SecurityCenterModule", + "Zikula\\SettingsModule\\": "src/system/SettingsModule", "Zikula\\ThemeModule\\": "src/system/ThemeModule" }, "classmap": [ diff --git a/src/app/ZikulaKernel.php b/src/app/ZikulaKernel.php index 1c013057ae..2e86a99b31 100644 --- a/src/app/ZikulaKernel.php +++ b/src/app/ZikulaKernel.php @@ -73,7 +73,7 @@ private function registerCoreModules(array &$bundles) $bundles[] = new Zikula\PermissionsModule\ZikulaPermissionsModule(); $bundles[] = new Zikula\SearchModule\ZikulaSearchModule(); $bundles[] = new Zikula\SecurityCenterModule\ZikulaSecurityCenterModule(); - $bundles[] = new Zikula\Module\SettingsModule\ZikulaSettingsModule(); + $bundles[] = new Zikula\SettingsModule\ZikulaSettingsModule(); $bundles[] = new Zikula\ThemeModule\ZikulaThemeModule(); $bundles[] = new Zikula\Module\UsersModule\ZikulaUsersModule(); $bundles[] = new Zikula\RoutesModule\ZikulaRoutesModule(); diff --git a/src/system/Zikula/Module/SettingsModule/.gitignore b/src/system/SettingsModule/.gitignore similarity index 100% rename from src/system/Zikula/Module/SettingsModule/.gitignore rename to src/system/SettingsModule/.gitignore diff --git a/src/system/Zikula/Module/SettingsModule/.travis.yml b/src/system/SettingsModule/.travis.yml similarity index 100% rename from src/system/Zikula/Module/SettingsModule/.travis.yml rename to src/system/SettingsModule/.travis.yml diff --git a/src/system/Zikula/Module/SettingsModule/Api/AdminApi.php b/src/system/SettingsModule/Api/AdminApi.php similarity index 98% rename from src/system/Zikula/Module/SettingsModule/Api/AdminApi.php rename to src/system/SettingsModule/Api/AdminApi.php index 3fe591d284..a840908535 100644 --- a/src/system/Zikula/Module/SettingsModule/Api/AdminApi.php +++ b/src/system/SettingsModule/Api/AdminApi.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\SettingsModule\Api; +namespace Zikula\SettingsModule\Api; use ZLanguage; use ModUtil; diff --git a/src/system/Zikula/Module/SettingsModule/Controller/AdminController.php b/src/system/SettingsModule/Controller/AdminController.php similarity index 99% rename from src/system/Zikula/Module/SettingsModule/Controller/AdminController.php rename to src/system/SettingsModule/Controller/AdminController.php index bb1aa0d726..e88de8f35f 100644 --- a/src/system/Zikula/Module/SettingsModule/Controller/AdminController.php +++ b/src/system/SettingsModule/Controller/AdminController.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\SettingsModule\Controller; +namespace Zikula\SettingsModule\Controller; use Symfony\Component\Security\Core\Exception\AccessDeniedException; use Zikula_View; diff --git a/src/system/Zikula/Module/SettingsModule/DependencyInjection/ZikulaSettingsExtension.php b/src/system/SettingsModule/DependencyInjection/ZikulaSettingsExtension.php similarity index 94% rename from src/system/Zikula/Module/SettingsModule/DependencyInjection/ZikulaSettingsExtension.php rename to src/system/SettingsModule/DependencyInjection/ZikulaSettingsExtension.php index 72661df748..63dc1afeac 100644 --- a/src/system/Zikula/Module/SettingsModule/DependencyInjection/ZikulaSettingsExtension.php +++ b/src/system/SettingsModule/DependencyInjection/ZikulaSettingsExtension.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\SettingsModule\DependencyInjection; +namespace Zikula\SettingsModule\DependencyInjection; use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Loader\XmlFileLoader; diff --git a/src/system/Zikula/Module/SettingsModule/Entity/ObjectdataAttributes.php b/src/system/SettingsModule/Entity/ObjectdataAttributes.php similarity index 99% rename from src/system/Zikula/Module/SettingsModule/Entity/ObjectdataAttributes.php rename to src/system/SettingsModule/Entity/ObjectdataAttributes.php index 830b38bfd9..e0f4c90f7f 100644 --- a/src/system/Zikula/Module/SettingsModule/Entity/ObjectdataAttributes.php +++ b/src/system/SettingsModule/Entity/ObjectdataAttributes.php @@ -1,6 +1,6 @@ - Zikula\Module\SettingsModule\Listener\ModuleListener + Zikula\SettingsModule\Listener\ModuleListener diff --git a/src/system/Zikula/Module/SettingsModule/Resources/public/css/style.css b/src/system/SettingsModule/Resources/public/css/style.css similarity index 100% rename from src/system/Zikula/Module/SettingsModule/Resources/public/css/style.css rename to src/system/SettingsModule/Resources/public/css/style.css diff --git a/src/system/Zikula/Module/SettingsModule/Resources/public/images/admin.png b/src/system/SettingsModule/Resources/public/images/admin.png similarity index 100% rename from src/system/Zikula/Module/SettingsModule/Resources/public/images/admin.png rename to src/system/SettingsModule/Resources/public/images/admin.png diff --git a/src/system/Zikula/Module/SettingsModule/Resources/public/js/ZikulaSettingsModule.Admin.Phpinfo.js b/src/system/SettingsModule/Resources/public/js/ZikulaSettingsModule.Admin.Phpinfo.js similarity index 100% rename from src/system/Zikula/Module/SettingsModule/Resources/public/js/ZikulaSettingsModule.Admin.Phpinfo.js rename to src/system/SettingsModule/Resources/public/js/ZikulaSettingsModule.Admin.Phpinfo.js diff --git a/src/system/Zikula/Module/SettingsModule/Resources/views/Admin/modifyconfig.tpl b/src/system/SettingsModule/Resources/views/Admin/modifyconfig.tpl similarity index 100% rename from src/system/Zikula/Module/SettingsModule/Resources/views/Admin/modifyconfig.tpl rename to src/system/SettingsModule/Resources/views/Admin/modifyconfig.tpl diff --git a/src/system/Zikula/Module/SettingsModule/Resources/views/Admin/multilingual.tpl b/src/system/SettingsModule/Resources/views/Admin/multilingual.tpl similarity index 100% rename from src/system/Zikula/Module/SettingsModule/Resources/views/Admin/multilingual.tpl rename to src/system/SettingsModule/Resources/views/Admin/multilingual.tpl diff --git a/src/system/Zikula/Module/SettingsModule/Resources/views/Admin/phpinfo.tpl b/src/system/SettingsModule/Resources/views/Admin/phpinfo.tpl similarity index 100% rename from src/system/Zikula/Module/SettingsModule/Resources/views/Admin/phpinfo.tpl rename to src/system/SettingsModule/Resources/views/Admin/phpinfo.tpl diff --git a/src/system/Zikula/Module/SettingsModule/SettingsModuleInstaller.php b/src/system/SettingsModule/SettingsModuleInstaller.php similarity index 95% rename from src/system/Zikula/Module/SettingsModule/SettingsModuleInstaller.php rename to src/system/SettingsModule/SettingsModuleInstaller.php index 4ffc01e53b..8ff18c2d91 100644 --- a/src/system/Zikula/Module/SettingsModule/SettingsModuleInstaller.php +++ b/src/system/SettingsModule/SettingsModuleInstaller.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\SettingsModule; +namespace Zikula\SettingsModule; use System; use Zikula_Core; @@ -117,9 +117,9 @@ public function install() */ try { DoctrineHelper::createSchema($this->entityManager, array( - 'Zikula\Module\SettingsModule\Entity\ObjectdataAttributes', - 'Zikula\Module\SettingsModule\Entity\ObjectdataLog', - 'Zikula\Module\SettingsModule\Entity\ObjectdataMeta', + 'Zikula\SettingsModule\Entity\ObjectdataAttributes', + 'Zikula\SettingsModule\Entity\ObjectdataLog', + 'Zikula\SettingsModule\Entity\ObjectdataMeta', )); } catch (\Exception $e) { return false; @@ -146,7 +146,7 @@ public function upgrade($oldversion) // Upgrade dependent on old version number switch ($oldversion) { case '2.9.7': - EventUtil::registerPersistentModuleHandler($this->name, 'installer.module.deactivated', array('Zikula\Module\SettingsModule\Listener\ModuleListener', 'moduleDeactivated')); + EventUtil::registerPersistentModuleHandler($this->name, 'installer.module.deactivated', array('Zikula\SettingsModule\Listener\ModuleListener', 'moduleDeactivated')); case '2.9.8': $permasearch = System::getVar('permasearch'); diff --git a/src/system/Zikula/Module/SettingsModule/SettingsModuleVersion.php b/src/system/SettingsModule/SettingsModuleVersion.php similarity index 96% rename from src/system/Zikula/Module/SettingsModule/SettingsModuleVersion.php rename to src/system/SettingsModule/SettingsModuleVersion.php index 41c426c5dc..3b43011d6e 100644 --- a/src/system/Zikula/Module/SettingsModule/SettingsModuleVersion.php +++ b/src/system/SettingsModule/SettingsModuleVersion.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\SettingsModule; +namespace Zikula\SettingsModule; /** * Version information for the settings module diff --git a/src/system/Zikula/Module/SettingsModule/ZikulaSettingsModule.php b/src/system/SettingsModule/ZikulaSettingsModule.php similarity index 93% rename from src/system/Zikula/Module/SettingsModule/ZikulaSettingsModule.php rename to src/system/SettingsModule/ZikulaSettingsModule.php index e525c79371..f6b9232538 100644 --- a/src/system/Zikula/Module/SettingsModule/ZikulaSettingsModule.php +++ b/src/system/SettingsModule/ZikulaSettingsModule.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\SettingsModule; +namespace Zikula\SettingsModule; use Zikula\Bundle\CoreBundle\Bundle\AbstractCoreModule; diff --git a/src/system/Zikula/Module/SettingsModule/composer.json b/src/system/SettingsModule/composer.json similarity index 74% rename from src/system/Zikula/Module/SettingsModule/composer.json rename to src/system/SettingsModule/composer.json index f9fab47649..d2c9b60e8b 100644 --- a/src/system/Zikula/Module/SettingsModule/composer.json +++ b/src/system/SettingsModule/composer.json @@ -10,14 +10,14 @@ } ], "autoload": { - "psr-0": { "Zikula\\Module\\SettingsModule\\": "" } + "psr-4": { "Zikula\\SettingsModule\\": "" } }, "require": { "php": ">5.4.0" }, "extra": { "zikula": { - "class": "Zikula\\Module\\SettingsModule\\ZikulaSettingsModule" + "class": "Zikula\\SettingsModule\\ZikulaSettingsModule" } } } diff --git a/src/system/Zikula/Module/SettingsModule/phpunit.xml.dist b/src/system/SettingsModule/phpunit.xml.dist similarity index 100% rename from src/system/Zikula/Module/SettingsModule/phpunit.xml.dist rename to src/system/SettingsModule/phpunit.xml.dist diff --git a/src/system/Zikula/Module/SettingsModule/tables.php b/src/system/SettingsModule/tables.php similarity index 100% rename from src/system/Zikula/Module/SettingsModule/tables.php rename to src/system/SettingsModule/tables.php From 44d5762e54340688c06ea523207898cb93954d50 Mon Sep 17 00:00:00 2001 From: Craig Heydenburg Date: Sun, 16 Aug 2015 18:51:10 -0400 Subject: [PATCH 13/35] convert UsersModule to psr-4 --- composer.json | 3 +- .../translations/routes.template.pot | 8 +- src/app/ZikulaKernel.php | 2 +- src/docs/en/dev/UPGRADE-1.4.0.md | 2 +- .../Controller/AjaxInstallController.php | 4 +- .../Form/Type/CreateAdminType.php | 2 +- .../Stage/Upgrade/InitStage.php | 4 +- .../Controller/AbstractAuthentication.php | 2 +- src/lib/legacy/dbobject/ObjectUtil.php | 4 +- .../viewplugins/function.useravatar.php | 2 +- .../legacy/viewplugins/function.userlogin.php | 2 +- src/lib/util/UserUtil.php | 8 +- .../Entity/CategoryEntity.php | 4 +- .../Entity/CategoryRegistryEntity.php | 4 +- .../Entity/IntrusionEntity.php | 6 +- .../Module => }/UsersModule/.gitignore | 0 .../Module => }/UsersModule/.travis.yml | 0 .../UsersModule/Api/AccountApi.php | 4 +- .../Module => }/UsersModule/Api/AdminApi.php | 8 +- .../UsersModule/Api/AuthenticationApi.php | 6 +- .../UsersModule/Api/RegistrationApi.php | 20 +-- .../Module => }/UsersModule/Api/UserApi.php | 8 +- .../UsersModule/Block/AccountlinksBlock.php | 2 +- .../UsersModule/Block/LoginBlock.php | 4 +- .../UsersModule/Block/OnlineBlock.php | 2 +- .../UsersModule/Block/UserBlock.php | 2 +- .../Module => }/UsersModule/Constant.php | 2 +- .../Controller/AdminController.php | 12 +- .../UsersModule/Controller/AjaxController.php | 2 +- .../Controller/AuthenticationController.php | 2 +- .../Controller/FormData/AbstractFormData.php | 2 +- .../Controller/FormData/ConfigForm.php | 22 ++-- .../UsersModule/Controller/FormData/Field.php | 2 +- .../FormData/ModifyRegistrationForm.php | 6 +- .../Controller/FormData/ModifyUserForm.php | 4 +- .../Controller/FormData/NewUserForm.php | 6 +- .../Controller/FormData/RegistrationForm.php | 4 +- .../FormData/Validator/AbstractValidator.php | 2 +- .../FormData/Validator/BooleanType.php | 2 +- .../FormData/Validator/FilterVar.php | 2 +- .../Validator/IntegerNumericInSet.php | 2 +- .../Validator/IntegerNumericMaximumValue.php | 2 +- .../Validator/IntegerNumericMinimumValue.php | 2 +- .../FormData/Validator/IntegerNumericType.php | 2 +- .../FormData/Validator/StringInSet.php | 2 +- .../FormData/Validator/StringLowerCase.php | 2 +- .../Validator/StringMaximumLength.php | 2 +- .../Validator/StringMinimumLength.php | 2 +- .../Validator/StringRegularExpression.php | 2 +- .../FormData/Validator/StringType.php | 2 +- .../UsersModule/Controller/UserController.php | 10 +- .../ZikulaUsersExtension.php | 2 +- .../Entity/UserAttributeEntity.php | 2 +- .../UsersModule/Entity/UserEntity.php | 2 +- .../UsersModule/Entity/UserSessionEntity.php | 2 +- .../Entity/UserVerificationEntity.php | 2 +- .../Helper/AuthenticationMethodHelper.php | 2 +- .../Helper/AuthenticationMethodListHelper.php | 4 +- .../Helper/HashMethodListHelper.php | 2 +- .../UsersModule/Helper/SearchHelper.php | 4 +- .../{Zikula/Module => }/UsersModule/LICENSE | 0 .../Listener/PendingContentListener.php | 4 +- .../Listener/UserEventListener.php | 4 +- .../{Zikula/Module => }/UsersModule/README.md | 0 .../UsersModule/Resources/config/routing.yml | 0 .../UsersModule/Resources/config/services.xml | 4 +- .../docs/en/Developer/Profile_Managers.txt | 0 .../Resources/docs/en/Help/Admin/config.txt | 0 .../Resources/public/css/style.css | 0 .../Resources/public/images/admin.png | Bin .../Resources/public/images/exit.png | Bin .../Resources/public/images/folder_home.png | Bin .../Resources/public/images/locale.png | Bin .../Resources/public/images/message.png | Bin .../Resources/public/images/password.png | Bin .../public/js/Zikula.Users.Admin.Config.js | 0 .../public/js/Zikula.Users.Admin.Modify.js | 0 .../public/js/Zikula.Users.Admin.View.js | 0 .../js/Zikula.Users.Common.UserValidation.js | 0 .../Resources/public/js/Zikula.Users.Login.js | 0 .../public/js/Zikula.Users.LoginBlock.js | 0 .../public/js/Zikula.Users.PassMeter.js | 0 .../public/js/Zikula.Users.Util.CapsLock.js | 0 .../js/ZikulaUsersModule.Admin.MailUsers.js | 0 .../views/Admin/approveregistration.tpl | 2 +- .../Resources/views/Admin/config.tpl | 118 +++++++++--------- .../Resources/views/Admin/deleteusers.tpl | 0 .../views/Admin/denyregistration.tpl | 0 .../views/Admin/displayregistration.tpl | 0 .../Resources/views/Admin/export.tpl | 0 .../Resources/views/Admin/import.tpl | 0 .../views/Admin/includeregistration.tpl | 0 .../Resources/views/Admin/mailusers.tpl | 0 .../Resources/views/Admin/modify.tpl | 4 +- .../views/Admin/modifyregistration.tpl | 0 .../Resources/views/Admin/newuser.tpl | 2 +- .../Resources/views/Admin/search.tpl | 0 .../Resources/views/Admin/search_results.tpl | 0 .../Admin/toggleforcedpasswordchange.tpl | 0 .../Resources/views/Admin/userlist.tpl | 6 +- .../views/Admin/verifyregistration.tpl | 0 .../Resources/views/Admin/view.tpl | 0 .../views/Admin/viewregistrations.tpl | 6 +- .../Resources/views/Ajax/getusers.tpl | 0 .../Base/Base.tpl | 0 .../loginblock/Base.tpl | 0 .../LoginFormFields/Default/Default.tpl | 0 .../LoginFormFields/loginblock/Default.tpl | 0 .../Resources/views/Block/accountlinks.tpl | 0 .../Resources/views/Block/login.tpl | 0 .../Resources/views/Block/login_topnav.tpl | 0 .../Resources/views/Block/online.tpl | 0 .../views/Email/importnotify_html.tpl | 0 .../views/Email/importnotify_txt.tpl | 0 .../views/Email/lostpassword_html.tpl | 0 .../views/Email/lostpassword_txt.tpl | 0 .../Resources/views/Email/lostuname_html.tpl | 0 .../Resources/views/Email/lostuname_txt.tpl | 0 .../views/Email/regadminnotify_html.tpl | 0 .../views/Email/regadminnotify_txt.tpl | 0 .../Resources/views/Email/regdeny_html.tpl | 0 .../Resources/views/Email/regdeny_txt.tpl | 0 .../views/Email/regverifyemail_html.tpl | 2 +- .../views/Email/regverifyemail_txt.tpl | 2 +- .../views/Email/userverifyemail_html.tpl | 0 .../views/Email/userverifyemail_txt.tpl | 0 .../Resources/views/Email/welcome_html.tpl | 0 .../Resources/views/Email/welcome_txt.tpl | 0 .../Resources/views/Search/options.tpl | 0 .../views/User/api_expiredsession.tpl | 0 .../Resources/views/User/changeemail.tpl | 0 .../Resources/views/User/changelang.tpl | 0 .../Resources/views/User/changepassword.tpl | 0 .../Resources/views/User/displaystatusmsg.tpl | 0 .../Resources/views/User/login.tpl | 0 .../Resources/views/User/lostpassword.tpl | 0 .../Resources/views/User/lostpasswordcode.tpl | 0 .../Resources/views/User/lostpwduname.tpl | 0 .../Resources/views/User/lostuname.tpl | 0 .../Resources/views/User/mailpasswd.tpl | 0 .../UsersModule/Resources/views/User/main.tpl | 0 .../UsersModule/Resources/views/User/menu.tpl | 0 .../Resources/views/User/passwordreminder.tpl | 0 .../Resources/views/User/redirectpage.tpl | 0 .../Resources/views/User/register.tpl | 18 +-- .../views/User/registration_disabled.tpl | 0 .../views/User/registration_method.tpl | 0 .../Resources/views/User/usersblock.tpl | 0 .../views/User/verifyregistration.tpl | 0 .../UsersModule/Resources/views/User/view.tpl | 0 .../plugins/function.login_form_fields.php | 0 .../UsersModule/UsersModuleInstaller.php | 18 +-- .../UsersModule/UsersModuleVersion.php | 6 +- .../UsersModule/ZikulaUsersModule.php | 20 +-- .../Module => }/UsersModule/composer.json | 4 +- .../Module => }/UsersModule/phpunit.xml.dist | 0 .../Module => }/UsersModule/tables.php | 0 157 files changed, 228 insertions(+), 227 deletions(-) rename src/system/{Zikula/Module => }/UsersModule/.gitignore (100%) rename src/system/{Zikula/Module => }/UsersModule/.travis.yml (100%) rename src/system/{Zikula/Module => }/UsersModule/Api/AccountApi.php (97%) rename src/system/{Zikula/Module => }/UsersModule/Api/AdminApi.php (99%) rename src/system/{Zikula/Module => }/UsersModule/Api/AuthenticationApi.php (99%) rename src/system/{Zikula/Module => }/UsersModule/Api/RegistrationApi.php (99%) rename src/system/{Zikula/Module => }/UsersModule/Api/UserApi.php (99%) rename src/system/{Zikula/Module => }/UsersModule/Block/AccountlinksBlock.php (98%) rename src/system/{Zikula/Module => }/UsersModule/Block/LoginBlock.php (97%) rename src/system/{Zikula/Module => }/UsersModule/Block/OnlineBlock.php (99%) rename src/system/{Zikula/Module => }/UsersModule/Block/UserBlock.php (98%) rename src/system/{Zikula/Module => }/UsersModule/Constant.php (99%) rename src/system/{Zikula/Module => }/UsersModule/Controller/AdminController.php (99%) rename src/system/{Zikula/Module => }/UsersModule/Controller/AjaxController.php (99%) rename src/system/{Zikula/Module => }/UsersModule/Controller/AuthenticationController.php (99%) rename src/system/{Zikula/Module => }/UsersModule/Controller/FormData/AbstractFormData.php (99%) rename src/system/{Zikula/Module => }/UsersModule/Controller/FormData/ConfigForm.php (97%) rename src/system/{Zikula/Module => }/UsersModule/Controller/FormData/Field.php (99%) rename src/system/{Zikula/Module => }/UsersModule/Controller/FormData/ModifyRegistrationForm.php (97%) rename src/system/{Zikula/Module => }/UsersModule/Controller/FormData/ModifyUserForm.php (98%) rename src/system/{Zikula/Module => }/UsersModule/Controller/FormData/NewUserForm.php (97%) rename src/system/{Zikula/Module => }/UsersModule/Controller/FormData/RegistrationForm.php (98%) rename src/system/{Zikula/Module => }/UsersModule/Controller/FormData/Validator/AbstractValidator.php (97%) rename src/system/{Zikula/Module => }/UsersModule/Controller/FormData/Validator/BooleanType.php (95%) rename src/system/{Zikula/Module => }/UsersModule/Controller/FormData/Validator/FilterVar.php (98%) rename src/system/{Zikula/Module => }/UsersModule/Controller/FormData/Validator/IntegerNumericInSet.php (97%) rename src/system/{Zikula/Module => }/UsersModule/Controller/FormData/Validator/IntegerNumericMaximumValue.php (97%) rename src/system/{Zikula/Module => }/UsersModule/Controller/FormData/Validator/IntegerNumericMinimumValue.php (97%) rename src/system/{Zikula/Module => }/UsersModule/Controller/FormData/Validator/IntegerNumericType.php (94%) rename src/system/{Zikula/Module => }/UsersModule/Controller/FormData/Validator/StringInSet.php (97%) rename src/system/{Zikula/Module => }/UsersModule/Controller/FormData/Validator/StringLowerCase.php (94%) rename src/system/{Zikula/Module => }/UsersModule/Controller/FormData/Validator/StringMaximumLength.php (97%) rename src/system/{Zikula/Module => }/UsersModule/Controller/FormData/Validator/StringMinimumLength.php (97%) rename src/system/{Zikula/Module => }/UsersModule/Controller/FormData/Validator/StringRegularExpression.php (97%) rename src/system/{Zikula/Module => }/UsersModule/Controller/FormData/Validator/StringType.php (93%) rename src/system/{Zikula/Module => }/UsersModule/Controller/UserController.php (99%) rename src/system/{Zikula/Module => }/UsersModule/DependencyInjection/ZikulaUsersExtension.php (95%) rename src/system/{Zikula/Module => }/UsersModule/Entity/UserAttributeEntity.php (98%) rename src/system/{Zikula/Module => }/UsersModule/Entity/UserEntity.php (99%) rename src/system/{Zikula/Module => }/UsersModule/Entity/UserSessionEntity.php (99%) rename src/system/{Zikula/Module => }/UsersModule/Entity/UserVerificationEntity.php (99%) rename src/system/{Zikula/Module => }/UsersModule/Helper/AuthenticationMethodHelper.php (99%) rename src/system/{Zikula/Module => }/UsersModule/Helper/AuthenticationMethodListHelper.php (99%) rename src/system/{Zikula/Module => }/UsersModule/Helper/HashMethodListHelper.php (95%) rename src/system/{Zikula/Module => }/UsersModule/Helper/SearchHelper.php (97%) rename src/system/{Zikula/Module => }/UsersModule/LICENSE (100%) rename src/system/{Zikula/Module => }/UsersModule/Listener/PendingContentListener.php (97%) rename src/system/{Zikula/Module => }/UsersModule/Listener/UserEventListener.php (97%) rename src/system/{Zikula/Module => }/UsersModule/README.md (100%) rename src/system/{Zikula/Module => }/UsersModule/Resources/config/routing.yml (100%) rename src/system/{Zikula/Module => }/UsersModule/Resources/config/services.xml (87%) rename src/system/{Zikula/Module => }/UsersModule/Resources/docs/en/Developer/Profile_Managers.txt (100%) rename src/system/{Zikula/Module => }/UsersModule/Resources/docs/en/Help/Admin/config.txt (100%) rename src/system/{Zikula/Module => }/UsersModule/Resources/public/css/style.css (100%) rename src/system/{Zikula/Module => }/UsersModule/Resources/public/images/admin.png (100%) rename src/system/{Zikula/Module => }/UsersModule/Resources/public/images/exit.png (100%) rename src/system/{Zikula/Module => }/UsersModule/Resources/public/images/folder_home.png (100%) rename src/system/{Zikula/Module => }/UsersModule/Resources/public/images/locale.png (100%) rename src/system/{Zikula/Module => }/UsersModule/Resources/public/images/message.png (100%) rename src/system/{Zikula/Module => }/UsersModule/Resources/public/images/password.png (100%) rename src/system/{Zikula/Module => }/UsersModule/Resources/public/js/Zikula.Users.Admin.Config.js (100%) rename src/system/{Zikula/Module => }/UsersModule/Resources/public/js/Zikula.Users.Admin.Modify.js (100%) rename src/system/{Zikula/Module => }/UsersModule/Resources/public/js/Zikula.Users.Admin.View.js (100%) rename src/system/{Zikula/Module => }/UsersModule/Resources/public/js/Zikula.Users.Common.UserValidation.js (100%) rename src/system/{Zikula/Module => }/UsersModule/Resources/public/js/Zikula.Users.Login.js (100%) rename src/system/{Zikula/Module => }/UsersModule/Resources/public/js/Zikula.Users.LoginBlock.js (100%) rename src/system/{Zikula/Module => }/UsersModule/Resources/public/js/Zikula.Users.PassMeter.js (100%) rename src/system/{Zikula/Module => }/UsersModule/Resources/public/js/Zikula.Users.Util.CapsLock.js (100%) rename src/system/{Zikula/Module => }/UsersModule/Resources/public/js/ZikulaUsersModule.Admin.MailUsers.js (100%) rename src/system/{Zikula/Module => }/UsersModule/Resources/views/Admin/approveregistration.tpl (95%) rename src/system/{Zikula/Module => }/UsersModule/Resources/views/Admin/config.tpl (83%) rename src/system/{Zikula/Module => }/UsersModule/Resources/views/Admin/deleteusers.tpl (100%) rename src/system/{Zikula/Module => }/UsersModule/Resources/views/Admin/denyregistration.tpl (100%) rename src/system/{Zikula/Module => }/UsersModule/Resources/views/Admin/displayregistration.tpl (100%) rename src/system/{Zikula/Module => }/UsersModule/Resources/views/Admin/export.tpl (100%) rename src/system/{Zikula/Module => }/UsersModule/Resources/views/Admin/import.tpl (100%) rename src/system/{Zikula/Module => }/UsersModule/Resources/views/Admin/includeregistration.tpl (100%) rename src/system/{Zikula/Module => }/UsersModule/Resources/views/Admin/mailusers.tpl (100%) rename src/system/{Zikula/Module => }/UsersModule/Resources/views/Admin/modify.tpl (96%) rename src/system/{Zikula/Module => }/UsersModule/Resources/views/Admin/modifyregistration.tpl (100%) rename src/system/{Zikula/Module => }/UsersModule/Resources/views/Admin/newuser.tpl (99%) rename src/system/{Zikula/Module => }/UsersModule/Resources/views/Admin/search.tpl (100%) rename src/system/{Zikula/Module => }/UsersModule/Resources/views/Admin/search_results.tpl (100%) rename src/system/{Zikula/Module => }/UsersModule/Resources/views/Admin/toggleforcedpasswordchange.tpl (100%) rename src/system/{Zikula/Module => }/UsersModule/Resources/views/Admin/userlist.tpl (94%) rename src/system/{Zikula/Module => }/UsersModule/Resources/views/Admin/verifyregistration.tpl (100%) rename src/system/{Zikula/Module => }/UsersModule/Resources/views/Admin/view.tpl (100%) rename src/system/{Zikula/Module => }/UsersModule/Resources/views/Admin/viewregistrations.tpl (95%) rename src/system/{Zikula/Module => }/UsersModule/Resources/views/Ajax/getusers.tpl (100%) rename src/system/{Zikula/Module => }/UsersModule/Resources/views/Authentication/AuthenticationMethodSelector/Base/Base.tpl (100%) rename src/system/{Zikula/Module => }/UsersModule/Resources/views/Authentication/AuthenticationMethodSelector/loginblock/Base.tpl (100%) rename src/system/{Zikula/Module => }/UsersModule/Resources/views/Authentication/LoginFormFields/Default/Default.tpl (100%) rename src/system/{Zikula/Module => }/UsersModule/Resources/views/Authentication/LoginFormFields/loginblock/Default.tpl (100%) rename src/system/{Zikula/Module => }/UsersModule/Resources/views/Block/accountlinks.tpl (100%) rename src/system/{Zikula/Module => }/UsersModule/Resources/views/Block/login.tpl (100%) rename src/system/{Zikula/Module => }/UsersModule/Resources/views/Block/login_topnav.tpl (100%) rename src/system/{Zikula/Module => }/UsersModule/Resources/views/Block/online.tpl (100%) rename src/system/{Zikula/Module => }/UsersModule/Resources/views/Email/importnotify_html.tpl (100%) rename src/system/{Zikula/Module => }/UsersModule/Resources/views/Email/importnotify_txt.tpl (100%) rename src/system/{Zikula/Module => }/UsersModule/Resources/views/Email/lostpassword_html.tpl (100%) rename src/system/{Zikula/Module => }/UsersModule/Resources/views/Email/lostpassword_txt.tpl (100%) rename src/system/{Zikula/Module => }/UsersModule/Resources/views/Email/lostuname_html.tpl (100%) rename src/system/{Zikula/Module => }/UsersModule/Resources/views/Email/lostuname_txt.tpl (100%) rename src/system/{Zikula/Module => }/UsersModule/Resources/views/Email/regadminnotify_html.tpl (100%) rename src/system/{Zikula/Module => }/UsersModule/Resources/views/Email/regadminnotify_txt.tpl (100%) rename src/system/{Zikula/Module => }/UsersModule/Resources/views/Email/regdeny_html.tpl (100%) rename src/system/{Zikula/Module => }/UsersModule/Resources/views/Email/regdeny_txt.tpl (100%) rename src/system/{Zikula/Module => }/UsersModule/Resources/views/Email/regverifyemail_html.tpl (92%) rename src/system/{Zikula/Module => }/UsersModule/Resources/views/Email/regverifyemail_txt.tpl (91%) rename src/system/{Zikula/Module => }/UsersModule/Resources/views/Email/userverifyemail_html.tpl (100%) rename src/system/{Zikula/Module => }/UsersModule/Resources/views/Email/userverifyemail_txt.tpl (100%) rename src/system/{Zikula/Module => }/UsersModule/Resources/views/Email/welcome_html.tpl (100%) rename src/system/{Zikula/Module => }/UsersModule/Resources/views/Email/welcome_txt.tpl (100%) rename src/system/{Zikula/Module => }/UsersModule/Resources/views/Search/options.tpl (100%) rename src/system/{Zikula/Module => }/UsersModule/Resources/views/User/api_expiredsession.tpl (100%) rename src/system/{Zikula/Module => }/UsersModule/Resources/views/User/changeemail.tpl (100%) rename src/system/{Zikula/Module => }/UsersModule/Resources/views/User/changelang.tpl (100%) rename src/system/{Zikula/Module => }/UsersModule/Resources/views/User/changepassword.tpl (100%) rename src/system/{Zikula/Module => }/UsersModule/Resources/views/User/displaystatusmsg.tpl (100%) rename src/system/{Zikula/Module => }/UsersModule/Resources/views/User/login.tpl (100%) rename src/system/{Zikula/Module => }/UsersModule/Resources/views/User/lostpassword.tpl (100%) rename src/system/{Zikula/Module => }/UsersModule/Resources/views/User/lostpasswordcode.tpl (100%) rename src/system/{Zikula/Module => }/UsersModule/Resources/views/User/lostpwduname.tpl (100%) rename src/system/{Zikula/Module => }/UsersModule/Resources/views/User/lostuname.tpl (100%) rename src/system/{Zikula/Module => }/UsersModule/Resources/views/User/mailpasswd.tpl (100%) rename src/system/{Zikula/Module => }/UsersModule/Resources/views/User/main.tpl (100%) rename src/system/{Zikula/Module => }/UsersModule/Resources/views/User/menu.tpl (100%) rename src/system/{Zikula/Module => }/UsersModule/Resources/views/User/passwordreminder.tpl (100%) rename src/system/{Zikula/Module => }/UsersModule/Resources/views/User/redirectpage.tpl (100%) rename src/system/{Zikula/Module => }/UsersModule/Resources/views/User/register.tpl (94%) rename src/system/{Zikula/Module => }/UsersModule/Resources/views/User/registration_disabled.tpl (100%) rename src/system/{Zikula/Module => }/UsersModule/Resources/views/User/registration_method.tpl (100%) rename src/system/{Zikula/Module => }/UsersModule/Resources/views/User/usersblock.tpl (100%) rename src/system/{Zikula/Module => }/UsersModule/Resources/views/User/verifyregistration.tpl (100%) rename src/system/{Zikula/Module => }/UsersModule/Resources/views/User/view.tpl (100%) rename src/system/{Zikula/Module => }/UsersModule/Resources/views/plugins/function.login_form_fields.php (100%) rename src/system/{Zikula/Module => }/UsersModule/UsersModuleInstaller.php (95%) rename src/system/{Zikula/Module => }/UsersModule/UsersModuleVersion.php (96%) rename src/system/{Zikula/Module => }/UsersModule/ZikulaUsersModule.php (55%) rename src/system/{Zikula/Module => }/UsersModule/composer.json (74%) rename src/system/{Zikula/Module => }/UsersModule/phpunit.xml.dist (100%) rename src/system/{Zikula/Module => }/UsersModule/tables.php (100%) diff --git a/composer.json b/composer.json index bc9706ad69..4cef9e669c 100644 --- a/composer.json +++ b/composer.json @@ -28,7 +28,8 @@ "Zikula\\SearchModule\\": "src/system/SearchModule", "Zikula\\SecurityCenterModule\\": "src/system/SecurityCenterModule", "Zikula\\SettingsModule\\": "src/system/SettingsModule", - "Zikula\\ThemeModule\\": "src/system/ThemeModule" + "Zikula\\ThemeModule\\": "src/system/ThemeModule", + "Zikula\\UsersModule\\": "src/system/UsersModule" }, "classmap": [ "src/lib/util/", diff --git a/src/app/Resources/translations/routes.template.pot b/src/app/Resources/translations/routes.template.pot index 86357efbb1..4426871e7a 100644 --- a/src/app/Resources/translations/routes.template.pot +++ b/src/app/Resources/translations/routes.template.pot @@ -1124,15 +1124,15 @@ msgstr "" msgid "zikulausersmodule_user_confirmchemail" msgstr "" # Desc: /useraccount -# Meaning: Route Controller and method: Zikula\Module\UsersModule\Controller\UserController::indexAction +# Meaning: Route Controller and method: Zikula\UsersModule\Controller\UserController::indexAction msgid "zikulausersmodule_user_index" msgstr "" # Desc: /login -# Meaning: Route Controller and method: Zikula\Module\UsersModule\Controller\UserController::loginAction +# Meaning: Route Controller and method: Zikula\UsersModule\Controller\UserController::loginAction msgid "zikulausersmodule_user_login" msgstr "" # Desc: /logout -# Meaning: Route Controller and method: Zikula\Module\UsersModule\Controller\UserController::logoutAction +# Meaning: Route Controller and method: Zikula\UsersModule\Controller\UserController::logoutAction msgid "zikulausersmodule_user_logout" msgstr "" # Desc: /lost-password @@ -1152,7 +1152,7 @@ msgstr "" msgid "zikulausersmodule_user_lostuname" msgstr "" # Desc: /register -# Meaning: Route Controller and method: Zikula\Module\UsersModule\Controller\UserController::registerAction +# Meaning: Route Controller and method: Zikula\UsersModule\Controller\UserController::registerAction msgid "zikulausersmodule_user_register" msgstr "" # Desc: /email/update diff --git a/src/app/ZikulaKernel.php b/src/app/ZikulaKernel.php index 2e86a99b31..6d6f2c32af 100644 --- a/src/app/ZikulaKernel.php +++ b/src/app/ZikulaKernel.php @@ -75,7 +75,7 @@ private function registerCoreModules(array &$bundles) $bundles[] = new Zikula\SecurityCenterModule\ZikulaSecurityCenterModule(); $bundles[] = new Zikula\SettingsModule\ZikulaSettingsModule(); $bundles[] = new Zikula\ThemeModule\ZikulaThemeModule(); - $bundles[] = new Zikula\Module\UsersModule\ZikulaUsersModule(); + $bundles[] = new Zikula\UsersModule\ZikulaUsersModule(); $bundles[] = new Zikula\RoutesModule\ZikulaRoutesModule(); // $bundles[] = new Zikula\Theme\Andreas08Theme\ZikulaAndreas08Theme(); // $bundles[] = new Zikula\Theme\AtomTheme\ZikulaAtomTheme(); diff --git a/src/docs/en/dev/UPGRADE-1.4.0.md b/src/docs/en/dev/UPGRADE-1.4.0.md index 0365dacbf4..5c8d6520b5 100644 --- a/src/docs/en/dev/UPGRADE-1.4.0.md +++ b/src/docs/en/dev/UPGRADE-1.4.0.md @@ -794,7 +794,7 @@ The Api/methodology for the search module has changed. The previous method of us fully functional) in favor of a dedicated class that is identified in the Version file's `capabilities` area, like so: ```php -$meta['capabilities'][AbstractSearchable::SEARCHABLE] = array('class' => 'Zikula\Module\UsersModule\Helper\SearchHelper'); +$meta['capabilities'][AbstractSearchable::SEARCHABLE] = array('class' => 'Zikula\UsersModule\Helper\SearchHelper'); ``` The `class` key must point to a helper class that extends `Zikula\SearchModule\AbstractSearchable` and defines diff --git a/src/lib/Zikula/Bundle/CoreInstallerBundle/Controller/AjaxInstallController.php b/src/lib/Zikula/Bundle/CoreInstallerBundle/Controller/AjaxInstallController.php index d9b5aec6d1..a5de4a633e 100644 --- a/src/lib/Zikula/Bundle/CoreInstallerBundle/Controller/AjaxInstallController.php +++ b/src/lib/Zikula/Bundle/CoreInstallerBundle/Controller/AjaxInstallController.php @@ -24,7 +24,7 @@ use Zikula\Bundle\CoreBundle\Bundle\Helper\BootstrapHelper as CoreBundleBootstrapHelper; use Zikula\ExtensionsModule\Api\AdminApi as ExtensionsAdminApi; use Zikula\ExtensionsModule\ZikulaExtensionsModule; -use Zikula\Module\UsersModule\Constant as UsersConstant; +use Zikula\UsersModule\Constant as UsersConstant; use Zikula\Bundle\CoreBundle\YamlDumper; use Zikula\Core\Event\ModuleStateEvent; use Zikula\Core\CoreEvents; @@ -242,7 +242,7 @@ private function updateAdmin() $nowUTC = new \DateTime(null, new \DateTimeZone('UTC')); $nowUTCStr = $nowUTC->format(UsersConstant::DATETIME_FORMAT); - /** @var \Zikula\Module\UsersModule\Entity\UserEntity $entity */ + /** @var \Zikula\UsersModule\Entity\UserEntity $entity */ $entity = $em->find('ZikulaUsersModule:UserEntity', 2); $entity->setUname($username); $entity->setEmail($params['email']); diff --git a/src/lib/Zikula/Bundle/CoreInstallerBundle/Form/Type/CreateAdminType.php b/src/lib/Zikula/Bundle/CoreInstallerBundle/Form/Type/CreateAdminType.php index c0c918fdd6..e24ee0cf33 100644 --- a/src/lib/Zikula/Bundle/CoreInstallerBundle/Form/Type/CreateAdminType.php +++ b/src/lib/Zikula/Bundle/CoreInstallerBundle/Form/Type/CreateAdminType.php @@ -21,7 +21,7 @@ use Symfony\Component\Validator\Constraints\Email; use Symfony\Component\Validator\Constraints\Regex; use Symfony\Component\OptionsResolver\OptionsResolver; -use Zikula\Module\UsersModule\Constant as UsersConstant; +use Zikula\UsersModule\Constant as UsersConstant; class CreateAdminType extends AbstractType { diff --git a/src/lib/Zikula/Bundle/CoreInstallerBundle/Stage/Upgrade/InitStage.php b/src/lib/Zikula/Bundle/CoreInstallerBundle/Stage/Upgrade/InitStage.php index 0ea0cd42ec..cd80fd21be 100644 --- a/src/lib/Zikula/Bundle/CoreInstallerBundle/Stage/Upgrade/InitStage.php +++ b/src/lib/Zikula/Bundle/CoreInstallerBundle/Stage/Upgrade/InitStage.php @@ -138,9 +138,9 @@ private function upgradeUsersModule() $oldModuleInfo = \ModUtil::getInfoFromName('ZikulaUsersModule'); /** @var \Zikula\Core\AbstractBundle $module */ $module = $this->container->get('kernel')->getModule('ZikulaUsersModule'); - $installerInstance = new \Zikula\Module\UsersModule\UsersModuleInstaller($this->container, $module); + $installerInstance = new \Zikula\UsersModule\UsersModuleInstaller($this->container, $module); $installerInstance->upgrade($oldModuleInfo['version']); - $versionInstance = new \Zikula\Module\UsersModule\UsersModuleVersion($module); + $versionInstance = new \Zikula\UsersModule\UsersModuleVersion($module); $metaData = $versionInstance->getMetaData(); $item = $this->container->get('doctrine.entitymanager')->getRepository(\Zikula\ExtensionsModule\Api\AdminApi::EXTENSION_ENTITY)->find($oldModuleInfo['id']); $item['version'] = $metaData['version']; diff --git a/src/lib/legacy/Zikula/Controller/AbstractAuthentication.php b/src/lib/legacy/Zikula/Controller/AbstractAuthentication.php index a793f74d7f..52e9b73558 100644 --- a/src/lib/legacy/Zikula/Controller/AbstractAuthentication.php +++ b/src/lib/legacy/Zikula/Controller/AbstractAuthentication.php @@ -135,7 +135,7 @@ public function getAuthenticationMethodSelector(array $args) // End parameter extraction and error checking if ($this->authenticationMethodIsEnabled($args['method'])) { - /** @var \Zikula\Module\UsersModule\Helper\AuthenticationMethodHelper $authenticationMethod */ + /** @var \Zikula\UsersModule\Helper\AuthenticationMethodHelper $authenticationMethod */ $authenticationMethod = $this->getAuthenticationMethod($args['method']); $icon = $authenticationMethod->getIcon(); $isFontAwesomeIcon = $authenticationMethod->isFontAwesomeIcon(); diff --git a/src/lib/legacy/dbobject/ObjectUtil.php b/src/lib/legacy/dbobject/ObjectUtil.php index 0345fc8c94..7d2f4ce6b7 100644 --- a/src/lib/legacy/dbobject/ObjectUtil.php +++ b/src/lib/legacy/dbobject/ObjectUtil.php @@ -1332,8 +1332,8 @@ private static function makeBC(&$obj) $prop['attributes'] = isset($prop['attributes']) && ($prop['attributes'] instanceof \Doctrine\ORM\PersistentCollection) ? $prop['attributes']->toArray() : array(); $prop['cr_date'] = isset($prop['cr_date']) && ($prop['cr_date'] instanceof \DateTime) ? $prop['cr_date']->format("Y-m-d H:i:s") : $prop['cr_date']; $prop['lu_date'] = isset($prop['lu_date']) && ($prop['lu_date'] instanceof \DateTime) ? $prop['lu_date']->format("Y-m-d H:i:s") : $prop['lu_date']; - $prop['cr_uid'] = isset($prop['cr_uid']) && ($prop['cr_uid'] instanceof \Zikula\Module\UsersModule\Entity\UserEntity) ? $prop['cr_uid']->getUid() : $prop['cr_uid']; - $prop['lu_uid'] = isset($prop['lu_uid']) && ($prop['lu_uid'] instanceof \Zikula\Module\UsersModule\Entity\UserEntity) ? $prop['lu_uid']->getUid() : $prop['lu_uid']; + $prop['cr_uid'] = isset($prop['cr_uid']) && ($prop['cr_uid'] instanceof \Zikula\UsersModule\Entity\UserEntity) ? $prop['cr_uid']->getUid() : $prop['cr_uid']; + $prop['lu_uid'] = isset($prop['lu_uid']) && ($prop['lu_uid'] instanceof \Zikula\UsersModule\Entity\UserEntity) ? $prop['lu_uid']->getUid() : $prop['lu_uid']; } } diff --git a/src/lib/legacy/viewplugins/function.useravatar.php b/src/lib/legacy/viewplugins/function.useravatar.php index 8d5eebd9fc..fd06075ed2 100644 --- a/src/lib/legacy/viewplugins/function.useravatar.php +++ b/src/lib/legacy/viewplugins/function.useravatar.php @@ -13,7 +13,7 @@ * information regarding copyright and licensing. */ -use Zikula\Module\UsersModule\Constant as UsersConstant; +use Zikula\UsersModule\Constant as UsersConstant; /** * Zikula_View function to display the avatar of a user diff --git a/src/lib/legacy/viewplugins/function.userlogin.php b/src/lib/legacy/viewplugins/function.userlogin.php index 485d621c5c..bb7ea50f96 100644 --- a/src/lib/legacy/viewplugins/function.userlogin.php +++ b/src/lib/legacy/viewplugins/function.userlogin.php @@ -13,7 +13,7 @@ * information regarding copyright and licensing. */ -use Zikula\Module\UsersModule\Constant as UsersConstant; +use Zikula\UsersModule\Constant as UsersConstant; /** * Zikula_View function to display the login box diff --git a/src/lib/util/UserUtil.php b/src/lib/util/UserUtil.php index a105e47714..c1e4ead277 100644 --- a/src/lib/util/UserUtil.php +++ b/src/lib/util/UserUtil.php @@ -18,7 +18,7 @@ use Symfony\Component\Security\Core\Exception\AccessDeniedException; use Zikula\Core\Event\GenericEvent; use Zikula\Core\Exception\ExtensionNotAvailableException; -use Zikula\Module\UsersModule\Constant as UsersConstant; +use Zikula\UsersModule\Constant as UsersConstant; /** * UserUtil @@ -1996,7 +1996,7 @@ private static function _getThemeFilterEvent($themeName, $type) */ public static function getAll($sortbyfield = 'uname', $sortorder = 'ASC', $limit = null, $offset = null, $activated = '', $field = '', $expression = '', $where = '') { - $user = new \Zikula\Module\UsersModule\Entity\UserEntity; + $user = new \Zikula\UsersModule\Entity\UserEntity; if (empty($where)) { $whereFragments = array(); @@ -2029,7 +2029,7 @@ public static function getAll($sortbyfield = 'uname', $sortorder = 'ASC', $limit } $em = \ServiceUtil::get('doctrine.entitymanager'); - $dql = "SELECT u FROM Zikula\Module\UsersModule\Entity\UserEntity u $where $orderby"; + $dql = "SELECT u FROM Zikula\UsersModule\Entity\UserEntity u $where $orderby"; $query = $em->createQuery($dql); if (isset($limit) && is_numeric($limit) && $limit > 0) { @@ -2095,7 +2095,7 @@ public static function fieldAlias($label) // no change in uid or uname allowed, empty label is not an alias if (($label != 'uid') && ($label != 'uname') && !empty($label)) { - $userObj = new \Zikula\Module\UsersModule\Entity\UserEntity; + $userObj = new \Zikula\UsersModule\Entity\UserEntity; $isFieldAlias = property_exists($userObj, $label); } diff --git a/src/system/CategoriesModule/Entity/CategoryEntity.php b/src/system/CategoriesModule/Entity/CategoryEntity.php index 8c46f7b282..5fb2501e3e 100644 --- a/src/system/CategoriesModule/Entity/CategoryEntity.php +++ b/src/system/CategoriesModule/Entity/CategoryEntity.php @@ -152,7 +152,7 @@ class CategoryEntity extends EntityAccess * The user id of the creator of the category * * @Gedmo\Blameable(on="create") - * @ORM\ManyToOne(targetEntity="Zikula\Module\UsersModule\Entity\UserEntity") + * @ORM\ManyToOne(targetEntity="Zikula\UsersModule\Entity\UserEntity") * @ORM\JoinColumn(name="cr_uid", referencedColumnName="uid") */ private $cr_uid; @@ -161,7 +161,7 @@ class CategoryEntity extends EntityAccess * The user id of the last updater of the category * * @Gedmo\Blameable(on="update") - * @ORM\ManyToOne(targetEntity="Zikula\Module\UsersModule\Entity\UserEntity") + * @ORM\ManyToOne(targetEntity="Zikula\UsersModule\Entity\UserEntity") * @ORM\JoinColumn(name="lu_uid", referencedColumnName="uid") */ private $lu_uid; diff --git a/src/system/CategoriesModule/Entity/CategoryRegistryEntity.php b/src/system/CategoriesModule/Entity/CategoryRegistryEntity.php index 921d765896..d14c5eacab 100644 --- a/src/system/CategoriesModule/Entity/CategoryRegistryEntity.php +++ b/src/system/CategoriesModule/Entity/CategoryRegistryEntity.php @@ -71,7 +71,7 @@ class CategoryRegistryEntity extends EntityAccess * The user id of the creator of this entity * * @Gedmo\Blameable(on="create") - * @ORM\ManyToOne(targetEntity="Zikula\Module\UsersModule\Entity\UserEntity") + * @ORM\ManyToOne(targetEntity="Zikula\UsersModule\Entity\UserEntity") * @ORM\JoinColumn(name="cr_uid", referencedColumnName="uid") */ protected $cr_uid; @@ -80,7 +80,7 @@ class CategoryRegistryEntity extends EntityAccess * The user id of the last update of this entity * * @Gedmo\Blameable(on="update") - * @ORM\ManyToOne(targetEntity="Zikula\Module\UsersModule\Entity\UserEntity") + * @ORM\ManyToOne(targetEntity="Zikula\UsersModule\Entity\UserEntity") * @ORM\JoinColumn(name="lu_uid", referencedColumnName="uid") */ protected $lu_uid; diff --git a/src/system/SecurityCenterModule/Entity/IntrusionEntity.php b/src/system/SecurityCenterModule/Entity/IntrusionEntity.php index 082817a7d6..29e6cba0d5 100644 --- a/src/system/SecurityCenterModule/Entity/IntrusionEntity.php +++ b/src/system/SecurityCenterModule/Entity/IntrusionEntity.php @@ -74,7 +74,7 @@ class IntrusionEntity extends EntityAccess /** * user id assoicated with the intrusion * - * @ORM\ManyToOne(targetEntity="Zikula\Module\UsersModule\Entity\UserEntity") + * @ORM\ManyToOne(targetEntity="Zikula\UsersModule\Entity\UserEntity") * @ORM\JoinColumn(name="uid", referencedColumnName="uid") */ private $user; @@ -217,7 +217,7 @@ public function getPage() /** * Set user * - * @param \Zikula\Module\UsersModule\Entity\UserEntity $user + * @param \Zikula\UsersModule\Entity\UserEntity $user * @return IntrusionEntity */ public function setUser($user) @@ -229,7 +229,7 @@ public function setUser($user) /** * Get user * - * @return \Zikula\Module\UsersModule\Entity\UserEntity + * @return \Zikula\UsersModule\Entity\UserEntity */ public function getUser() { diff --git a/src/system/Zikula/Module/UsersModule/.gitignore b/src/system/UsersModule/.gitignore similarity index 100% rename from src/system/Zikula/Module/UsersModule/.gitignore rename to src/system/UsersModule/.gitignore diff --git a/src/system/Zikula/Module/UsersModule/.travis.yml b/src/system/UsersModule/.travis.yml similarity index 100% rename from src/system/Zikula/Module/UsersModule/.travis.yml rename to src/system/UsersModule/.travis.yml diff --git a/src/system/Zikula/Module/UsersModule/Api/AccountApi.php b/src/system/UsersModule/Api/AccountApi.php similarity index 97% rename from src/system/Zikula/Module/UsersModule/Api/AccountApi.php rename to src/system/UsersModule/Api/AccountApi.php index bcaf9ff00d..3195ab4f5e 100644 --- a/src/system/Zikula/Module/UsersModule/Api/AccountApi.php +++ b/src/system/UsersModule/Api/AccountApi.php @@ -11,11 +11,11 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\UsersModule\Api; +namespace Zikula\UsersModule\Api; use UserUtil; use ModUtil; -use Zikula\Module\UsersModule\Constant as UsersConstant; +use Zikula\UsersModule\Constant as UsersConstant; use ZLanguage; use System; diff --git a/src/system/Zikula/Module/UsersModule/Api/AdminApi.php b/src/system/UsersModule/Api/AdminApi.php similarity index 99% rename from src/system/Zikula/Module/UsersModule/Api/AdminApi.php rename to src/system/UsersModule/Api/AdminApi.php index a1017b01f7..54f7fdd86a 100644 --- a/src/system/Zikula/Module/UsersModule/Api/AdminApi.php +++ b/src/system/UsersModule/Api/AdminApi.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\UsersModule\Api; +namespace Zikula\UsersModule\Api; use Zikula\Core\Event\GenericEvent; use SecurityUtil; @@ -20,7 +20,7 @@ use DataUtil; use DateUtil; use UserUtil; -use Zikula\Module\UsersModule\Constant as UsersConstant; +use Zikula\UsersModule\Constant as UsersConstant; use Zikula; use Zikula_View; use Symfony\Component\Security\Core\Exception\AccessDeniedException; @@ -459,7 +459,7 @@ public function checkMultipleExistence($args) $valuesArray = $args['valuesarray']; $key = $args['key']; - $dql = "SELECT u FROM Zikula\Module\UsersModule\Entity\UserEntity u WHERE u.$key IN ('" . implode("', '", $valuesArray) . "')"; + $dql = "SELECT u FROM Zikula\UsersModule\Entity\UserEntity u WHERE u.$key IN ('" . implode("', '", $valuesArray) . "')"; $query = $this->entityManager->createQuery($dql); $users = $query->getResult(\Doctrine\ORM\AbstractQuery::HYDRATE_ARRAY); @@ -517,7 +517,7 @@ public function createImport($args) // create users foreach ($importValuesDB as $importValueDB) { - $user = new \Zikula\Module\UsersModule\Entity\UserEntity; + $user = new \Zikula\UsersModule\Entity\UserEntity; $user->merge($importValueDB); $this->entityManager->persist($user); } diff --git a/src/system/Zikula/Module/UsersModule/Api/AuthenticationApi.php b/src/system/UsersModule/Api/AuthenticationApi.php similarity index 99% rename from src/system/Zikula/Module/UsersModule/Api/AuthenticationApi.php rename to src/system/UsersModule/Api/AuthenticationApi.php index a88b77826d..07032e693b 100644 --- a/src/system/Zikula/Module/UsersModule/Api/AuthenticationApi.php +++ b/src/system/UsersModule/Api/AuthenticationApi.php @@ -11,11 +11,11 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\UsersModule\Api; +namespace Zikula\UsersModule\Api; use Symfony\Component\Security\Core\Exception\AccessDeniedException; -use Zikula\Module\UsersModule\Constant as UsersConstant; -use Zikula\Module\UsersModule\Helper\AuthenticationMethodHelper; +use Zikula\UsersModule\Constant as UsersConstant; +use Zikula\UsersModule\Helper\AuthenticationMethodHelper; use ModUtil; use UserUtil; use LogUtil; diff --git a/src/system/Zikula/Module/UsersModule/Api/RegistrationApi.php b/src/system/UsersModule/Api/RegistrationApi.php similarity index 99% rename from src/system/Zikula/Module/UsersModule/Api/RegistrationApi.php rename to src/system/UsersModule/Api/RegistrationApi.php index 3fc027350d..6cb3366ed7 100644 --- a/src/system/Zikula/Module/UsersModule/Api/RegistrationApi.php +++ b/src/system/UsersModule/Api/RegistrationApi.php @@ -11,12 +11,12 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\UsersModule\Api; +namespace Zikula\UsersModule\Api; use Zikula\Core\Event\GenericEvent; use UserUtil; use SecurityUtil; -use Zikula\Module\UsersModule\Constant as UsersConstant; +use Zikula\UsersModule\Constant as UsersConstant; use System; use ModUtil; use ThemeUtil; @@ -469,7 +469,7 @@ protected function cleanFieldsToAttributes(&$obj) return $obj; } - $user = new \Zikula\Module\UsersModule\Entity\UserEntity; + $user = new \Zikula\UsersModule\Entity\UserEntity; if (!isset($obj['__ATTRIBUTES__'])) { $obj['__ATTRIBUTES__'] = array(); @@ -594,7 +594,7 @@ protected function createRegistration(array $reginfo, $userNotification = true, // account record. This is so that modules that do default actions on the creation // of a user account do not perform those actions on a pending registration, which // may be deleted at any point. - $user = new \Zikula\Module\UsersModule\Entity\UserEntity; + $user = new \Zikula\UsersModule\Entity\UserEntity; $user->merge($userObj); $this->entityManager->persist($user); $this->entityManager->flush(); @@ -823,7 +823,7 @@ protected function createUser(array $reginfo, $userNotification = true, $adminNo $attributes = $userObj['__ATTRIBUTES__']; unset($userObj['__ATTRIBUTES__']); - $user = new \Zikula\Module\UsersModule\Entity\UserEntity; + $user = new \Zikula\UsersModule\Entity\UserEntity; $user->merge($userObj); $this->entityManager->persist($user); $this->entityManager->flush(); @@ -1166,7 +1166,7 @@ public function getAll($args) $this->purgeExpired(); - $dql = "SELECT u FROM Zikula\Module\UsersModule\Entity\UserEntity u $where $orderBy"; + $dql = "SELECT u FROM Zikula\UsersModule\Entity\UserEntity u $where $orderBy"; $query = $this->entityManager->createQuery($dql); if (isset($limitNumRows) && is_numeric($limitNumRows) && $limitNumRows > 0) { @@ -1240,7 +1240,7 @@ public function countAll($args) if (isset($isVerifiedFilter)) { // TODO - Can probably do this with a constructed SQL count select and join, but we'll do it this way for now. - $dql = "SELECT u FROM Zikula\Module\UsersModule\Entity\UserEntity u $where"; + $dql = "SELECT u FROM Zikula\UsersModule\Entity\UserEntity u $where"; $query = $this->entityManager->createQuery($dql); $users = $query->getResult(); @@ -1265,7 +1265,7 @@ public function countAll($args) return $count; } else { - $dql = "SELECT COUNT(u.uid) FROM Zikula\Module\UsersModule\Entity\UserEntity u $where"; + $dql = "SELECT COUNT(u.uid) FROM Zikula\UsersModule\Entity\UserEntity u $where"; $query = $this->entityManager->createQuery($dql); $count = $query->getSingleScalarResult(); return $count; @@ -1346,7 +1346,7 @@ protected function purgeExpired() $dql = " SELECT v - FROM Zikula\Module\UsersModule\Entity\UserVerificationEntity v + FROM Zikula\UsersModule\Entity\UserVerificationEntity v WHERE v.changetype = " . UsersConstant::VERIFYCHGTYPE_REGEMAIL . " AND v.created_dt IS NOT NULL AND v.created_dt <> '0000-00-00 00:00:00' @@ -1463,7 +1463,7 @@ public function sendVerificationCode($args) 'changetype' => UsersConstant::VERIFYCHGTYPE_REGEMAIL, )); - $verifyChgObj = new \Zikula\Module\UsersModule\Entity\UserVerificationEntity; + $verifyChgObj = new \Zikula\UsersModule\Entity\UserVerificationEntity; $verifyChgObj['changetype'] = UsersConstant::VERIFYCHGTYPE_REGEMAIL; $verifyChgObj['uid'] = $reginfo['uid']; $verifyChgObj['newemail'] = $reginfo['email']; diff --git a/src/system/Zikula/Module/UsersModule/Api/UserApi.php b/src/system/UsersModule/Api/UserApi.php similarity index 99% rename from src/system/Zikula/Module/UsersModule/Api/UserApi.php rename to src/system/UsersModule/Api/UserApi.php index c9b23c57bd..d90b19da45 100644 --- a/src/system/Zikula/Module/UsersModule/Api/UserApi.php +++ b/src/system/UsersModule/Api/UserApi.php @@ -11,11 +11,11 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\UsersModule\Api; +namespace Zikula\UsersModule\Api; use SecurityUtil; use DataUtil; -use Zikula\Module\UsersModule\Constant as UsersConstant; +use Zikula\UsersModule\Constant as UsersConstant; use UserUtil; use Zikula_View; use System; @@ -392,7 +392,7 @@ public function mailConfirmationCode($args) $nowUTC = new \DateTime(null, new \DateTimeZone('UTC')); - $codeSaved = new \Zikula\Module\UsersModule\Entity\UserVerificationEntity; + $codeSaved = new \Zikula\UsersModule\Entity\UserVerificationEntity; $codeSaved['changetype'] = UsersConstant::VERIFYCHGTYPE_PWD; $codeSaved['uid'] = $user['uid']; $codeSaved['newemail'] = ''; @@ -599,7 +599,7 @@ public function savePreEmail($args) ->getQuery(); $query->getResult(); - $obj = new \Zikula\Module\UsersModule\Entity\UserVerificationEntity; + $obj = new \Zikula\UsersModule\Entity\UserVerificationEntity; $obj['changetype'] = UsersConstant::VERIFYCHGTYPE_EMAIL; $obj['uid'] = $uid; $obj['newemail'] = $args['newemail']; diff --git a/src/system/Zikula/Module/UsersModule/Block/AccountlinksBlock.php b/src/system/UsersModule/Block/AccountlinksBlock.php similarity index 98% rename from src/system/Zikula/Module/UsersModule/Block/AccountlinksBlock.php rename to src/system/UsersModule/Block/AccountlinksBlock.php index b3f42fc035..407435d6ea 100644 --- a/src/system/Zikula/Module/UsersModule/Block/AccountlinksBlock.php +++ b/src/system/UsersModule/Block/AccountlinksBlock.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\UsersModule\Block; +namespace Zikula\UsersModule\Block; use SecurityUtil; use BlockUtil; diff --git a/src/system/Zikula/Module/UsersModule/Block/LoginBlock.php b/src/system/UsersModule/Block/LoginBlock.php similarity index 97% rename from src/system/Zikula/Module/UsersModule/Block/LoginBlock.php rename to src/system/UsersModule/Block/LoginBlock.php index 9bef1f7e29..3eda97afd2 100644 --- a/src/system/Zikula/Module/UsersModule/Block/LoginBlock.php +++ b/src/system/UsersModule/Block/LoginBlock.php @@ -11,12 +11,12 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\UsersModule\Block; +namespace Zikula\UsersModule\Block; use Zikula_View; use SecurityUtil; use DataUtil; -use Zikula\Module\UsersModule\Helper\AuthenticationMethodListHelper; +use Zikula\UsersModule\Helper\AuthenticationMethodListHelper; use System; use BlockUtil; use UserUtil; diff --git a/src/system/Zikula/Module/UsersModule/Block/OnlineBlock.php b/src/system/UsersModule/Block/OnlineBlock.php similarity index 99% rename from src/system/Zikula/Module/UsersModule/Block/OnlineBlock.php rename to src/system/UsersModule/Block/OnlineBlock.php index 05c0586ebe..bd7e53a196 100644 --- a/src/system/Zikula/Module/UsersModule/Block/OnlineBlock.php +++ b/src/system/UsersModule/Block/OnlineBlock.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\UsersModule\Block; +namespace Zikula\UsersModule\Block; use SecurityUtil; use UserUtil; diff --git a/src/system/Zikula/Module/UsersModule/Block/UserBlock.php b/src/system/UsersModule/Block/UserBlock.php similarity index 98% rename from src/system/Zikula/Module/UsersModule/Block/UserBlock.php rename to src/system/UsersModule/Block/UserBlock.php index d381b5a0e9..b7a1a1e92b 100644 --- a/src/system/Zikula/Module/UsersModule/Block/UserBlock.php +++ b/src/system/UsersModule/Block/UserBlock.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\UsersModule\Block; +namespace Zikula\UsersModule\Block; use SecurityUtil; use UserUtil; diff --git a/src/system/Zikula/Module/UsersModule/Constant.php b/src/system/UsersModule/Constant.php similarity index 99% rename from src/system/Zikula/Module/UsersModule/Constant.php rename to src/system/UsersModule/Constant.php index b0a118064d..61c8691f05 100644 --- a/src/system/Zikula/Module/UsersModule/Constant.php +++ b/src/system/UsersModule/Constant.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\UsersModule +namespace Zikula\UsersModule { /** * Users module-wide constants. diff --git a/src/system/Zikula/Module/UsersModule/Controller/AdminController.php b/src/system/UsersModule/Controller/AdminController.php similarity index 99% rename from src/system/Zikula/Module/UsersModule/Controller/AdminController.php rename to src/system/UsersModule/Controller/AdminController.php index 1ec27ba96e..293e74e65f 100644 --- a/src/system/Zikula/Module/UsersModule/Controller/AdminController.php +++ b/src/system/UsersModule/Controller/AdminController.php @@ -11,13 +11,13 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\UsersModule\Controller; +namespace Zikula\UsersModule\Controller; use Zikula_View; use UserUtil; use SecurityUtil; use ModUtil; -use Zikula\Module\UsersModule\Constant as UsersConstant; +use Zikula\UsersModule\Constant as UsersConstant; use DataUtil; use DateUtil; use System; @@ -186,7 +186,7 @@ public function viewAction(Request $request) * * Parameters passed via POST: * --------------------------- - * See the definition of {@link \Zikula\Module\UsersModule\Controller\FormData\NewUserForm}. + * See the definition of {@link \Zikula\UsersModule\Controller\FormData\NewUserForm}. * * @return Response symfony response object containing the rendered template. * @@ -519,7 +519,7 @@ public function mailUsersAction(Request $request) * --------------------------- * array access_permissions An array used to modify a user's group membership. * - * See also the definition of {@link \Zikula\Module\UsersModule\Controller\FormData\ModifyUserForm}. + * See also the definition of {@link \Zikula\UsersModule\Controller\FormData\ModifyUserForm}. * * @return Response symfony response object containing the rendered template. * @@ -1275,7 +1275,7 @@ public function displayRegistrationAction(Request $request, $uid) * string restorview To restore the main view to use the filtering options present prior to executing this function, then 'view', * otherwise not present. * - * See also the definition of {@link \Zikula\Module\UsersModule\Controller\FormData\ModifyRegistrationForm}. + * See also the definition of {@link \Zikula\UsersModule\Controller\FormData\ModifyRegistrationForm}. * * @return Response symfony response object * @@ -1799,7 +1799,7 @@ public function denyRegistrationAction(Request $request) * * Parameters passed via POST: * --------------------------- - * See the definition of {@link \Zikula\Module\UsersModule\Controller\FormData\ConfigForm}. + * See the definition of {@link \Zikula\UsersModule\Controller\FormData\ConfigForm}. * * @return Response symfony response object * diff --git a/src/system/Zikula/Module/UsersModule/Controller/AjaxController.php b/src/system/UsersModule/Controller/AjaxController.php similarity index 99% rename from src/system/Zikula/Module/UsersModule/Controller/AjaxController.php rename to src/system/UsersModule/Controller/AjaxController.php index ec917b39b8..50df0f49e0 100644 --- a/src/system/Zikula/Module/UsersModule/Controller/AjaxController.php +++ b/src/system/UsersModule/Controller/AjaxController.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\UsersModule\Controller; +namespace Zikula\UsersModule\Controller; use Zikula\Core\Event\GenericEvent; use Zikula\Core\Response\PlainResponse; diff --git a/src/system/Zikula/Module/UsersModule/Controller/AuthenticationController.php b/src/system/UsersModule/Controller/AuthenticationController.php similarity index 99% rename from src/system/Zikula/Module/UsersModule/Controller/AuthenticationController.php rename to src/system/UsersModule/Controller/AuthenticationController.php index 84148af84a..b607af8a10 100644 --- a/src/system/Zikula/Module/UsersModule/Controller/AuthenticationController.php +++ b/src/system/UsersModule/Controller/AuthenticationController.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\UsersModule\Controller; +namespace Zikula\UsersModule\Controller; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; use Zikula_View; diff --git a/src/system/Zikula/Module/UsersModule/Controller/FormData/AbstractFormData.php b/src/system/UsersModule/Controller/FormData/AbstractFormData.php similarity index 99% rename from src/system/Zikula/Module/UsersModule/Controller/FormData/AbstractFormData.php rename to src/system/UsersModule/Controller/FormData/AbstractFormData.php index beceb3bb28..9eccefd57d 100644 --- a/src/system/Zikula/Module/UsersModule/Controller/FormData/AbstractFormData.php +++ b/src/system/UsersModule/Controller/FormData/AbstractFormData.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\UsersModule\Controller\FormData; +namespace Zikula\UsersModule\Controller\FormData; use ServiceUtil; use ModUtil; diff --git a/src/system/Zikula/Module/UsersModule/Controller/FormData/ConfigForm.php b/src/system/UsersModule/Controller/FormData/ConfigForm.php similarity index 97% rename from src/system/Zikula/Module/UsersModule/Controller/FormData/ConfigForm.php rename to src/system/UsersModule/Controller/FormData/ConfigForm.php index e31581ed89..a93f361b92 100644 --- a/src/system/Zikula/Module/UsersModule/Controller/FormData/ConfigForm.php +++ b/src/system/UsersModule/Controller/FormData/ConfigForm.php @@ -11,17 +11,17 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\UsersModule\Controller\FormData; - -use Zikula\Module\UsersModule\Constant as UsersConstant; -use Zikula\Module\UsersModule\Controller\FormData\Validator\BooleanType; -use Zikula\Module\UsersModule\Controller\FormData\Validator\IntegerNumericType; -use Zikula\Module\UsersModule\Controller\FormData\Validator\IntegerNumericMinimumValue; -use Zikula\Module\UsersModule\Controller\FormData\Validator\StringType; -use Zikula\Module\UsersModule\Helper\HashMethodListHelper; -use Zikula\Module\UsersModule\Controller\FormData\Validator\StringInSet; -use Zikula\Module\UsersModule\Controller\FormData\Validator\IntegerNumericInSet; -use Zikula\Module\UsersModule\Controller\FormData\Validator\StringRegularExpression; +namespace Zikula\UsersModule\Controller\FormData; + +use Zikula\UsersModule\Constant as UsersConstant; +use Zikula\UsersModule\Controller\FormData\Validator\BooleanType; +use Zikula\UsersModule\Controller\FormData\Validator\IntegerNumericType; +use Zikula\UsersModule\Controller\FormData\Validator\IntegerNumericMinimumValue; +use Zikula\UsersModule\Controller\FormData\Validator\StringType; +use Zikula\UsersModule\Helper\HashMethodListHelper; +use Zikula\UsersModule\Controller\FormData\Validator\StringInSet; +use Zikula\UsersModule\Controller\FormData\Validator\IntegerNumericInSet; +use Zikula\UsersModule\Controller\FormData\Validator\StringRegularExpression; use Symfony\Component\DependencyInjection\ContainerInterface; /** diff --git a/src/system/Zikula/Module/UsersModule/Controller/FormData/Field.php b/src/system/UsersModule/Controller/FormData/Field.php similarity index 99% rename from src/system/Zikula/Module/UsersModule/Controller/FormData/Field.php rename to src/system/UsersModule/Controller/FormData/Field.php index 1ccc8df60d..8b59157b93 100644 --- a/src/system/Zikula/Module/UsersModule/Controller/FormData/Field.php +++ b/src/system/UsersModule/Controller/FormData/Field.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\UsersModule\Controller\FormData; +namespace Zikula\UsersModule\Controller\FormData; use ServiceUtil; diff --git a/src/system/Zikula/Module/UsersModule/Controller/FormData/ModifyRegistrationForm.php b/src/system/UsersModule/Controller/FormData/ModifyRegistrationForm.php similarity index 97% rename from src/system/Zikula/Module/UsersModule/Controller/FormData/ModifyRegistrationForm.php rename to src/system/UsersModule/Controller/FormData/ModifyRegistrationForm.php index 038c900c80..f9023f4c92 100644 --- a/src/system/Zikula/Module/UsersModule/Controller/FormData/ModifyRegistrationForm.php +++ b/src/system/UsersModule/Controller/FormData/ModifyRegistrationForm.php @@ -11,10 +11,10 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\UsersModule\Controller\FormData; +namespace Zikula\UsersModule\Controller\FormData; -use Zikula\Module\UsersModule\Constant as UsersConstant; -use Zikula\Module\UsersModule\Controller\FormData\AbstractFormData; +use Zikula\UsersModule\Constant as UsersConstant; +use Zikula\UsersModule\Controller\FormData\AbstractFormData; /** * Contains and validates the data found on the Users module's modify registration form. diff --git a/src/system/Zikula/Module/UsersModule/Controller/FormData/ModifyUserForm.php b/src/system/UsersModule/Controller/FormData/ModifyUserForm.php similarity index 98% rename from src/system/Zikula/Module/UsersModule/Controller/FormData/ModifyUserForm.php rename to src/system/UsersModule/Controller/FormData/ModifyUserForm.php index e44c2c94f7..40c993c3ad 100644 --- a/src/system/Zikula/Module/UsersModule/Controller/FormData/ModifyUserForm.php +++ b/src/system/UsersModule/Controller/FormData/ModifyUserForm.php @@ -11,9 +11,9 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\UsersModule\Controller\FormData; +namespace Zikula\UsersModule\Controller\FormData; -use Zikula\Module\UsersModule\Constant as UsersConstant; +use Zikula\UsersModule\Constant as UsersConstant; /** * Contains and validates the data found on the Users module's modify user form. diff --git a/src/system/Zikula/Module/UsersModule/Controller/FormData/NewUserForm.php b/src/system/UsersModule/Controller/FormData/NewUserForm.php similarity index 97% rename from src/system/Zikula/Module/UsersModule/Controller/FormData/NewUserForm.php rename to src/system/UsersModule/Controller/FormData/NewUserForm.php index b52548206d..dc19786881 100644 --- a/src/system/Zikula/Module/UsersModule/Controller/FormData/NewUserForm.php +++ b/src/system/UsersModule/Controller/FormData/NewUserForm.php @@ -11,9 +11,9 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\UsersModule\Controller\FormData; +namespace Zikula\UsersModule\Controller\FormData; -use Zikula\Module\UsersModule\Constant as UsersConstant; +use Zikula\UsersModule\Constant as UsersConstant; /** * Contains and validates the data found on the Users module's new user form. @@ -23,7 +23,7 @@ class NewUserForm extends AbstractFormData /** * A validator to conditionally check the length of the password field. * - * @var \Zikula\Module\UsersModule\Controller\FormData\Validator\AbstractValidator + * @var \Zikula\UsersModule\Controller\FormData\Validator\AbstractValidator */ protected $passwordLengthValidator; diff --git a/src/system/Zikula/Module/UsersModule/Controller/FormData/RegistrationForm.php b/src/system/UsersModule/Controller/FormData/RegistrationForm.php similarity index 98% rename from src/system/Zikula/Module/UsersModule/Controller/FormData/RegistrationForm.php rename to src/system/UsersModule/Controller/FormData/RegistrationForm.php index 44d5e45dc4..da5c465357 100644 --- a/src/system/Zikula/Module/UsersModule/Controller/FormData/RegistrationForm.php +++ b/src/system/UsersModule/Controller/FormData/RegistrationForm.php @@ -11,9 +11,9 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\UsersModule\Controller\FormData; +namespace Zikula\UsersModule\Controller\FormData; -use Zikula\Module\UsersModule\Constant as UsersConstant; +use Zikula\UsersModule\Constant as UsersConstant; use ModUtil; /** diff --git a/src/system/Zikula/Module/UsersModule/Controller/FormData/Validator/AbstractValidator.php b/src/system/UsersModule/Controller/FormData/Validator/AbstractValidator.php similarity index 97% rename from src/system/Zikula/Module/UsersModule/Controller/FormData/Validator/AbstractValidator.php rename to src/system/UsersModule/Controller/FormData/Validator/AbstractValidator.php index e59db85daf..d0f7c91a0d 100644 --- a/src/system/Zikula/Module/UsersModule/Controller/FormData/Validator/AbstractValidator.php +++ b/src/system/UsersModule/Controller/FormData/Validator/AbstractValidator.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\UsersModule\Controller\FormData\Validator; +namespace Zikula\UsersModule\Controller\FormData\Validator; use ModUtil; diff --git a/src/system/Zikula/Module/UsersModule/Controller/FormData/Validator/BooleanType.php b/src/system/UsersModule/Controller/FormData/Validator/BooleanType.php similarity index 95% rename from src/system/Zikula/Module/UsersModule/Controller/FormData/Validator/BooleanType.php rename to src/system/UsersModule/Controller/FormData/Validator/BooleanType.php index 4253a44003..f92d7d582b 100644 --- a/src/system/Zikula/Module/UsersModule/Controller/FormData/Validator/BooleanType.php +++ b/src/system/UsersModule/Controller/FormData/Validator/BooleanType.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\UsersModule\Controller\FormData\Validator; +namespace Zikula\UsersModule\Controller\FormData\Validator; /** * Ensures that the field contains data compatible with a boolean type. diff --git a/src/system/Zikula/Module/UsersModule/Controller/FormData/Validator/FilterVar.php b/src/system/UsersModule/Controller/FormData/Validator/FilterVar.php similarity index 98% rename from src/system/Zikula/Module/UsersModule/Controller/FormData/Validator/FilterVar.php rename to src/system/UsersModule/Controller/FormData/Validator/FilterVar.php index 22835f9dd0..6709892d14 100644 --- a/src/system/Zikula/Module/UsersModule/Controller/FormData/Validator/FilterVar.php +++ b/src/system/UsersModule/Controller/FormData/Validator/FilterVar.php @@ -12,7 +12,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\UsersModule\Controller\FormData\Validator; +namespace Zikula\UsersModule\Controller\FormData\Validator; use Symfony\Component\DependencyInjection\ContainerInterface; diff --git a/src/system/Zikula/Module/UsersModule/Controller/FormData/Validator/IntegerNumericInSet.php b/src/system/UsersModule/Controller/FormData/Validator/IntegerNumericInSet.php similarity index 97% rename from src/system/Zikula/Module/UsersModule/Controller/FormData/Validator/IntegerNumericInSet.php rename to src/system/UsersModule/Controller/FormData/Validator/IntegerNumericInSet.php index 83420a0c9b..c6266882eb 100644 --- a/src/system/Zikula/Module/UsersModule/Controller/FormData/Validator/IntegerNumericInSet.php +++ b/src/system/UsersModule/Controller/FormData/Validator/IntegerNumericInSet.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\UsersModule\Controller\FormData\Validator; +namespace Zikula\UsersModule\Controller\FormData\Validator; /** * Validates a field against a set of integer values, ensuring that the field's data is one of the listed integers. diff --git a/src/system/Zikula/Module/UsersModule/Controller/FormData/Validator/IntegerNumericMaximumValue.php b/src/system/UsersModule/Controller/FormData/Validator/IntegerNumericMaximumValue.php similarity index 97% rename from src/system/Zikula/Module/UsersModule/Controller/FormData/Validator/IntegerNumericMaximumValue.php rename to src/system/UsersModule/Controller/FormData/Validator/IntegerNumericMaximumValue.php index 67df9e047d..c20f1e08b1 100644 --- a/src/system/Zikula/Module/UsersModule/Controller/FormData/Validator/IntegerNumericMaximumValue.php +++ b/src/system/UsersModule/Controller/FormData/Validator/IntegerNumericMaximumValue.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\UsersModule\Controller\FormData\Validator; +namespace Zikula\UsersModule\Controller\FormData\Validator; /** * Validates a field against a maximum value, ensuring that the field value is less than or equal to this maximum. diff --git a/src/system/Zikula/Module/UsersModule/Controller/FormData/Validator/IntegerNumericMinimumValue.php b/src/system/UsersModule/Controller/FormData/Validator/IntegerNumericMinimumValue.php similarity index 97% rename from src/system/Zikula/Module/UsersModule/Controller/FormData/Validator/IntegerNumericMinimumValue.php rename to src/system/UsersModule/Controller/FormData/Validator/IntegerNumericMinimumValue.php index 308c3c0c74..a080f51fbe 100644 --- a/src/system/Zikula/Module/UsersModule/Controller/FormData/Validator/IntegerNumericMinimumValue.php +++ b/src/system/UsersModule/Controller/FormData/Validator/IntegerNumericMinimumValue.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\UsersModule\Controller\FormData\Validator; +namespace Zikula\UsersModule\Controller\FormData\Validator; /** * Validates a field against a minimum value, ensuring that the field value is greater than or equal to this minimum. diff --git a/src/system/Zikula/Module/UsersModule/Controller/FormData/Validator/IntegerNumericType.php b/src/system/UsersModule/Controller/FormData/Validator/IntegerNumericType.php similarity index 94% rename from src/system/Zikula/Module/UsersModule/Controller/FormData/Validator/IntegerNumericType.php rename to src/system/UsersModule/Controller/FormData/Validator/IntegerNumericType.php index 7ab9b4a437..502b8cbbcb 100644 --- a/src/system/Zikula/Module/UsersModule/Controller/FormData/Validator/IntegerNumericType.php +++ b/src/system/UsersModule/Controller/FormData/Validator/IntegerNumericType.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\UsersModule\Controller\FormData\Validator; +namespace Zikula\UsersModule\Controller\FormData\Validator; /** * Validates that a field's data is compatible with an integer numeric type. diff --git a/src/system/Zikula/Module/UsersModule/Controller/FormData/Validator/StringInSet.php b/src/system/UsersModule/Controller/FormData/Validator/StringInSet.php similarity index 97% rename from src/system/Zikula/Module/UsersModule/Controller/FormData/Validator/StringInSet.php rename to src/system/UsersModule/Controller/FormData/Validator/StringInSet.php index 3245486617..7cc3a6a3cc 100644 --- a/src/system/Zikula/Module/UsersModule/Controller/FormData/Validator/StringInSet.php +++ b/src/system/UsersModule/Controller/FormData/Validator/StringInSet.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\UsersModule\Controller\FormData\Validator; +namespace Zikula\UsersModule\Controller\FormData\Validator; /** * Validates a field's data against a list of valid string values. diff --git a/src/system/Zikula/Module/UsersModule/Controller/FormData/Validator/StringLowerCase.php b/src/system/UsersModule/Controller/FormData/Validator/StringLowerCase.php similarity index 94% rename from src/system/Zikula/Module/UsersModule/Controller/FormData/Validator/StringLowerCase.php rename to src/system/UsersModule/Controller/FormData/Validator/StringLowerCase.php index f203b2d5a9..06aa83c064 100644 --- a/src/system/Zikula/Module/UsersModule/Controller/FormData/Validator/StringLowerCase.php +++ b/src/system/UsersModule/Controller/FormData/Validator/StringLowerCase.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\UsersModule\Controller\FormData\Validator; +namespace Zikula\UsersModule\Controller\FormData\Validator; /** * Validates a field to ensure that it contains a string whose letters are all lowercase (or are non-letter characters). diff --git a/src/system/Zikula/Module/UsersModule/Controller/FormData/Validator/StringMaximumLength.php b/src/system/UsersModule/Controller/FormData/Validator/StringMaximumLength.php similarity index 97% rename from src/system/Zikula/Module/UsersModule/Controller/FormData/Validator/StringMaximumLength.php rename to src/system/UsersModule/Controller/FormData/Validator/StringMaximumLength.php index 009d24e708..a0505169a9 100644 --- a/src/system/Zikula/Module/UsersModule/Controller/FormData/Validator/StringMaximumLength.php +++ b/src/system/UsersModule/Controller/FormData/Validator/StringMaximumLength.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\UsersModule\Controller\FormData\Validator; +namespace Zikula\UsersModule\Controller\FormData\Validator; /** * Validates a field's data, ensuring that its string value has a length that is less than or equal to a maximum length. diff --git a/src/system/Zikula/Module/UsersModule/Controller/FormData/Validator/StringMinimumLength.php b/src/system/UsersModule/Controller/FormData/Validator/StringMinimumLength.php similarity index 97% rename from src/system/Zikula/Module/UsersModule/Controller/FormData/Validator/StringMinimumLength.php rename to src/system/UsersModule/Controller/FormData/Validator/StringMinimumLength.php index 3bd820e08d..aac9b76dc5 100644 --- a/src/system/Zikula/Module/UsersModule/Controller/FormData/Validator/StringMinimumLength.php +++ b/src/system/UsersModule/Controller/FormData/Validator/StringMinimumLength.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\UsersModule\Controller\FormData\Validator; +namespace Zikula\UsersModule\Controller\FormData\Validator; /** * Validates a field's data, ensuring that its string value has a length that is greater than or equal to a minimum length. diff --git a/src/system/Zikula/Module/UsersModule/Controller/FormData/Validator/StringRegularExpression.php b/src/system/UsersModule/Controller/FormData/Validator/StringRegularExpression.php similarity index 97% rename from src/system/Zikula/Module/UsersModule/Controller/FormData/Validator/StringRegularExpression.php rename to src/system/UsersModule/Controller/FormData/Validator/StringRegularExpression.php index f96c7abaca..fc15f88a63 100644 --- a/src/system/Zikula/Module/UsersModule/Controller/FormData/Validator/StringRegularExpression.php +++ b/src/system/UsersModule/Controller/FormData/Validator/StringRegularExpression.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\UsersModule\Controller\FormData\Validator; +namespace Zikula\UsersModule\Controller\FormData\Validator; /** * Validates a field's value, ensuring that its string value matches a PCRE regular expression. diff --git a/src/system/Zikula/Module/UsersModule/Controller/FormData/Validator/StringType.php b/src/system/UsersModule/Controller/FormData/Validator/StringType.php similarity index 93% rename from src/system/Zikula/Module/UsersModule/Controller/FormData/Validator/StringType.php rename to src/system/UsersModule/Controller/FormData/Validator/StringType.php index 953c1703a1..8702c70068 100644 --- a/src/system/Zikula/Module/UsersModule/Controller/FormData/Validator/StringType.php +++ b/src/system/UsersModule/Controller/FormData/Validator/StringType.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\UsersModule\Controller\FormData\Validator; +namespace Zikula\UsersModule\Controller\FormData\Validator; /** * Validates a field's value, ensuring that is is a string value. diff --git a/src/system/Zikula/Module/UsersModule/Controller/UserController.php b/src/system/UsersModule/Controller/UserController.php similarity index 99% rename from src/system/Zikula/Module/UsersModule/Controller/UserController.php rename to src/system/UsersModule/Controller/UserController.php index 161fde8903..f530d8737b 100644 --- a/src/system/Zikula/Module/UsersModule/Controller/UserController.php +++ b/src/system/UsersModule/Controller/UserController.php @@ -11,13 +11,13 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\UsersModule\Controller; +namespace Zikula\UsersModule\Controller; use Zikula\Core\Event\GenericEvent; use Zikula\Core\Response\PlainResponse; use Zikula_View; -use Zikula\Module\UsersModule\Constant as UsersConstant; -use Zikula\Module\UsersModule\Helper\AuthenticationMethodHelper; +use Zikula\UsersModule\Constant as UsersConstant; +use Zikula\UsersModule\Helper\AuthenticationMethodHelper; use Zikula\Core\Hook\ValidationProviders; use Zikula\Core\Hook\ValidationHook; use Zikula\Core\Hook\ProcessHook; @@ -25,7 +25,7 @@ use ModUtil; use SecurityUtil; use System; -use Zikula\Module\UsersModule\Helper\AuthenticationMethodListHelper; +use Zikula\UsersModule\Helper\AuthenticationMethodListHelper; use SessionUtil; use Zikula_Session; use LogUtil; @@ -2428,7 +2428,7 @@ public function confirmChEmailAction(Request $request, $confirmcode = null) * * @param array $args parameters for this function * - * @see \Zikula\Module\UsersModule\Controller\UserController::login + * @see \Zikula\UsersModule\Controller\UserController::login * * @return RedirectResponse * diff --git a/src/system/Zikula/Module/UsersModule/DependencyInjection/ZikulaUsersExtension.php b/src/system/UsersModule/DependencyInjection/ZikulaUsersExtension.php similarity index 95% rename from src/system/Zikula/Module/UsersModule/DependencyInjection/ZikulaUsersExtension.php rename to src/system/UsersModule/DependencyInjection/ZikulaUsersExtension.php index 891f439f53..bc254fba8c 100644 --- a/src/system/Zikula/Module/UsersModule/DependencyInjection/ZikulaUsersExtension.php +++ b/src/system/UsersModule/DependencyInjection/ZikulaUsersExtension.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\UsersModule\DependencyInjection; +namespace Zikula\UsersModule\DependencyInjection; use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Loader\XmlFileLoader; diff --git a/src/system/Zikula/Module/UsersModule/Entity/UserAttributeEntity.php b/src/system/UsersModule/Entity/UserAttributeEntity.php similarity index 98% rename from src/system/Zikula/Module/UsersModule/Entity/UserAttributeEntity.php rename to src/system/UsersModule/Entity/UserAttributeEntity.php index 58cc3eb5ce..ecc070e756 100644 --- a/src/system/Zikula/Module/UsersModule/Entity/UserAttributeEntity.php +++ b/src/system/UsersModule/Entity/UserAttributeEntity.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\UsersModule\Entity; +namespace Zikula\UsersModule\Entity; use Zikula\Core\Doctrine\EntityAccess; use Doctrine\ORM\Mapping as ORM; diff --git a/src/system/Zikula/Module/UsersModule/Entity/UserEntity.php b/src/system/UsersModule/Entity/UserEntity.php similarity index 99% rename from src/system/Zikula/Module/UsersModule/Entity/UserEntity.php rename to src/system/UsersModule/Entity/UserEntity.php index f0c6fe9484..45ad5ee6a1 100644 --- a/src/system/Zikula/Module/UsersModule/Entity/UserEntity.php +++ b/src/system/UsersModule/Entity/UserEntity.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\UsersModule\Entity; +namespace Zikula\UsersModule\Entity; use Zikula\Core\Doctrine\EntityAccess; use Doctrine\ORM\Mapping as ORM; diff --git a/src/system/Zikula/Module/UsersModule/Entity/UserSessionEntity.php b/src/system/UsersModule/Entity/UserSessionEntity.php similarity index 99% rename from src/system/Zikula/Module/UsersModule/Entity/UserSessionEntity.php rename to src/system/UsersModule/Entity/UserSessionEntity.php index a8a478684c..827813c15a 100644 --- a/src/system/Zikula/Module/UsersModule/Entity/UserSessionEntity.php +++ b/src/system/UsersModule/Entity/UserSessionEntity.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\UsersModule\Entity; +namespace Zikula\UsersModule\Entity; use Zikula\Core\Doctrine\EntityAccess; use Doctrine\ORM\Mapping as ORM; diff --git a/src/system/Zikula/Module/UsersModule/Entity/UserVerificationEntity.php b/src/system/UsersModule/Entity/UserVerificationEntity.php similarity index 99% rename from src/system/Zikula/Module/UsersModule/Entity/UserVerificationEntity.php rename to src/system/UsersModule/Entity/UserVerificationEntity.php index 52c19c5fb7..7dea3cb23d 100644 --- a/src/system/Zikula/Module/UsersModule/Entity/UserVerificationEntity.php +++ b/src/system/UsersModule/Entity/UserVerificationEntity.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\UsersModule\Entity; +namespace Zikula\UsersModule\Entity; use Zikula\Core\Doctrine\EntityAccess; use Doctrine\ORM\Mapping as ORM; diff --git a/src/system/Zikula/Module/UsersModule/Helper/AuthenticationMethodHelper.php b/src/system/UsersModule/Helper/AuthenticationMethodHelper.php similarity index 99% rename from src/system/Zikula/Module/UsersModule/Helper/AuthenticationMethodHelper.php rename to src/system/UsersModule/Helper/AuthenticationMethodHelper.php index 1defb2ee61..12b1c46205 100644 --- a/src/system/Zikula/Module/UsersModule/Helper/AuthenticationMethodHelper.php +++ b/src/system/UsersModule/Helper/AuthenticationMethodHelper.php @@ -12,7 +12,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\UsersModule\Helper; +namespace Zikula\UsersModule\Helper; use ModUtil; diff --git a/src/system/Zikula/Module/UsersModule/Helper/AuthenticationMethodListHelper.php b/src/system/UsersModule/Helper/AuthenticationMethodListHelper.php similarity index 99% rename from src/system/Zikula/Module/UsersModule/Helper/AuthenticationMethodListHelper.php rename to src/system/UsersModule/Helper/AuthenticationMethodListHelper.php index ba430aa1a4..f59b115f08 100644 --- a/src/system/Zikula/Module/UsersModule/Helper/AuthenticationMethodListHelper.php +++ b/src/system/UsersModule/Helper/AuthenticationMethodListHelper.php @@ -12,13 +12,13 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\UsersModule\Helper; +namespace Zikula\UsersModule\Helper; use Zikula_Api_AbstractAuthentication; use ModUtil; use LogUtil; -use Zikula\Module\UsersModule\Helper\AuthenticationMethodHelper; +use Zikula\UsersModule\Helper\AuthenticationMethodHelper; use Zikula\Core\Exception\FatalErrorException; /** diff --git a/src/system/Zikula/Module/UsersModule/Helper/HashMethodListHelper.php b/src/system/UsersModule/Helper/HashMethodListHelper.php similarity index 95% rename from src/system/Zikula/Module/UsersModule/Helper/HashMethodListHelper.php rename to src/system/UsersModule/Helper/HashMethodListHelper.php index 84a2541563..6be88b1bb0 100644 --- a/src/system/Zikula/Module/UsersModule/Helper/HashMethodListHelper.php +++ b/src/system/UsersModule/Helper/HashMethodListHelper.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\UsersModule\Helper; +namespace Zikula\UsersModule\Helper; /** * Defines the valid list of password hashing methods. diff --git a/src/system/Zikula/Module/UsersModule/Helper/SearchHelper.php b/src/system/UsersModule/Helper/SearchHelper.php similarity index 97% rename from src/system/Zikula/Module/UsersModule/Helper/SearchHelper.php rename to src/system/UsersModule/Helper/SearchHelper.php index e4f808a2bd..d97ce9ebfe 100644 --- a/src/system/Zikula/Module/UsersModule/Helper/SearchHelper.php +++ b/src/system/UsersModule/Helper/SearchHelper.php @@ -11,12 +11,12 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\UsersModule\Helper; +namespace Zikula\UsersModule\Helper; use Zikula\SearchModule\AbstractSearchable; use SecurityUtil; use System; -use Zikula\Module\UsersModule\Constant as UsersConstant; +use Zikula\UsersModule\Constant as UsersConstant; use ModUtil; use Zikula\Core\ModUrl; use ZLanguage; diff --git a/src/system/Zikula/Module/UsersModule/LICENSE b/src/system/UsersModule/LICENSE similarity index 100% rename from src/system/Zikula/Module/UsersModule/LICENSE rename to src/system/UsersModule/LICENSE diff --git a/src/system/Zikula/Module/UsersModule/Listener/PendingContentListener.php b/src/system/UsersModule/Listener/PendingContentListener.php similarity index 97% rename from src/system/Zikula/Module/UsersModule/Listener/PendingContentListener.php rename to src/system/UsersModule/Listener/PendingContentListener.php index 3f4d7fd115..71535b3594 100644 --- a/src/system/Zikula/Module/UsersModule/Listener/PendingContentListener.php +++ b/src/system/UsersModule/Listener/PendingContentListener.php @@ -11,12 +11,12 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\UsersModule\Listener; +namespace Zikula\UsersModule\Listener; use ModUtil; use SecurityUtil; use Symfony\Component\EventDispatcher\EventSubscriberInterface; -use Zikula\Module\UsersModule\Constant as UsersConstant; +use Zikula\UsersModule\Constant as UsersConstant; use Zikula\Core\Event\GenericEvent; use Zikula_Collection_Container; use Zikula_Provider_AggregateItem; diff --git a/src/system/Zikula/Module/UsersModule/Listener/UserEventListener.php b/src/system/UsersModule/Listener/UserEventListener.php similarity index 97% rename from src/system/Zikula/Module/UsersModule/Listener/UserEventListener.php rename to src/system/UsersModule/Listener/UserEventListener.php index f546f391d0..670c58ddc9 100644 --- a/src/system/Zikula/Module/UsersModule/Listener/UserEventListener.php +++ b/src/system/UsersModule/Listener/UserEventListener.php @@ -11,13 +11,13 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\UsersModule\Listener; +namespace Zikula\UsersModule\Listener; use Symfony\Component\HttpFoundation\RequestStack; use UserUtil; use SecurityUtil; use Symfony\Component\EventDispatcher\EventSubscriberInterface; -use Zikula\Module\UsersModule\Constant as UsersConstant; +use Zikula\UsersModule\Constant as UsersConstant; use Zikula\Core\Event\GenericEvent; use Symfony\Component\HttpKernel\KernelEvents; diff --git a/src/system/Zikula/Module/UsersModule/README.md b/src/system/UsersModule/README.md similarity index 100% rename from src/system/Zikula/Module/UsersModule/README.md rename to src/system/UsersModule/README.md diff --git a/src/system/Zikula/Module/UsersModule/Resources/config/routing.yml b/src/system/UsersModule/Resources/config/routing.yml similarity index 100% rename from src/system/Zikula/Module/UsersModule/Resources/config/routing.yml rename to src/system/UsersModule/Resources/config/routing.yml diff --git a/src/system/Zikula/Module/UsersModule/Resources/config/services.xml b/src/system/UsersModule/Resources/config/services.xml similarity index 87% rename from src/system/Zikula/Module/UsersModule/Resources/config/services.xml rename to src/system/UsersModule/Resources/config/services.xml index 2c8d4d2734..0377842afd 100644 --- a/src/system/Zikula/Module/UsersModule/Resources/config/services.xml +++ b/src/system/UsersModule/Resources/config/services.xml @@ -5,8 +5,8 @@ xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"> - Zikula\Module\UsersModule\Listener\UserEventListener - Zikula\Module\UsersModule\Listener\PendingContentListener + Zikula\UsersModule\Listener\UserEventListener + Zikula\UsersModule\Listener\PendingContentListener diff --git a/src/system/Zikula/Module/UsersModule/Resources/docs/en/Developer/Profile_Managers.txt b/src/system/UsersModule/Resources/docs/en/Developer/Profile_Managers.txt similarity index 100% rename from src/system/Zikula/Module/UsersModule/Resources/docs/en/Developer/Profile_Managers.txt rename to src/system/UsersModule/Resources/docs/en/Developer/Profile_Managers.txt diff --git a/src/system/Zikula/Module/UsersModule/Resources/docs/en/Help/Admin/config.txt b/src/system/UsersModule/Resources/docs/en/Help/Admin/config.txt similarity index 100% rename from src/system/Zikula/Module/UsersModule/Resources/docs/en/Help/Admin/config.txt rename to src/system/UsersModule/Resources/docs/en/Help/Admin/config.txt diff --git a/src/system/Zikula/Module/UsersModule/Resources/public/css/style.css b/src/system/UsersModule/Resources/public/css/style.css similarity index 100% rename from src/system/Zikula/Module/UsersModule/Resources/public/css/style.css rename to src/system/UsersModule/Resources/public/css/style.css diff --git a/src/system/Zikula/Module/UsersModule/Resources/public/images/admin.png b/src/system/UsersModule/Resources/public/images/admin.png similarity index 100% rename from src/system/Zikula/Module/UsersModule/Resources/public/images/admin.png rename to src/system/UsersModule/Resources/public/images/admin.png diff --git a/src/system/Zikula/Module/UsersModule/Resources/public/images/exit.png b/src/system/UsersModule/Resources/public/images/exit.png similarity index 100% rename from src/system/Zikula/Module/UsersModule/Resources/public/images/exit.png rename to src/system/UsersModule/Resources/public/images/exit.png diff --git a/src/system/Zikula/Module/UsersModule/Resources/public/images/folder_home.png b/src/system/UsersModule/Resources/public/images/folder_home.png similarity index 100% rename from src/system/Zikula/Module/UsersModule/Resources/public/images/folder_home.png rename to src/system/UsersModule/Resources/public/images/folder_home.png diff --git a/src/system/Zikula/Module/UsersModule/Resources/public/images/locale.png b/src/system/UsersModule/Resources/public/images/locale.png similarity index 100% rename from src/system/Zikula/Module/UsersModule/Resources/public/images/locale.png rename to src/system/UsersModule/Resources/public/images/locale.png diff --git a/src/system/Zikula/Module/UsersModule/Resources/public/images/message.png b/src/system/UsersModule/Resources/public/images/message.png similarity index 100% rename from src/system/Zikula/Module/UsersModule/Resources/public/images/message.png rename to src/system/UsersModule/Resources/public/images/message.png diff --git a/src/system/Zikula/Module/UsersModule/Resources/public/images/password.png b/src/system/UsersModule/Resources/public/images/password.png similarity index 100% rename from src/system/Zikula/Module/UsersModule/Resources/public/images/password.png rename to src/system/UsersModule/Resources/public/images/password.png diff --git a/src/system/Zikula/Module/UsersModule/Resources/public/js/Zikula.Users.Admin.Config.js b/src/system/UsersModule/Resources/public/js/Zikula.Users.Admin.Config.js similarity index 100% rename from src/system/Zikula/Module/UsersModule/Resources/public/js/Zikula.Users.Admin.Config.js rename to src/system/UsersModule/Resources/public/js/Zikula.Users.Admin.Config.js diff --git a/src/system/Zikula/Module/UsersModule/Resources/public/js/Zikula.Users.Admin.Modify.js b/src/system/UsersModule/Resources/public/js/Zikula.Users.Admin.Modify.js similarity index 100% rename from src/system/Zikula/Module/UsersModule/Resources/public/js/Zikula.Users.Admin.Modify.js rename to src/system/UsersModule/Resources/public/js/Zikula.Users.Admin.Modify.js diff --git a/src/system/Zikula/Module/UsersModule/Resources/public/js/Zikula.Users.Admin.View.js b/src/system/UsersModule/Resources/public/js/Zikula.Users.Admin.View.js similarity index 100% rename from src/system/Zikula/Module/UsersModule/Resources/public/js/Zikula.Users.Admin.View.js rename to src/system/UsersModule/Resources/public/js/Zikula.Users.Admin.View.js diff --git a/src/system/Zikula/Module/UsersModule/Resources/public/js/Zikula.Users.Common.UserValidation.js b/src/system/UsersModule/Resources/public/js/Zikula.Users.Common.UserValidation.js similarity index 100% rename from src/system/Zikula/Module/UsersModule/Resources/public/js/Zikula.Users.Common.UserValidation.js rename to src/system/UsersModule/Resources/public/js/Zikula.Users.Common.UserValidation.js diff --git a/src/system/Zikula/Module/UsersModule/Resources/public/js/Zikula.Users.Login.js b/src/system/UsersModule/Resources/public/js/Zikula.Users.Login.js similarity index 100% rename from src/system/Zikula/Module/UsersModule/Resources/public/js/Zikula.Users.Login.js rename to src/system/UsersModule/Resources/public/js/Zikula.Users.Login.js diff --git a/src/system/Zikula/Module/UsersModule/Resources/public/js/Zikula.Users.LoginBlock.js b/src/system/UsersModule/Resources/public/js/Zikula.Users.LoginBlock.js similarity index 100% rename from src/system/Zikula/Module/UsersModule/Resources/public/js/Zikula.Users.LoginBlock.js rename to src/system/UsersModule/Resources/public/js/Zikula.Users.LoginBlock.js diff --git a/src/system/Zikula/Module/UsersModule/Resources/public/js/Zikula.Users.PassMeter.js b/src/system/UsersModule/Resources/public/js/Zikula.Users.PassMeter.js similarity index 100% rename from src/system/Zikula/Module/UsersModule/Resources/public/js/Zikula.Users.PassMeter.js rename to src/system/UsersModule/Resources/public/js/Zikula.Users.PassMeter.js diff --git a/src/system/Zikula/Module/UsersModule/Resources/public/js/Zikula.Users.Util.CapsLock.js b/src/system/UsersModule/Resources/public/js/Zikula.Users.Util.CapsLock.js similarity index 100% rename from src/system/Zikula/Module/UsersModule/Resources/public/js/Zikula.Users.Util.CapsLock.js rename to src/system/UsersModule/Resources/public/js/Zikula.Users.Util.CapsLock.js diff --git a/src/system/Zikula/Module/UsersModule/Resources/public/js/ZikulaUsersModule.Admin.MailUsers.js b/src/system/UsersModule/Resources/public/js/ZikulaUsersModule.Admin.MailUsers.js similarity index 100% rename from src/system/Zikula/Module/UsersModule/Resources/public/js/ZikulaUsersModule.Admin.MailUsers.js rename to src/system/UsersModule/Resources/public/js/ZikulaUsersModule.Admin.MailUsers.js diff --git a/src/system/Zikula/Module/UsersModule/Resources/views/Admin/approveregistration.tpl b/src/system/UsersModule/Resources/views/Admin/approveregistration.tpl similarity index 95% rename from src/system/Zikula/Module/UsersModule/Resources/views/Admin/approveregistration.tpl rename to src/system/UsersModule/Resources/views/Admin/approveregistration.tpl index 6b6895592f..9103d94c9f 100644 --- a/src/system/Zikula/Module/UsersModule/Resources/views/Admin/approveregistration.tpl +++ b/src/system/UsersModule/Resources/views/Admin/approveregistration.tpl @@ -7,7 +7,7 @@ {if !$reginfo.isverified} {if $force}

{gt text="Warning! The e-mail address for this registration has not been verified. Approving this registration will create a new user record without completing the e-mail verification process."}

-{elseif isset($modvars.ZikulaUsersModule.moderation_order) && ($modvars.ZikulaUsersModule.moderation_order == 'Zikula\Module\UsersModule\Constant::APPROVAL_AFTER'|const)} +{elseif isset($modvars.ZikulaUsersModule.moderation_order) && ($modvars.ZikulaUsersModule.moderation_order == 'Zikula\UsersModule\Constant::APPROVAL_AFTER'|const)}

{gt text="Warning! The e-mail address for this registration has not been verified. You are pre-approving this registration, and a new user record will be created upon completion of the e-mail verification process."}

{/if} {/if} diff --git a/src/system/Zikula/Module/UsersModule/Resources/views/Admin/config.tpl b/src/system/UsersModule/Resources/views/Admin/config.tpl similarity index 83% rename from src/system/Zikula/Module/UsersModule/Resources/views/Admin/config.tpl rename to src/system/UsersModule/Resources/views/Admin/config.tpl index c1b418bc3c..a47eee5cd3 100644 --- a/src/system/Zikula/Module/UsersModule/Resources/views/Admin/config.tpl +++ b/src/system/UsersModule/Resources/views/Admin/config.tpl @@ -5,34 +5,34 @@ ZikulaUsersAdminConfig.setup = function() { ZikulaUsersAdminConfig.formId = '{{$configData->getFormId()}}'; - {{assign var='fieldName' value='Zikula\Module\UsersModule\Constant::MODVAR_REGISTRATION_APPROVAL_REQUIRED'|const}} + {{assign var='fieldName' value='Zikula\UsersModule\Constant::MODVAR_REGISTRATION_APPROVAL_REQUIRED'|const}} ZikulaUsersAdminConfig.registrationModeratedId = '{{$configData->getFieldId($fieldName)}}'; ZikulaUsersAdminConfig.registrationModeratedYesId = '{{$configData->getFieldId($fieldName)}}' + '_yes'; ZikulaUsersAdminConfig.registrationModeratedNoId = '{{$configData->getFieldId($fieldName)}}' + '_no'; - {{assign var='fieldName' value='Zikula\Module\UsersModule\Constant::MODVAR_REGISTRATION_AUTO_LOGIN'|const}} + {{assign var='fieldName' value='Zikula\UsersModule\Constant::MODVAR_REGISTRATION_AUTO_LOGIN'|const}} ZikulaUsersAdminConfig.registrationAutoLoginWrapId = '{{$configData->getFieldId($fieldName)}}' + '_wrap'; - {{assign var='fieldName' value='Zikula\Module\UsersModule\Constant::MODVAR_REGISTRATION_APPROVAL_SEQUENCE'|const}} + {{assign var='fieldName' value='Zikula\UsersModule\Constant::MODVAR_REGISTRATION_APPROVAL_SEQUENCE'|const}} ZikulaUsersAdminConfig.registrationApprovalOrderWrapId = '{{$configData->getFieldId($fieldName)}}' + '_wrap'; - {{assign var='fieldName' value='Zikula\Module\UsersModule\Constant::MODVAR_REGISTRATION_VERIFICATION_MODE'|const}} + {{assign var='fieldName' value='Zikula\UsersModule\Constant::MODVAR_REGISTRATION_VERIFICATION_MODE'|const}} ZikulaUsersAdminConfig.registrationVerificationModeId = '{{$configData->getFieldId($fieldName)}}'; - ZikulaUsersAdminConfig.registrationVerificationModeUserPwdId = '{{$configData->getFieldId($fieldName)}}' + '_' + '{{'Zikula\Module\UsersModule\Constant::VERIFY_USERPWD'|const}}'; - ZikulaUsersAdminConfig.registrationVerificationModeNoneId = '{{$configData->getFieldId($fieldName)}}' + '_' + '{{'Zikula\Module\UsersModule\Constant::VERIFY_NO'|const}}'; + ZikulaUsersAdminConfig.registrationVerificationModeUserPwdId = '{{$configData->getFieldId($fieldName)}}' + '_' + '{{'Zikula\UsersModule\Constant::VERIFY_USERPWD'|const}}'; + ZikulaUsersAdminConfig.registrationVerificationModeNoneId = '{{$configData->getFieldId($fieldName)}}' + '_' + '{{'Zikula\UsersModule\Constant::VERIFY_NO'|const}}'; - {{assign var='fieldName' value='Zikula\Module\UsersModule\Constant::MODVAR_REGISTRATION_ANTISPAM_QUESTION'|const}} + {{assign var='fieldName' value='Zikula\UsersModule\Constant::MODVAR_REGISTRATION_ANTISPAM_QUESTION'|const}} ZikulaUsersAdminConfig.registrationAntispamQuestionId = '{{$configData->getFieldId($fieldName)}}'; - {{assign var='fieldName' value='Zikula\Module\UsersModule\Constant::MODVAR_REGISTRATION_ANTISPAM_ANSWER'|const}} + {{assign var='fieldName' value='Zikula\UsersModule\Constant::MODVAR_REGISTRATION_ANTISPAM_ANSWER'|const}} ZikulaUsersAdminConfig.registrationAntispamAnswerMandatoryId = '{{$configData->getFieldId($fieldName)}}' + '_mandatory'; - {{assign var='fieldName' value='Zikula\Module\UsersModule\Constant::MODVAR_LOGIN_METHOD'|const}} + {{assign var='fieldName' value='Zikula\UsersModule\Constant::MODVAR_LOGIN_METHOD'|const}} ZikulaUsersAdminConfig.loginMethodId = '{{$configData->getFieldId($fieldName)}}'; ZikulaUsersAdminConfig.loginMethodUserNameId = '{{$configData->getFieldId($fieldName)}}' + '_username'; ZikulaUsersAdminConfig.loginMethodEmailId = '{{$configData->getFieldId($fieldName)}}' + '_email'; ZikulaUsersAdminConfig.loginMethodEitherId = '{{$configData->getFieldId($fieldName)}}' + '_either'; - {{assign var='fieldName' value='Zikula\Module\UsersModule\Constant::MODVAR_REQUIRE_UNIQUE_EMAIL'|const}} + {{assign var='fieldName' value='Zikula\UsersModule\Constant::MODVAR_REQUIRE_UNIQUE_EMAIL'|const}} ZikulaUsersAdminConfig.requireUniqueEmailYesId = '{{$configData->getFieldId($fieldName)}}' + '_yes'; ZikulaUsersAdminConfig.requireUniqueEmailNoId = '{{$configData->getFieldId($fieldName)}}' + '_no'; } @@ -52,7 +52,7 @@
{gt text="General settings"}
- {assign var='fieldName' value='Zikula\Module\UsersModule\Constant::MODVAR_ANONYMOUS_DISPLAY_NAME'|const} + {assign var='fieldName' value='Zikula\UsersModule\Constant::MODVAR_ANONYMOUS_DISPLAY_NAME'|const}
@@ -61,7 +61,7 @@
- {assign var='fieldName' value='Zikula\Module\UsersModule\Constant::MODVAR_ITEMS_PER_PAGE'|const} + {assign var='fieldName' value='Zikula\UsersModule\Constant::MODVAR_ITEMS_PER_PAGE'|const}
@@ -70,7 +70,7 @@
- {assign var='fieldName' value='Zikula\Module\UsersModule\Constant::MODVAR_AVATAR_IMAGE_PATH'|const} + {assign var='fieldName' value='Zikula\UsersModule\Constant::MODVAR_AVATAR_IMAGE_PATH'|const}
@@ -78,7 +78,7 @@
- {assign var='fieldName' value='Zikula\Module\UsersModule\Constant::MODVAR_GRAVATARS_ENABLED'|const} + {assign var='fieldName' value='Zikula\UsersModule\Constant::MODVAR_GRAVATARS_ENABLED'|const}
@@ -91,7 +91,7 @@
- {assign var='fieldName' value='Zikula\Module\UsersModule\Constant::MODVAR_GRAVATAR_IMAGE'|const} + {assign var='fieldName' value='Zikula\UsersModule\Constant::MODVAR_GRAVATAR_IMAGE'|const}
@@ -103,7 +103,7 @@
{gt text="Account page settings"}
- {assign var='fieldName' value='Zikula\Module\UsersModule\Constant::MODVAR_ACCOUNT_DISPLAY_GRAPHICS'|const} + {assign var='fieldName' value='Zikula\UsersModule\Constant::MODVAR_ACCOUNT_DISPLAY_GRAPHICS'|const}
@@ -116,7 +116,7 @@
- {assign var='fieldName' value='Zikula\Module\UsersModule\Constant::MODVAR_ACCOUNT_PAGE_IMAGE_PATH'|const} + {assign var='fieldName' value='Zikula\UsersModule\Constant::MODVAR_ACCOUNT_PAGE_IMAGE_PATH'|const}
@@ -124,7 +124,7 @@
- {assign var='fieldName' value='Zikula\Module\UsersModule\Constant::MODVAR_ACCOUNT_ITEMS_PER_PAGE'|const} + {assign var='fieldName' value='Zikula\UsersModule\Constant::MODVAR_ACCOUNT_ITEMS_PER_PAGE'|const}
@@ -132,7 +132,7 @@
- {assign var='fieldName' value='Zikula\Module\UsersModule\Constant::MODVAR_ACCOUNT_ITEMS_PER_ROW'|const} + {assign var='fieldName' value='Zikula\UsersModule\Constant::MODVAR_ACCOUNT_ITEMS_PER_ROW'|const}
@@ -140,7 +140,7 @@
- {assign var='fieldName' value='Zikula\Module\UsersModule\Constant::MODVAR_MANAGE_EMAIL_ADDRESS'|const} + {assign var='fieldName' value='Zikula\UsersModule\Constant::MODVAR_MANAGE_EMAIL_ADDRESS'|const}
@@ -157,15 +157,15 @@
{gt text="User credential settings"}
- {assign var='fieldName' value='Zikula\Module\UsersModule\Constant::MODVAR_LOGIN_METHOD'|const} + {assign var='fieldName' value='Zikula\UsersModule\Constant::MODVAR_LOGIN_METHOD'|const}
- getFieldData($fieldName) < constant('Zikula\Module\UsersModule\Constant::LOGIN_METHOD_EMAIL')) || ($configData->getFieldData($fieldName) > constant('Zikula\Module\UsersModule\Constant::LOGIN_METHOD_ANY'))}checked="checked" {/if}/> + getFieldData($fieldName) < constant('Zikula\UsersModule\Constant::LOGIN_METHOD_EMAIL')) || ($configData->getFieldData($fieldName) > constant('Zikula\UsersModule\Constant::LOGIN_METHOD_ANY'))}checked="checked" {/if}/> - getFieldData($fieldName) == constant('Zikula\Module\UsersModule\Constant::LOGIN_METHOD_EMAIL')}checked="checked" {/if}/> + getFieldData($fieldName) == constant('Zikula\UsersModule\Constant::LOGIN_METHOD_EMAIL')}checked="checked" {/if}/> - getFieldData($fieldName) == constant('Zikula\Module\UsersModule\Constant::LOGIN_METHOD_ANY')}checked="checked" {/if}/> + getFieldData($fieldName) == constant('Zikula\UsersModule\Constant::LOGIN_METHOD_ANY')}checked="checked" {/if}/>
{gt text="Notice: If the 'Credential required for user log-in' is set to 'E-mail address' or to 'Either user name or e-mail address', then the 'New e-mail addresses must be unique' option below must be set to 'Yes'."}
{gt text="Notice: If the 'New e-mail addresses must be unique' option was set to 'no' at some point, then user accounts with duplicate e-mail addresses might exist in the system. They will experience difficulties logging in with their e-mail address."}
@@ -174,7 +174,7 @@
- {assign var='fieldName' value='Zikula\Module\UsersModule\Constant::MODVAR_REQUIRE_UNIQUE_EMAIL'|const} + {assign var='fieldName' value='Zikula\UsersModule\Constant::MODVAR_REQUIRE_UNIQUE_EMAIL'|const}
@@ -189,7 +189,7 @@
- {assign var='fieldName' value='Zikula\Module\UsersModule\Constant::MODVAR_PASSWORD_MINIMUM_LENGTH'|const} + {assign var='fieldName' value='Zikula\UsersModule\Constant::MODVAR_PASSWORD_MINIMUM_LENGTH'|const}
@@ -198,7 +198,7 @@
- {assign var='fieldName' value='Zikula\Module\UsersModule\Constant::MODVAR_HASH_METHOD'|const} + {assign var='fieldName' value='Zikula\UsersModule\Constant::MODVAR_HASH_METHOD'|const}
@@ -275,7 +275,7 @@
- {assign var='fieldName' value='Zikula\Module\UsersModule\Constant::MODVAR_REGISTRATION_ADMIN_NOTIFICATION_EMAIL'|const} + {assign var='fieldName' value='Zikula\UsersModule\Constant::MODVAR_REGISTRATION_ADMIN_NOTIFICATION_EMAIL'|const}
@@ -284,7 +284,7 @@
- {assign var='fieldName' value='Zikula\Module\UsersModule\Constant::MODVAR_PASSWORD_REMINDER_ENABLED'|const} + {assign var='fieldName' value='Zikula\UsersModule\Constant::MODVAR_PASSWORD_REMINDER_ENABLED'|const}
@@ -297,7 +297,7 @@
- {assign var='fieldName' value='Zikula\Module\UsersModule\Constant::MODVAR_PASSWORD_REMINDER_MANDATORY'|const} + {assign var='fieldName' value='Zikula\UsersModule\Constant::MODVAR_PASSWORD_REMINDER_MANDATORY'|const}
@@ -310,7 +310,7 @@
- {assign var='fieldName' value='Zikula\Module\UsersModule\Constant::MODVAR_REGISTRATION_APPROVAL_REQUIRED'|const} + {assign var='fieldName' value='Zikula\UsersModule\Constant::MODVAR_REGISTRATION_APPROVAL_REQUIRED'|const}
@@ -322,22 +322,22 @@
- {assign var='fieldName' value='Zikula\Module\UsersModule\Constant::MODVAR_REGISTRATION_VERIFICATION_MODE'|const} + {assign var='fieldName' value='Zikula\UsersModule\Constant::MODVAR_REGISTRATION_VERIFICATION_MODE'|const}
- getFieldData($fieldName) == constant('Zikula\Module\UsersModule\Constant::VERIFY_USERPWD')) || $configData->getFieldData($fieldName) == constant('Zikula\Module\UsersModule\Constant::VERIFY_SYSTEMPWD')} checked="checked"{/if} /> - + getFieldData($fieldName) == constant('Zikula\UsersModule\Constant::VERIFY_USERPWD')) || $configData->getFieldData($fieldName) == constant('Zikula\UsersModule\Constant::VERIFY_SYSTEMPWD')} checked="checked"{/if} /> +
- getFieldData($fieldName) == constant('Zikula\Module\UsersModule\Constant::VERIFY_NO')} checked="checked"{/if}/> - + getFieldData($fieldName) == constant('Zikula\UsersModule\Constant::VERIFY_NO')} checked="checked"{/if}/> +
{if isset($errorFields.$fieldName)}

{$errorFields.$fieldName}

{/if}
- {assign var='fieldName' value='Zikula\Module\UsersModule\Constant::MODVAR_REGISTRATION_AUTO_LOGIN'|const} + {assign var='fieldName' value='Zikula\UsersModule\Constant::MODVAR_REGISTRATION_AUTO_LOGIN'|const}
@@ -354,27 +354,27 @@ {if isset($errorFields.$fieldName)}

{$errorFields.$fieldName}

{/if}
- {assign var='fieldName' value='Zikula\Module\UsersModule\Constant::MODVAR_REGISTRATION_APPROVAL_SEQUENCE'|const} + {assign var='fieldName' value='Zikula\UsersModule\Constant::MODVAR_REGISTRATION_APPROVAL_SEQUENCE'|const}
- getFieldData($fieldName) == constant('Zikula\Module\UsersModule\Constant::APPROVAL_BEFORE')} checked="checked"{/if} /> - + getFieldData($fieldName) == constant('Zikula\UsersModule\Constant::APPROVAL_BEFORE')} checked="checked"{/if} /> +
- getFieldData($fieldName) == constant('Zikula\Module\UsersModule\Constant::APPROVAL_AFTER')} checked="checked"{/if} /> - + getFieldData($fieldName) == constant('Zikula\UsersModule\Constant::APPROVAL_AFTER')} checked="checked"{/if} /> +
- getFieldData($fieldName) == constant('Zikula\Module\UsersModule\Constant::APPROVAL_ANY')} checked="checked"{/if} /> - + getFieldData($fieldName) == constant('Zikula\UsersModule\Constant::APPROVAL_ANY')} checked="checked"{/if} /> +
{if isset($errorFields.$fieldName)}

{$errorFields.$fieldName}

{/if}
- {assign var='fieldName' value='Zikula\Module\UsersModule\Constant::MODVAR_EXPIRE_DAYS_REGISTRATION'|const} + {assign var='fieldName' value='Zikula\UsersModule\Constant::MODVAR_EXPIRE_DAYS_REGISTRATION'|const}
@@ -389,7 +389,7 @@
- {assign var='fieldName' value='Zikula\Module\UsersModule\Constant::MODVAR_REGISTRATION_ANTISPAM_QUESTION'|const} + {assign var='fieldName' value='Zikula\UsersModule\Constant::MODVAR_REGISTRATION_ANTISPAM_QUESTION'|const}
@@ -398,7 +398,7 @@
- {assign var='fieldName' value='Zikula\Module\UsersModule\Constant::MODVAR_REGISTRATION_ANTISPAM_ANSWER'|const} + {assign var='fieldName' value='Zikula\UsersModule\Constant::MODVAR_REGISTRATION_ANTISPAM_ANSWER'|const}
@@ -407,7 +407,7 @@
- {assign var='fieldName' value='Zikula\Module\UsersModule\Constant::MODVAR_REGISTRATION_ILLEGAL_UNAMES'|const} + {assign var='fieldName' value='Zikula\UsersModule\Constant::MODVAR_REGISTRATION_ILLEGAL_UNAMES'|const}
@@ -419,7 +419,7 @@
- {assign var='fieldName' value='Zikula\Module\UsersModule\Constant::MODVAR_REGISTRATION_ILLEGAL_AGENTS'|const} + {assign var='fieldName' value='Zikula\UsersModule\Constant::MODVAR_REGISTRATION_ILLEGAL_AGENTS'|const}
@@ -431,7 +431,7 @@
- {assign var='fieldName' value='Zikula\Module\UsersModule\Constant::MODVAR_REGISTRATION_ILLEGAL_DOMAINS'|const} + {assign var='fieldName' value='Zikula\UsersModule\Constant::MODVAR_REGISTRATION_ILLEGAL_DOMAINS'|const}
@@ -447,7 +447,7 @@
{gt text="User log-in settings"}
- {assign var='fieldName' value='Zikula\Module\UsersModule\Constant::MODVAR_LOGIN_WCAG_COMPLIANT'|const} + {assign var='fieldName' value='Zikula\UsersModule\Constant::MODVAR_LOGIN_WCAG_COMPLIANT'|const}
@@ -461,7 +461,7 @@
- {assign var='fieldName' value='Zikula\Module\UsersModule\Constant::MODVAR_LOGIN_DISPLAY_INACTIVE_STATUS'|const} + {assign var='fieldName' value='Zikula\UsersModule\Constant::MODVAR_LOGIN_DISPLAY_INACTIVE_STATUS'|const}
@@ -476,7 +476,7 @@
- {assign var='fieldName' value='Zikula\Module\UsersModule\Constant::MODVAR_LOGIN_DISPLAY_VERIFY_STATUS'|const} + {assign var='fieldName' value='Zikula\UsersModule\Constant::MODVAR_LOGIN_DISPLAY_VERIFY_STATUS'|const}
@@ -491,7 +491,7 @@
- {assign var='fieldName' value='Zikula\Module\UsersModule\Constant::MODVAR_LOGIN_DISPLAY_APPROVAL_STATUS'|const} + {assign var='fieldName' value='Zikula\UsersModule\Constant::MODVAR_LOGIN_DISPLAY_APPROVAL_STATUS'|const}
diff --git a/src/system/Zikula/Module/UsersModule/Resources/views/Admin/deleteusers.tpl b/src/system/UsersModule/Resources/views/Admin/deleteusers.tpl similarity index 100% rename from src/system/Zikula/Module/UsersModule/Resources/views/Admin/deleteusers.tpl rename to src/system/UsersModule/Resources/views/Admin/deleteusers.tpl diff --git a/src/system/Zikula/Module/UsersModule/Resources/views/Admin/denyregistration.tpl b/src/system/UsersModule/Resources/views/Admin/denyregistration.tpl similarity index 100% rename from src/system/Zikula/Module/UsersModule/Resources/views/Admin/denyregistration.tpl rename to src/system/UsersModule/Resources/views/Admin/denyregistration.tpl diff --git a/src/system/Zikula/Module/UsersModule/Resources/views/Admin/displayregistration.tpl b/src/system/UsersModule/Resources/views/Admin/displayregistration.tpl similarity index 100% rename from src/system/Zikula/Module/UsersModule/Resources/views/Admin/displayregistration.tpl rename to src/system/UsersModule/Resources/views/Admin/displayregistration.tpl diff --git a/src/system/Zikula/Module/UsersModule/Resources/views/Admin/export.tpl b/src/system/UsersModule/Resources/views/Admin/export.tpl similarity index 100% rename from src/system/Zikula/Module/UsersModule/Resources/views/Admin/export.tpl rename to src/system/UsersModule/Resources/views/Admin/export.tpl diff --git a/src/system/Zikula/Module/UsersModule/Resources/views/Admin/import.tpl b/src/system/UsersModule/Resources/views/Admin/import.tpl similarity index 100% rename from src/system/Zikula/Module/UsersModule/Resources/views/Admin/import.tpl rename to src/system/UsersModule/Resources/views/Admin/import.tpl diff --git a/src/system/Zikula/Module/UsersModule/Resources/views/Admin/includeregistration.tpl b/src/system/UsersModule/Resources/views/Admin/includeregistration.tpl similarity index 100% rename from src/system/Zikula/Module/UsersModule/Resources/views/Admin/includeregistration.tpl rename to src/system/UsersModule/Resources/views/Admin/includeregistration.tpl diff --git a/src/system/Zikula/Module/UsersModule/Resources/views/Admin/mailusers.tpl b/src/system/UsersModule/Resources/views/Admin/mailusers.tpl similarity index 100% rename from src/system/Zikula/Module/UsersModule/Resources/views/Admin/mailusers.tpl rename to src/system/UsersModule/Resources/views/Admin/mailusers.tpl diff --git a/src/system/Zikula/Module/UsersModule/Resources/views/Admin/modify.tpl b/src/system/UsersModule/Resources/views/Admin/modify.tpl similarity index 96% rename from src/system/Zikula/Module/UsersModule/Resources/views/Admin/modify.tpl rename to src/system/UsersModule/Resources/views/Admin/modify.tpl index b0d5497b55..80a958ce4c 100644 --- a/src/system/Zikula/Module/UsersModule/Resources/views/Admin/modify.tpl +++ b/src/system/UsersModule/Resources/views/Admin/modify.tpl @@ -90,8 +90,8 @@ {/if}

{if isset($errorFields.$fieldName)}{$errorFields.$fieldName}{/if}

diff --git a/src/system/Zikula/Module/UsersModule/Resources/views/Admin/modifyregistration.tpl b/src/system/UsersModule/Resources/views/Admin/modifyregistration.tpl similarity index 100% rename from src/system/Zikula/Module/UsersModule/Resources/views/Admin/modifyregistration.tpl rename to src/system/UsersModule/Resources/views/Admin/modifyregistration.tpl diff --git a/src/system/Zikula/Module/UsersModule/Resources/views/Admin/newuser.tpl b/src/system/UsersModule/Resources/views/Admin/newuser.tpl similarity index 99% rename from src/system/Zikula/Module/UsersModule/Resources/views/Admin/newuser.tpl rename to src/system/UsersModule/Resources/views/Admin/newuser.tpl index 00acbca14c..385c56b3ef 100644 --- a/src/system/Zikula/Module/UsersModule/Resources/views/Admin/newuser.tpl +++ b/src/system/UsersModule/Resources/views/Admin/newuser.tpl @@ -94,7 +94,7 @@

{if isset($errorFields.$fieldName)}{$errorFields.$fieldName}{/if}

- {if $modvars.ZikulaUsersModule.reg_verifyemail == 'Zikula\Module\UsersModule\Constant::VERIFY_NO'|const} + {if $modvars.ZikulaUsersModule.reg_verifyemail == 'Zikula\UsersModule\Constant::VERIFY_NO'|const}

{gt text="The user's e-mail address will be verified, even though e-mail address verification is turned off in 'Settings'. This is necessary because the user will create a password during the verification process."}

{else}

{gt text="The user's e-mail address will be verified. The user will create a password at that time."}

diff --git a/src/system/Zikula/Module/UsersModule/Resources/views/Admin/search.tpl b/src/system/UsersModule/Resources/views/Admin/search.tpl similarity index 100% rename from src/system/Zikula/Module/UsersModule/Resources/views/Admin/search.tpl rename to src/system/UsersModule/Resources/views/Admin/search.tpl diff --git a/src/system/Zikula/Module/UsersModule/Resources/views/Admin/search_results.tpl b/src/system/UsersModule/Resources/views/Admin/search_results.tpl similarity index 100% rename from src/system/Zikula/Module/UsersModule/Resources/views/Admin/search_results.tpl rename to src/system/UsersModule/Resources/views/Admin/search_results.tpl diff --git a/src/system/Zikula/Module/UsersModule/Resources/views/Admin/toggleforcedpasswordchange.tpl b/src/system/UsersModule/Resources/views/Admin/toggleforcedpasswordchange.tpl similarity index 100% rename from src/system/Zikula/Module/UsersModule/Resources/views/Admin/toggleforcedpasswordchange.tpl rename to src/system/UsersModule/Resources/views/Admin/toggleforcedpasswordchange.tpl diff --git a/src/system/Zikula/Module/UsersModule/Resources/views/Admin/userlist.tpl b/src/system/UsersModule/Resources/views/Admin/userlist.tpl similarity index 94% rename from src/system/Zikula/Module/UsersModule/Resources/views/Admin/userlist.tpl rename to src/system/UsersModule/Resources/views/Admin/userlist.tpl index 6c706bb159..bd1518d97a 100644 --- a/src/system/Zikula/Module/UsersModule/Resources/views/Admin/userlist.tpl +++ b/src/system/UsersModule/Resources/views/Admin/userlist.tpl @@ -14,13 +14,13 @@ {/if} {strip} {switch expr=$usersitems[usersitems].activated} - {case expr='Zikula\Module\UsersModule\Constant::ACTIVATED_ACTIVE'|const} + {case expr='Zikula\UsersModule\Constant::ACTIVATED_ACTIVE'|const} {gt text='Active'} {/case} - {case expr='Zikula\Module\UsersModule\Constant::ACTIVATED_INACTIVE'|const} + {case expr='Zikula\UsersModule\Constant::ACTIVATED_INACTIVE'|const} {gt text='Inactive'} {/case} - {case expr='Zikula\Module\UsersModule\Constant::ACTIVATED_PENDING_DELETE'|const} + {case expr='Zikula\UsersModule\Constant::ACTIVATED_PENDING_DELETE'|const} {img modname=core set=icons/extrasmall src='14_layer_deletelayer.png' __title='Inactive, marked for deletion' __alt='Inactive, marked for deletion' class='tooltips'} {/case} {case} diff --git a/src/system/Zikula/Module/UsersModule/Resources/views/Admin/verifyregistration.tpl b/src/system/UsersModule/Resources/views/Admin/verifyregistration.tpl similarity index 100% rename from src/system/Zikula/Module/UsersModule/Resources/views/Admin/verifyregistration.tpl rename to src/system/UsersModule/Resources/views/Admin/verifyregistration.tpl diff --git a/src/system/Zikula/Module/UsersModule/Resources/views/Admin/view.tpl b/src/system/UsersModule/Resources/views/Admin/view.tpl similarity index 100% rename from src/system/Zikula/Module/UsersModule/Resources/views/Admin/view.tpl rename to src/system/UsersModule/Resources/views/Admin/view.tpl diff --git a/src/system/Zikula/Module/UsersModule/Resources/views/Admin/viewregistrations.tpl b/src/system/UsersModule/Resources/views/Admin/viewregistrations.tpl similarity index 95% rename from src/system/Zikula/Module/UsersModule/Resources/views/Admin/viewregistrations.tpl rename to src/system/UsersModule/Resources/views/Admin/viewregistrations.tpl index f0b81e4f79..2496143281 100644 --- a/src/system/Zikula/Module/UsersModule/Resources/views/Admin/viewregistrations.tpl +++ b/src/system/UsersModule/Resources/views/Admin/viewregistrations.tpl @@ -38,7 +38,7 @@ {elseif !$reginfo.verificationsent} - {if ($modvars.ZikulaUsersModule.moderation_order != 'Zikula\Module\UsersModule\Constant::APPROVAL_BEFORE'|const) || (($modvars.ZikulaUsersModule.moderation_order == 'Zikula\Module\UsersModule\Constant::APPROVAL_BEFORE'|const) && ($reginfo.isapproved))} + {if ($modvars.ZikulaUsersModule.moderation_order != 'Zikula\UsersModule\Constant::APPROVAL_BEFORE'|const) || (($modvars.ZikulaUsersModule.moderation_order == 'Zikula\UsersModule\Constant::APPROVAL_BEFORE'|const) && ($reginfo.isapproved))} {else} @@ -69,7 +69,7 @@ {/if} {if isset($regactions.approve)} {if $regactions.approve && !$reginfo.isverified} - {if isset($modvars.ZikulaUsersModule.moderation_order) && ($modvars.ZikulaUsersModule.moderation_order == 'Zikula\Module\UsersModule\Constant::APPROVAL_AFTER'|const)} + {if isset($modvars.ZikulaUsersModule.moderation_order) && ($modvars.ZikulaUsersModule.moderation_order == 'Zikula\UsersModule\Constant::APPROVAL_AFTER'|const)} {else} @@ -155,7 +155,7 @@ - {gt text='A verification e-mail has not been sent to the registered e-mail address.'}{if $modvars.ZikulaUsersModule.moderation_order == 'Zikula\Module\UsersModule\Constant::APPROVAL_BEFORE'|const} {gt text='If it is not yet approved, then it will be sent on approval.'}{/if} + {gt text='A verification e-mail has not been sent to the registered e-mail address.'}{if $modvars.ZikulaUsersModule.moderation_order == 'Zikula\UsersModule\Constant::APPROVAL_BEFORE'|const} {gt text='If it is not yet approved, then it will be sent on approval.'}{/if} diff --git a/src/system/Zikula/Module/UsersModule/Resources/views/Ajax/getusers.tpl b/src/system/UsersModule/Resources/views/Ajax/getusers.tpl similarity index 100% rename from src/system/Zikula/Module/UsersModule/Resources/views/Ajax/getusers.tpl rename to src/system/UsersModule/Resources/views/Ajax/getusers.tpl diff --git a/src/system/Zikula/Module/UsersModule/Resources/views/Authentication/AuthenticationMethodSelector/Base/Base.tpl b/src/system/UsersModule/Resources/views/Authentication/AuthenticationMethodSelector/Base/Base.tpl similarity index 100% rename from src/system/Zikula/Module/UsersModule/Resources/views/Authentication/AuthenticationMethodSelector/Base/Base.tpl rename to src/system/UsersModule/Resources/views/Authentication/AuthenticationMethodSelector/Base/Base.tpl diff --git a/src/system/Zikula/Module/UsersModule/Resources/views/Authentication/AuthenticationMethodSelector/loginblock/Base.tpl b/src/system/UsersModule/Resources/views/Authentication/AuthenticationMethodSelector/loginblock/Base.tpl similarity index 100% rename from src/system/Zikula/Module/UsersModule/Resources/views/Authentication/AuthenticationMethodSelector/loginblock/Base.tpl rename to src/system/UsersModule/Resources/views/Authentication/AuthenticationMethodSelector/loginblock/Base.tpl diff --git a/src/system/Zikula/Module/UsersModule/Resources/views/Authentication/LoginFormFields/Default/Default.tpl b/src/system/UsersModule/Resources/views/Authentication/LoginFormFields/Default/Default.tpl similarity index 100% rename from src/system/Zikula/Module/UsersModule/Resources/views/Authentication/LoginFormFields/Default/Default.tpl rename to src/system/UsersModule/Resources/views/Authentication/LoginFormFields/Default/Default.tpl diff --git a/src/system/Zikula/Module/UsersModule/Resources/views/Authentication/LoginFormFields/loginblock/Default.tpl b/src/system/UsersModule/Resources/views/Authentication/LoginFormFields/loginblock/Default.tpl similarity index 100% rename from src/system/Zikula/Module/UsersModule/Resources/views/Authentication/LoginFormFields/loginblock/Default.tpl rename to src/system/UsersModule/Resources/views/Authentication/LoginFormFields/loginblock/Default.tpl diff --git a/src/system/Zikula/Module/UsersModule/Resources/views/Block/accountlinks.tpl b/src/system/UsersModule/Resources/views/Block/accountlinks.tpl similarity index 100% rename from src/system/Zikula/Module/UsersModule/Resources/views/Block/accountlinks.tpl rename to src/system/UsersModule/Resources/views/Block/accountlinks.tpl diff --git a/src/system/Zikula/Module/UsersModule/Resources/views/Block/login.tpl b/src/system/UsersModule/Resources/views/Block/login.tpl similarity index 100% rename from src/system/Zikula/Module/UsersModule/Resources/views/Block/login.tpl rename to src/system/UsersModule/Resources/views/Block/login.tpl diff --git a/src/system/Zikula/Module/UsersModule/Resources/views/Block/login_topnav.tpl b/src/system/UsersModule/Resources/views/Block/login_topnav.tpl similarity index 100% rename from src/system/Zikula/Module/UsersModule/Resources/views/Block/login_topnav.tpl rename to src/system/UsersModule/Resources/views/Block/login_topnav.tpl diff --git a/src/system/Zikula/Module/UsersModule/Resources/views/Block/online.tpl b/src/system/UsersModule/Resources/views/Block/online.tpl similarity index 100% rename from src/system/Zikula/Module/UsersModule/Resources/views/Block/online.tpl rename to src/system/UsersModule/Resources/views/Block/online.tpl diff --git a/src/system/Zikula/Module/UsersModule/Resources/views/Email/importnotify_html.tpl b/src/system/UsersModule/Resources/views/Email/importnotify_html.tpl similarity index 100% rename from src/system/Zikula/Module/UsersModule/Resources/views/Email/importnotify_html.tpl rename to src/system/UsersModule/Resources/views/Email/importnotify_html.tpl diff --git a/src/system/Zikula/Module/UsersModule/Resources/views/Email/importnotify_txt.tpl b/src/system/UsersModule/Resources/views/Email/importnotify_txt.tpl similarity index 100% rename from src/system/Zikula/Module/UsersModule/Resources/views/Email/importnotify_txt.tpl rename to src/system/UsersModule/Resources/views/Email/importnotify_txt.tpl diff --git a/src/system/Zikula/Module/UsersModule/Resources/views/Email/lostpassword_html.tpl b/src/system/UsersModule/Resources/views/Email/lostpassword_html.tpl similarity index 100% rename from src/system/Zikula/Module/UsersModule/Resources/views/Email/lostpassword_html.tpl rename to src/system/UsersModule/Resources/views/Email/lostpassword_html.tpl diff --git a/src/system/Zikula/Module/UsersModule/Resources/views/Email/lostpassword_txt.tpl b/src/system/UsersModule/Resources/views/Email/lostpassword_txt.tpl similarity index 100% rename from src/system/Zikula/Module/UsersModule/Resources/views/Email/lostpassword_txt.tpl rename to src/system/UsersModule/Resources/views/Email/lostpassword_txt.tpl diff --git a/src/system/Zikula/Module/UsersModule/Resources/views/Email/lostuname_html.tpl b/src/system/UsersModule/Resources/views/Email/lostuname_html.tpl similarity index 100% rename from src/system/Zikula/Module/UsersModule/Resources/views/Email/lostuname_html.tpl rename to src/system/UsersModule/Resources/views/Email/lostuname_html.tpl diff --git a/src/system/Zikula/Module/UsersModule/Resources/views/Email/lostuname_txt.tpl b/src/system/UsersModule/Resources/views/Email/lostuname_txt.tpl similarity index 100% rename from src/system/Zikula/Module/UsersModule/Resources/views/Email/lostuname_txt.tpl rename to src/system/UsersModule/Resources/views/Email/lostuname_txt.tpl diff --git a/src/system/Zikula/Module/UsersModule/Resources/views/Email/regadminnotify_html.tpl b/src/system/UsersModule/Resources/views/Email/regadminnotify_html.tpl similarity index 100% rename from src/system/Zikula/Module/UsersModule/Resources/views/Email/regadminnotify_html.tpl rename to src/system/UsersModule/Resources/views/Email/regadminnotify_html.tpl diff --git a/src/system/Zikula/Module/UsersModule/Resources/views/Email/regadminnotify_txt.tpl b/src/system/UsersModule/Resources/views/Email/regadminnotify_txt.tpl similarity index 100% rename from src/system/Zikula/Module/UsersModule/Resources/views/Email/regadminnotify_txt.tpl rename to src/system/UsersModule/Resources/views/Email/regadminnotify_txt.tpl diff --git a/src/system/Zikula/Module/UsersModule/Resources/views/Email/regdeny_html.tpl b/src/system/UsersModule/Resources/views/Email/regdeny_html.tpl similarity index 100% rename from src/system/Zikula/Module/UsersModule/Resources/views/Email/regdeny_html.tpl rename to src/system/UsersModule/Resources/views/Email/regdeny_html.tpl diff --git a/src/system/Zikula/Module/UsersModule/Resources/views/Email/regdeny_txt.tpl b/src/system/UsersModule/Resources/views/Email/regdeny_txt.tpl similarity index 100% rename from src/system/Zikula/Module/UsersModule/Resources/views/Email/regdeny_txt.tpl rename to src/system/UsersModule/Resources/views/Email/regdeny_txt.tpl diff --git a/src/system/Zikula/Module/UsersModule/Resources/views/Email/regverifyemail_html.tpl b/src/system/UsersModule/Resources/views/Email/regverifyemail_html.tpl similarity index 92% rename from src/system/Zikula/Module/UsersModule/Resources/views/Email/regverifyemail_html.tpl rename to src/system/UsersModule/Resources/views/Email/regverifyemail_html.tpl index 95c87649b8..17a0c74078 100644 --- a/src/system/Zikula/Module/UsersModule/Resources/views/Email/regverifyemail_html.tpl +++ b/src/system/UsersModule/Resources/views/Email/regverifyemail_html.tpl @@ -8,7 +8,7 @@

{gt text="If you did request a new user account, then your request is waiting for you to verify your e-mail address with us."} {if !$reginfo.isapproved}{gt text="Your request is also waiting for administrator approval."} -{if $approvalorder == 'Zikula\Module\UsersModule\Constant::APPROVAL_AFTER'|const}{gt text="We will not be able to approve your request until after you have completed this verification step."}{/if} +{if $approvalorder == 'Zikula\UsersModule\Constant::APPROVAL_AFTER'|const}{gt text="We will not be able to approve your request until after you have completed this verification step."}{/if} {gt text="Once both this verification step is complete and an administrator has approved your request, you will be able to log in with your user name."}{/if}

{gt text="Please click on the following link to complete the e-mail address check: "}{gt text="Verify my e-mail address"}

diff --git a/src/system/Zikula/Module/UsersModule/Resources/views/Email/regverifyemail_txt.tpl b/src/system/UsersModule/Resources/views/Email/regverifyemail_txt.tpl similarity index 91% rename from src/system/Zikula/Module/UsersModule/Resources/views/Email/regverifyemail_txt.tpl rename to src/system/UsersModule/Resources/views/Email/regverifyemail_txt.tpl index 817c16feb5..a373bb3ac7 100644 --- a/src/system/Zikula/Module/UsersModule/Resources/views/Email/regverifyemail_txt.tpl +++ b/src/system/UsersModule/Resources/views/Email/regverifyemail_txt.tpl @@ -8,7 +8,7 @@ {gt text="If you did request a new user account, then your request is waiting for you to verify your e-mail address with us."} {if !$reginfo.isapproved}{gt text="Your request is also waiting for administrator approval."} -{if $approvalorder == 'Zikula\Module\UsersModule\Constant::APPROVAL_AFTER'|const}{gt text="We will not be able to approve your request until after you have completed this verification step."}{/if} +{if $approvalorder == 'Zikula\UsersModule\Constant::APPROVAL_AFTER'|const}{gt text="We will not be able to approve your request until after you have completed this verification step."}{/if} {gt text="Once both this verification step is complete and an administrator has approved your request, you will be able to log in with your user name."}{/if} {gt text="Please click on the following link to complete the e-mail address check: "}{$verificationurl} diff --git a/src/system/Zikula/Module/UsersModule/Resources/views/Email/userverifyemail_html.tpl b/src/system/UsersModule/Resources/views/Email/userverifyemail_html.tpl similarity index 100% rename from src/system/Zikula/Module/UsersModule/Resources/views/Email/userverifyemail_html.tpl rename to src/system/UsersModule/Resources/views/Email/userverifyemail_html.tpl diff --git a/src/system/Zikula/Module/UsersModule/Resources/views/Email/userverifyemail_txt.tpl b/src/system/UsersModule/Resources/views/Email/userverifyemail_txt.tpl similarity index 100% rename from src/system/Zikula/Module/UsersModule/Resources/views/Email/userverifyemail_txt.tpl rename to src/system/UsersModule/Resources/views/Email/userverifyemail_txt.tpl diff --git a/src/system/Zikula/Module/UsersModule/Resources/views/Email/welcome_html.tpl b/src/system/UsersModule/Resources/views/Email/welcome_html.tpl similarity index 100% rename from src/system/Zikula/Module/UsersModule/Resources/views/Email/welcome_html.tpl rename to src/system/UsersModule/Resources/views/Email/welcome_html.tpl diff --git a/src/system/Zikula/Module/UsersModule/Resources/views/Email/welcome_txt.tpl b/src/system/UsersModule/Resources/views/Email/welcome_txt.tpl similarity index 100% rename from src/system/Zikula/Module/UsersModule/Resources/views/Email/welcome_txt.tpl rename to src/system/UsersModule/Resources/views/Email/welcome_txt.tpl diff --git a/src/system/Zikula/Module/UsersModule/Resources/views/Search/options.tpl b/src/system/UsersModule/Resources/views/Search/options.tpl similarity index 100% rename from src/system/Zikula/Module/UsersModule/Resources/views/Search/options.tpl rename to src/system/UsersModule/Resources/views/Search/options.tpl diff --git a/src/system/Zikula/Module/UsersModule/Resources/views/User/api_expiredsession.tpl b/src/system/UsersModule/Resources/views/User/api_expiredsession.tpl similarity index 100% rename from src/system/Zikula/Module/UsersModule/Resources/views/User/api_expiredsession.tpl rename to src/system/UsersModule/Resources/views/User/api_expiredsession.tpl diff --git a/src/system/Zikula/Module/UsersModule/Resources/views/User/changeemail.tpl b/src/system/UsersModule/Resources/views/User/changeemail.tpl similarity index 100% rename from src/system/Zikula/Module/UsersModule/Resources/views/User/changeemail.tpl rename to src/system/UsersModule/Resources/views/User/changeemail.tpl diff --git a/src/system/Zikula/Module/UsersModule/Resources/views/User/changelang.tpl b/src/system/UsersModule/Resources/views/User/changelang.tpl similarity index 100% rename from src/system/Zikula/Module/UsersModule/Resources/views/User/changelang.tpl rename to src/system/UsersModule/Resources/views/User/changelang.tpl diff --git a/src/system/Zikula/Module/UsersModule/Resources/views/User/changepassword.tpl b/src/system/UsersModule/Resources/views/User/changepassword.tpl similarity index 100% rename from src/system/Zikula/Module/UsersModule/Resources/views/User/changepassword.tpl rename to src/system/UsersModule/Resources/views/User/changepassword.tpl diff --git a/src/system/Zikula/Module/UsersModule/Resources/views/User/displaystatusmsg.tpl b/src/system/UsersModule/Resources/views/User/displaystatusmsg.tpl similarity index 100% rename from src/system/Zikula/Module/UsersModule/Resources/views/User/displaystatusmsg.tpl rename to src/system/UsersModule/Resources/views/User/displaystatusmsg.tpl diff --git a/src/system/Zikula/Module/UsersModule/Resources/views/User/login.tpl b/src/system/UsersModule/Resources/views/User/login.tpl similarity index 100% rename from src/system/Zikula/Module/UsersModule/Resources/views/User/login.tpl rename to src/system/UsersModule/Resources/views/User/login.tpl diff --git a/src/system/Zikula/Module/UsersModule/Resources/views/User/lostpassword.tpl b/src/system/UsersModule/Resources/views/User/lostpassword.tpl similarity index 100% rename from src/system/Zikula/Module/UsersModule/Resources/views/User/lostpassword.tpl rename to src/system/UsersModule/Resources/views/User/lostpassword.tpl diff --git a/src/system/Zikula/Module/UsersModule/Resources/views/User/lostpasswordcode.tpl b/src/system/UsersModule/Resources/views/User/lostpasswordcode.tpl similarity index 100% rename from src/system/Zikula/Module/UsersModule/Resources/views/User/lostpasswordcode.tpl rename to src/system/UsersModule/Resources/views/User/lostpasswordcode.tpl diff --git a/src/system/Zikula/Module/UsersModule/Resources/views/User/lostpwduname.tpl b/src/system/UsersModule/Resources/views/User/lostpwduname.tpl similarity index 100% rename from src/system/Zikula/Module/UsersModule/Resources/views/User/lostpwduname.tpl rename to src/system/UsersModule/Resources/views/User/lostpwduname.tpl diff --git a/src/system/Zikula/Module/UsersModule/Resources/views/User/lostuname.tpl b/src/system/UsersModule/Resources/views/User/lostuname.tpl similarity index 100% rename from src/system/Zikula/Module/UsersModule/Resources/views/User/lostuname.tpl rename to src/system/UsersModule/Resources/views/User/lostuname.tpl diff --git a/src/system/Zikula/Module/UsersModule/Resources/views/User/mailpasswd.tpl b/src/system/UsersModule/Resources/views/User/mailpasswd.tpl similarity index 100% rename from src/system/Zikula/Module/UsersModule/Resources/views/User/mailpasswd.tpl rename to src/system/UsersModule/Resources/views/User/mailpasswd.tpl diff --git a/src/system/Zikula/Module/UsersModule/Resources/views/User/main.tpl b/src/system/UsersModule/Resources/views/User/main.tpl similarity index 100% rename from src/system/Zikula/Module/UsersModule/Resources/views/User/main.tpl rename to src/system/UsersModule/Resources/views/User/main.tpl diff --git a/src/system/Zikula/Module/UsersModule/Resources/views/User/menu.tpl b/src/system/UsersModule/Resources/views/User/menu.tpl similarity index 100% rename from src/system/Zikula/Module/UsersModule/Resources/views/User/menu.tpl rename to src/system/UsersModule/Resources/views/User/menu.tpl diff --git a/src/system/Zikula/Module/UsersModule/Resources/views/User/passwordreminder.tpl b/src/system/UsersModule/Resources/views/User/passwordreminder.tpl similarity index 100% rename from src/system/Zikula/Module/UsersModule/Resources/views/User/passwordreminder.tpl rename to src/system/UsersModule/Resources/views/User/passwordreminder.tpl diff --git a/src/system/Zikula/Module/UsersModule/Resources/views/User/redirectpage.tpl b/src/system/UsersModule/Resources/views/User/redirectpage.tpl similarity index 100% rename from src/system/Zikula/Module/UsersModule/Resources/views/User/redirectpage.tpl rename to src/system/UsersModule/Resources/views/User/redirectpage.tpl diff --git a/src/system/Zikula/Module/UsersModule/Resources/views/User/register.tpl b/src/system/UsersModule/Resources/views/User/register.tpl similarity index 94% rename from src/system/Zikula/Module/UsersModule/Resources/views/User/register.tpl rename to src/system/UsersModule/Resources/views/User/register.tpl index c0370b0204..02924b5f81 100644 --- a/src/system/Zikula/Module/UsersModule/Resources/views/User/register.tpl +++ b/src/system/UsersModule/Resources/views/User/register.tpl @@ -26,15 +26,15 @@ {gt text='During your visits, we recommended that you set your browser to accept cookies from this site. Various features of the site use cookies, and may not function properly (or may not function at all) if cookies are disabled.'}

-{if $modvars.ZikulaUsersModule.moderation && ($modvars.ZikulaUsersModule.reg_verifyemail != 'Zikula\Module\UsersModule\Constant::VERIFY_NO'|const)} - {if $modvars.ZikulaUsersModule.moderation_order == 'Zikula\Module\UsersModule\Constant::APPROVAL_BEFORE'|const} +{if $modvars.ZikulaUsersModule.moderation && ($modvars.ZikulaUsersModule.reg_verifyemail != 'Zikula\UsersModule\Constant::VERIFY_NO'|const)} + {if $modvars.ZikulaUsersModule.moderation_order == 'Zikula\UsersModule\Constant::APPROVAL_BEFORE'|const}

{gt text="Before you will be able to log in, an administrator must approve your registration request and you must verify your e-mail address. You will receive an e-mail asking to verify your e-mail address after an administrator has approved your request."}

{else} -

{gt text="Before you will be able to log in, you must verify your e-mail address and an administrator must approve your registration request. You will receive an e-mail asking to verify your e-mail address after submitting the information below."}{if $modvars.ZikulaUsersModule.moderation_order == 'Zikula\Module\UsersModule\Constant::APPROVAL_AFTER'|const} {gt text="You must verify your e-mail address before an administrator will approve your registration request."}{/if}

+

{gt text="Before you will be able to log in, you must verify your e-mail address and an administrator must approve your registration request. You will receive an e-mail asking to verify your e-mail address after submitting the information below."}{if $modvars.ZikulaUsersModule.moderation_order == 'Zikula\UsersModule\Constant::APPROVAL_AFTER'|const} {gt text="You must verify your e-mail address before an administrator will approve your registration request."}{/if}

{/if} {elseif $modvars.ZikulaUsersModule.moderation}

{gt text="Before you will be able to log in, an administrator must approve your registration request. You will receive an e-mail after an administrator has reviewed the information you submit below."}

-{elseif $modvars.ZikulaUsersModule.reg_verifyemail != 'Zikula\Module\UsersModule\Constant::VERIFY_NO'|const} +{elseif $modvars.ZikulaUsersModule.reg_verifyemail != 'Zikula\UsersModule\Constant::VERIFY_NO'|const}

{gt text="Before you will be able to log in, you must verify your e-mail address. You will receive an e-mail asking to verify your e-mail address after submitting the information below."}

{/if} @@ -65,7 +65,7 @@ {gt text='User names can contain letters, numbers, underscores, periods and/or dashes.'} - {if ($authentication_method.modname != 'ZikulaUsersModule') || (($authentication_method.modname == 'ZikulaUsersModule') && ($modvars.ZikulaUsersModule.loginviaoption == 'Zikula\Module\UsersModule\Constant::LOGIN_METHOD_EMAIL'|const))} + {if ($authentication_method.modname != 'ZikulaUsersModule') || (($authentication_method.modname == 'ZikulaUsersModule') && ($modvars.ZikulaUsersModule.loginviaoption == 'Zikula\UsersModule\Constant::LOGIN_METHOD_EMAIL'|const))} {gt text='Your user name is used to identify you to other users on the site. You still need to set one up, even though you will not be using it to log in.'} {/if}

{if isset($errorFields.$fieldName)}{$errorFields.$fieldName}{/if}

@@ -112,8 +112,8 @@ {/if}
{else} - - + + {/if} {/capture} @@ -126,7 +126,7 @@ {assign var='fieldName' value='email'}
- {if (($authentication_method.modname == 'ZikulaUsersModule') && ($modvars.ZikulaUsersModule.loginviaoption == 'Zikula\Module\UsersModule\Constant::LOGIN_METHOD_EMAIL'|const))} + {if (($authentication_method.modname == 'ZikulaUsersModule') && ($modvars.ZikulaUsersModule.loginviaoption == 'Zikula\UsersModule\Constant::LOGIN_METHOD_EMAIL'|const))} {gt text='You will use your e-mail address to identify yourself when you log in.'} {/if}

{if isset($errorFields.$fieldName)}{$errorFields.$fieldName}{/if}

@@ -144,7 +144,7 @@
{/capture} {* Order the fieldsets based on whether e-mail is the exclusive log-in id or not. *} - {if (($authentication_method.modname == 'ZikulaUsersModule') && ($modvars.ZikulaUsersModule.loginviaoption == 'Zikula\Module\UsersModule\Constant::LOGIN_METHOD_EMAIL'|const))} + {if (($authentication_method.modname == 'ZikulaUsersModule') && ($modvars.ZikulaUsersModule.loginviaoption == 'Zikula\UsersModule\Constant::LOGIN_METHOD_EMAIL'|const))} {$smarty.capture.email} {$smarty.capture.pass} {$smarty.capture.uname} diff --git a/src/system/Zikula/Module/UsersModule/Resources/views/User/registration_disabled.tpl b/src/system/UsersModule/Resources/views/User/registration_disabled.tpl similarity index 100% rename from src/system/Zikula/Module/UsersModule/Resources/views/User/registration_disabled.tpl rename to src/system/UsersModule/Resources/views/User/registration_disabled.tpl diff --git a/src/system/Zikula/Module/UsersModule/Resources/views/User/registration_method.tpl b/src/system/UsersModule/Resources/views/User/registration_method.tpl similarity index 100% rename from src/system/Zikula/Module/UsersModule/Resources/views/User/registration_method.tpl rename to src/system/UsersModule/Resources/views/User/registration_method.tpl diff --git a/src/system/Zikula/Module/UsersModule/Resources/views/User/usersblock.tpl b/src/system/UsersModule/Resources/views/User/usersblock.tpl similarity index 100% rename from src/system/Zikula/Module/UsersModule/Resources/views/User/usersblock.tpl rename to src/system/UsersModule/Resources/views/User/usersblock.tpl diff --git a/src/system/Zikula/Module/UsersModule/Resources/views/User/verifyregistration.tpl b/src/system/UsersModule/Resources/views/User/verifyregistration.tpl similarity index 100% rename from src/system/Zikula/Module/UsersModule/Resources/views/User/verifyregistration.tpl rename to src/system/UsersModule/Resources/views/User/verifyregistration.tpl diff --git a/src/system/Zikula/Module/UsersModule/Resources/views/User/view.tpl b/src/system/UsersModule/Resources/views/User/view.tpl similarity index 100% rename from src/system/Zikula/Module/UsersModule/Resources/views/User/view.tpl rename to src/system/UsersModule/Resources/views/User/view.tpl diff --git a/src/system/Zikula/Module/UsersModule/Resources/views/plugins/function.login_form_fields.php b/src/system/UsersModule/Resources/views/plugins/function.login_form_fields.php similarity index 100% rename from src/system/Zikula/Module/UsersModule/Resources/views/plugins/function.login_form_fields.php rename to src/system/UsersModule/Resources/views/plugins/function.login_form_fields.php diff --git a/src/system/Zikula/Module/UsersModule/UsersModuleInstaller.php b/src/system/UsersModule/UsersModuleInstaller.php similarity index 95% rename from src/system/Zikula/Module/UsersModule/UsersModuleInstaller.php rename to src/system/UsersModule/UsersModuleInstaller.php index 1f2cd50907..600cefb16a 100644 --- a/src/system/Zikula/Module/UsersModule/UsersModuleInstaller.php +++ b/src/system/UsersModule/UsersModuleInstaller.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\UsersModule; +namespace Zikula\UsersModule; use DoctrineHelper; use DataUtil; @@ -23,7 +23,7 @@ use DBUtil; use EventUtil; use HookUtil; -use Zikula\Module\UsersModule\Constant as UsersConstant; +use Zikula\UsersModule\Constant as UsersConstant; /** * Provides module installation and upgrade services for the Users module. @@ -42,10 +42,10 @@ public function install() { // create the tables $classes = array( - 'Zikula\Module\UsersModule\Entity\UserEntity', - 'Zikula\Module\UsersModule\Entity\UserAttributeEntity', - 'Zikula\Module\UsersModule\Entity\UserSessionEntity', - 'Zikula\Module\UsersModule\Entity\UserVerificationEntity' + 'Zikula\UsersModule\Entity\UserEntity', + 'Zikula\UsersModule\Entity\UserAttributeEntity', + 'Zikula\UsersModule\Entity\UserSessionEntity', + 'Zikula\UsersModule\Entity\UserVerificationEntity' ); try { DoctrineHelper::createSchema($this->entityManager, $classes); @@ -82,7 +82,7 @@ public function upgrade($oldVersion) switch ($oldVersion) { case '2.2.0': // version shipped with Core 1.3.5 -> current 1.3.x // add new table - DoctrineHelper::createSchema($this->entityManager, array('Zikula\Module\UsersModule\Entity\UserAttributeEntity')); + DoctrineHelper::createSchema($this->entityManager, array('Zikula\UsersModule\Entity\UserAttributeEntity')); $this->migrateAttributes(); case '2.2.1': // This is the current version: add 2.2.1 --> next when appropriate @@ -218,7 +218,7 @@ private function defaultdata() 'ublockon' => 0, 'ublock' => '', ); - $user = new \Zikula\Module\UsersModule\Entity\UserEntity; + $user = new \Zikula\UsersModule\Entity\UserEntity; $user->merge($record); $this->entityManager->persist($user); @@ -238,7 +238,7 @@ private function defaultdata() 'ublockon' => 0, 'ublock' => '', ); - $user = new \Zikula\Module\UsersModule\Entity\UserEntity; + $user = new \Zikula\UsersModule\Entity\UserEntity; $user->merge($record); $this->entityManager->persist($user); diff --git a/src/system/Zikula/Module/UsersModule/UsersModuleVersion.php b/src/system/UsersModule/UsersModuleVersion.php similarity index 96% rename from src/system/Zikula/Module/UsersModule/UsersModuleVersion.php rename to src/system/UsersModule/UsersModuleVersion.php index 0b326be5db..4077c8ba9e 100644 --- a/src/system/Zikula/Module/UsersModule/UsersModuleVersion.php +++ b/src/system/UsersModule/UsersModuleVersion.php @@ -11,9 +11,9 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\UsersModule; +namespace Zikula\UsersModule; -use Zikula\Module\UsersModule\Constant as UsersConstant; +use Zikula\UsersModule\Constant as UsersConstant; use HookUtil; use Zikula\SearchModule\AbstractSearchable; use Zikula_HookManager_SubscriberBundle; @@ -38,7 +38,7 @@ public function getMetaData() 'capabilities' => array( UsersConstant::CAPABILITY_AUTHENTICATION => array('version' => '1.0'), HookUtil::SUBSCRIBER_CAPABLE => array('enabled' => true), - AbstractSearchable::SEARCHABLE => array('class' => 'Zikula\Module\UsersModule\Helper\SearchHelper'), + AbstractSearchable::SEARCHABLE => array('class' => 'Zikula\UsersModule\Helper\SearchHelper'), ), 'core_min' => '1.4.0', 'securityschema' => array('ZikulaUsersModule::' => 'Uname::User ID', 'ZikulaUsersModule::MailUsers' => '::')); diff --git a/src/system/Zikula/Module/UsersModule/ZikulaUsersModule.php b/src/system/UsersModule/ZikulaUsersModule.php similarity index 55% rename from src/system/Zikula/Module/UsersModule/ZikulaUsersModule.php rename to src/system/UsersModule/ZikulaUsersModule.php index 4c63091c46..8777b9ca77 100644 --- a/src/system/Zikula/Module/UsersModule/ZikulaUsersModule.php +++ b/src/system/UsersModule/ZikulaUsersModule.php @@ -11,7 +11,7 @@ * information regarding copyright and licensing. */ -namespace Zikula\Module\UsersModule { +namespace Zikula\UsersModule { use Zikula\Bundle\CoreBundle\Bundle\AbstractCoreModule; /** @@ -23,42 +23,42 @@ class ZikulaUsersModule extends AbstractCoreModule } /** - * BC layer till for <=1.4.0 + * BC layer - remove at Core-2.0 */ namespace { /** * constants for the users module * - * @deprecated since 1.4.0 use Zikula\Module\UsersModule\Constant instead + * @deprecated since 1.4.0 use Zikula\UsersModule\Constant instead */ - class Users_Constant extends Zikula\Module\UsersModule\Constant + class Users_Constant extends Zikula\UsersModule\Constant { } /** * authentication method helper * - * @deprecated since 1.4.0 use \Zikula\Module\UsersModule\Helper\AuthenticationMethodHelper instead + * @deprecated since 1.4.0 use \Zikula\UsersModule\Helper\AuthenticationMethodHelper instead */ - class Users_Helper_AuthenticationMethod extends \Zikula\Module\UsersModule\Helper\AuthenticationMethodHelper + class Users_Helper_AuthenticationMethod extends \Zikula\UsersModule\Helper\AuthenticationMethodHelper { } /** * list authentication helpers * - * @deprecated since 1.4.0 use \Zikula\Module\UsersModule\Helper\AuthenticationMethodListHelper instead + * @deprecated since 1.4.0 use \Zikula\UsersModule\Helper\AuthenticationMethodListHelper instead */ - class Users_Helper_AuthenticationMethodList extends \Zikula\Module\UsersModule\Helper\AuthenticationMethodListHelper + class Users_Helper_AuthenticationMethodList extends \Zikula\UsersModule\Helper\AuthenticationMethodListHelper { } /** * hash method helpers * - * @deprecated since 1.4.0 use \Zikula\Module\UsersModule\Helper\HashMethodListHelper instead + * @deprecated since 1.4.0 use \Zikula\UsersModule\Helper\HashMethodListHelper instead */ - class Users_Helper_HasMethodList extends \Zikula\Module\UsersModule\Helper\HashMethodListHelper + class Users_Helper_HasMethodList extends \Zikula\UsersModule\Helper\HashMethodListHelper { } } \ No newline at end of file diff --git a/src/system/Zikula/Module/UsersModule/composer.json b/src/system/UsersModule/composer.json similarity index 74% rename from src/system/Zikula/Module/UsersModule/composer.json rename to src/system/UsersModule/composer.json index 7b973e1072..0705e9e788 100644 --- a/src/system/Zikula/Module/UsersModule/composer.json +++ b/src/system/UsersModule/composer.json @@ -10,14 +10,14 @@ } ], "autoload": { - "psr-0": { "Zikula\\Module\\UsersModule\\": "" } + "psr-4": { "Zikula\\UsersModule\\": "" } }, "require": { "php": ">5.4.0" }, "extra": { "zikula": { - "class": "Zikula\\Module\\UsersModule\\ZikulaUsersModule" + "class": "Zikula\\UsersModule\\ZikulaUsersModule" } } } diff --git a/src/system/Zikula/Module/UsersModule/phpunit.xml.dist b/src/system/UsersModule/phpunit.xml.dist similarity index 100% rename from src/system/Zikula/Module/UsersModule/phpunit.xml.dist rename to src/system/UsersModule/phpunit.xml.dist diff --git a/src/system/Zikula/Module/UsersModule/tables.php b/src/system/UsersModule/tables.php similarity index 100% rename from src/system/Zikula/Module/UsersModule/tables.php rename to src/system/UsersModule/tables.php From de8b95dbcc8368da69864c67ada2015ecdc4abc2 Mon Sep 17 00:00:00 2001 From: Craig Heydenburg Date: Sun, 16 Aug 2015 19:22:37 -0400 Subject: [PATCH 14/35] move LessGenerator to lib/ ping @phaidon --- composer.json | 1 - src/{system => lib}/Zikula/Composer/LessGenerator.php | 0 2 files changed, 1 deletion(-) rename src/{system => lib}/Zikula/Composer/LessGenerator.php (100%) diff --git a/composer.json b/composer.json index 4cef9e669c..f5905aae5d 100644 --- a/composer.json +++ b/composer.json @@ -8,7 +8,6 @@ "autoload": { "psr-0": { "Zikula\\Module\\": "src/system", - "Zikula\\Composer\\": "src/system", "Zikula\\Theme\\": "src/themes", "Zikula\\": "src/lib", "Zikula_": "src/lib/legacy", diff --git a/src/system/Zikula/Composer/LessGenerator.php b/src/lib/Zikula/Composer/LessGenerator.php similarity index 100% rename from src/system/Zikula/Composer/LessGenerator.php rename to src/lib/Zikula/Composer/LessGenerator.php From a3152079d79407d5aa2a9b02688d31065686874b Mon Sep 17 00:00:00 2001 From: Craig Heydenburg Date: Sun, 16 Aug 2015 19:30:57 -0400 Subject: [PATCH 15/35] rename ZikulaRoutesModule directory to RoutesModule for consistency and more generic psr-4 autoloading --- .../{ZikulaRoutesModule => RoutesModule}/.gitignore | 0 .../.travis.yml | 0 .../Api/AdminApi.php | 0 .../Api/AjaxApi.php | 0 .../Api/Base/AdminApi.php | 0 .../Api/Base/AjaxApi.php | 0 .../Api/Base/CacheApi.php | 0 .../Api/Base/SelectionApi.php | 0 .../Api/CacheApi.php | 0 .../Api/SelectionApi.php | 0 .../Base/RoutesEvents.php | 0 .../Base/RoutesModuleInstaller.php | 0 .../Base/RoutesModuleVersion.php | 0 .../Base/ZikulaRoutesModule.php | 0 .../Base/bootstrap.php | 0 .../Controller/AdminController.php | 0 .../Controller/AjaxController.php | 0 .../Controller/Base/AdminController.php | 0 .../Controller/Base/AjaxController.php | 0 .../Controller/Base/ExternalController.php | 0 .../Controller/Base/RouteController.php | 0 .../Controller/ExternalController.php | 0 .../Controller/RedirectingController.php | 0 .../Controller/RouteController.php | 0 .../Base/ZikulaRoutesExtension.php | 0 .../DependencyInjection/ZikulaRoutesExtension.php | 0 .../Entity/Base/AbstractRouteEntity.php | 0 .../Entity/Factory/Base/RouteFactory.php | 0 .../Entity/Factory/RouteFactory.php | 0 .../Entity/Repository/Base/Route.php | 0 .../Entity/Repository/Route.php | 0 .../Entity/RouteEntity.php | 0 .../Event/Base/FilterRouteEvent.php | 0 .../Event/FilterRouteEvent.php | 0 .../Form/Handler/Common/Base/EditHandler.php | 0 .../Form/Handler/Common/EditHandler.php | 0 .../Form/Handler/Route/Base/EditHandler.php | 0 .../Form/Handler/Route/EditHandler.php | 0 .../Form/Plugin/Base/ItemSelector.php | 0 .../Form/Plugin/FormFrame.php | 0 .../Form/Plugin/ItemSelector.php | 0 .../Listener/Base/CoreListener.php | 0 .../Listener/Base/GroupListener.php | 0 .../Listener/Base/InstallerListener.php | 0 .../Listener/Base/KernelListener.php | 0 .../Listener/Base/MailerListener.php | 0 .../Listener/Base/ModuleDispatchListener.php | 0 .../Listener/Base/PageListener.php | 0 .../Listener/Base/ThemeListener.php | 0 .../Listener/Base/UserListener.php | 0 .../Listener/Base/UserLoginListener.php | 0 .../Listener/Base/UserLogoutListener.php | 0 .../Listener/Base/UserRegistrationListener.php | 0 .../Listener/Base/UsersListener.php | 0 .../Listener/Base/ViewListener.php | 0 .../Listener/CoreListener.php | 0 .../Listener/GroupListener.php | 0 .../Listener/InstallerListener.php | 0 .../Listener/KernelListener.php | 0 .../Listener/MailerListener.php | 0 .../Listener/ModuleDispatchListener.php | 0 .../Listener/PageListener.php | 0 .../Listener/ThemeListener.php | 0 .../Listener/UserListener.php | 0 .../Listener/UserLoginListener.php | 0 .../Listener/UserLogoutListener.php | 0 .../Listener/UserRegistrationListener.php | 0 .../Listener/UsersListener.php | 0 .../Listener/ViewListener.php | 0 .../Resources/config/custom_services.xml | 0 .../Resources/config/routing.yml | 0 .../Resources/config/services.yml | 0 .../Resources/docs/credits.md | 0 .../Resources/docs/developers.md | 0 .../Resources/docs/doctrine.md | 0 .../Resources/docs/install.md | 0 .../Resources/docs/license.md | 0 .../Resources/docs/model/Routes.mostapp | 0 .../Resources/docs/modulestudio.md | 0 .../Resources/docs/overridesTemplate_config.yml | 0 .../Resources/docs/overridesTemplate_theme.yml | 0 .../Resources/locale/de/LC_MESSAGES/index.html | 0 .../Resources/locale/de/index.html | 0 .../Resources/locale/index.html | 0 .../Resources/public/css/finder.css | 0 .../Resources/public/css/style.css | 0 .../Resources/public/images/admin.png | Bin .../Resources/public/images/index.html | 0 .../public/js/ZikulaRoutesModule.EditFunctions.js | 0 .../public/js/ZikulaRoutesModule.Finder.js | 0 .../public/js/ZikulaRoutesModule.Validation.js | 0 .../Resources/public/js/ZikulaRoutesModule.js | 0 .../Resources/views/Admin/footer.tpl | 0 .../Resources/views/Admin/header.tpl | 0 .../Resources/views/Admin/nakedmessage.tpl | 0 .../Resources/views/Admin/reloadRoutes.tpl | 0 .../Resources/views/Admin/renew.tpl | 0 .../Resources/views/External/Route/display.tpl | 0 .../Resources/views/External/Route/find.tpl | 0 .../Resources/views/External/Route/info.tpl | 0 .../Resources/views/External/Route/select.tpl | 0 .../views/Helper/include_standardfields_display.tpl | 0 .../views/Helper/include_standardfields_edit.tpl | 0 .../Resources/views/Route/delete.tpl | 0 .../Resources/views/Route/display.tpl | 0 .../Resources/views/Route/edit.tpl | 0 .../views/Route/include_displayItemListMany.tpl | 0 .../views/Route/include_displayItemListOne.tpl | 0 .../Resources/views/Route/index.tpl | 0 .../Resources/views/Route/inlineRedirectHandler.tpl | 0 .../Resources/views/Route/reload.tpl | 0 .../Resources/views/Route/view.tpl | 0 .../Resources/views/Route/view_quickNav.tpl | 0 .../Resources/views/include_filterSyntaxDialog.tpl | 0 .../Resources/views/include_pdfheader.tpl | 0 .../plugins/block.zikularoutesmoduleFormFrame.php | 0 .../function.zikularoutesmoduleItemSelector.php | 0 ...unction.zikularoutesmoduleObjectTypeSelector.php | 0 .../function.zikularoutesmoduleTemplateSelector.php | 0 .../function.zikularoutesmoduleValidationError.php | 0 .../modifier.zikularoutesmoduleActionUrl.php | 0 .../modifier.zikularoutesmoduleGetListEntry.php | 0 .../modifier.zikularoutesmoduleObjectState.php | 0 .../modifier.zikularoutesmodulePathToString.php | 0 .../plugins/modifier.zikularoutesmoduleToString.php | 0 .../RoutesEvents.php | 0 .../RoutesModuleInstaller.php | 0 .../RoutesModuleVersion.php | 0 .../Routing/RouteFinder.php | 0 .../Routing/RouteLoader.php | 0 .../Routing/Util.php | 0 .../Tests/AllTests.php | 0 .../Tests/bootstrap.php | 0 .../Translation/ConsoleCommandListener.php | 0 .../Translation/DefaultRouteExclusionStrategy.php | 0 .../Translation/ZikulaPatternGenerationStrategy.php | 0 .../Translation/ZikulaRouteTranslationExtractor.php | 0 .../Util/Base/ControllerUtil.php | 0 .../Util/Base/ListEntriesUtil.php | 0 .../Util/Base/ModelUtil.php | 0 .../Util/Base/ViewUtil.php | 0 .../Util/Base/WorkflowUtil.php | 0 .../Util/ControllerUtil.php | 0 .../Util/ListEntriesUtil.php | 0 .../Util/ModelUtil.php | 0 .../Util/Regexp.php | 0 .../Util/ViewUtil.php | 0 .../Util/WorkflowUtil.php | 0 .../ZikulaRoutesModule.php | 0 .../bootstrap.php | 0 .../composer.json | 0 .../phpunit.xml.dist | 0 .../workflows/function.none_permissioncheck.php | 0 .../workflows/none.xml | 0 .../workflows/operations/function.delete.php | 0 .../workflows/operations/function.update.php | 0 .../zikula.manifest.json | 0 157 files changed, 0 insertions(+), 0 deletions(-) rename src/system/{ZikulaRoutesModule => RoutesModule}/.gitignore (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/.travis.yml (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Api/AdminApi.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Api/AjaxApi.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Api/Base/AdminApi.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Api/Base/AjaxApi.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Api/Base/CacheApi.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Api/Base/SelectionApi.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Api/CacheApi.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Api/SelectionApi.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Base/RoutesEvents.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Base/RoutesModuleInstaller.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Base/RoutesModuleVersion.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Base/ZikulaRoutesModule.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Base/bootstrap.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Controller/AdminController.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Controller/AjaxController.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Controller/Base/AdminController.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Controller/Base/AjaxController.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Controller/Base/ExternalController.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Controller/Base/RouteController.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Controller/ExternalController.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Controller/RedirectingController.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Controller/RouteController.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/DependencyInjection/Base/ZikulaRoutesExtension.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/DependencyInjection/ZikulaRoutesExtension.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Entity/Base/AbstractRouteEntity.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Entity/Factory/Base/RouteFactory.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Entity/Factory/RouteFactory.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Entity/Repository/Base/Route.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Entity/Repository/Route.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Entity/RouteEntity.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Event/Base/FilterRouteEvent.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Event/FilterRouteEvent.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Form/Handler/Common/Base/EditHandler.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Form/Handler/Common/EditHandler.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Form/Handler/Route/Base/EditHandler.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Form/Handler/Route/EditHandler.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Form/Plugin/Base/ItemSelector.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Form/Plugin/FormFrame.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Form/Plugin/ItemSelector.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Listener/Base/CoreListener.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Listener/Base/GroupListener.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Listener/Base/InstallerListener.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Listener/Base/KernelListener.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Listener/Base/MailerListener.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Listener/Base/ModuleDispatchListener.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Listener/Base/PageListener.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Listener/Base/ThemeListener.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Listener/Base/UserListener.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Listener/Base/UserLoginListener.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Listener/Base/UserLogoutListener.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Listener/Base/UserRegistrationListener.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Listener/Base/UsersListener.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Listener/Base/ViewListener.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Listener/CoreListener.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Listener/GroupListener.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Listener/InstallerListener.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Listener/KernelListener.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Listener/MailerListener.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Listener/ModuleDispatchListener.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Listener/PageListener.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Listener/ThemeListener.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Listener/UserListener.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Listener/UserLoginListener.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Listener/UserLogoutListener.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Listener/UserRegistrationListener.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Listener/UsersListener.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Listener/ViewListener.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Resources/config/custom_services.xml (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Resources/config/routing.yml (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Resources/config/services.yml (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Resources/docs/credits.md (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Resources/docs/developers.md (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Resources/docs/doctrine.md (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Resources/docs/install.md (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Resources/docs/license.md (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Resources/docs/model/Routes.mostapp (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Resources/docs/modulestudio.md (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Resources/docs/overridesTemplate_config.yml (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Resources/docs/overridesTemplate_theme.yml (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Resources/locale/de/LC_MESSAGES/index.html (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Resources/locale/de/index.html (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Resources/locale/index.html (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Resources/public/css/finder.css (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Resources/public/css/style.css (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Resources/public/images/admin.png (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Resources/public/images/index.html (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Resources/public/js/ZikulaRoutesModule.EditFunctions.js (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Resources/public/js/ZikulaRoutesModule.Finder.js (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Resources/public/js/ZikulaRoutesModule.Validation.js (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Resources/public/js/ZikulaRoutesModule.js (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Resources/views/Admin/footer.tpl (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Resources/views/Admin/header.tpl (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Resources/views/Admin/nakedmessage.tpl (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Resources/views/Admin/reloadRoutes.tpl (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Resources/views/Admin/renew.tpl (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Resources/views/External/Route/display.tpl (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Resources/views/External/Route/find.tpl (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Resources/views/External/Route/info.tpl (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Resources/views/External/Route/select.tpl (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Resources/views/Helper/include_standardfields_display.tpl (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Resources/views/Helper/include_standardfields_edit.tpl (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Resources/views/Route/delete.tpl (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Resources/views/Route/display.tpl (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Resources/views/Route/edit.tpl (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Resources/views/Route/include_displayItemListMany.tpl (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Resources/views/Route/include_displayItemListOne.tpl (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Resources/views/Route/index.tpl (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Resources/views/Route/inlineRedirectHandler.tpl (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Resources/views/Route/reload.tpl (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Resources/views/Route/view.tpl (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Resources/views/Route/view_quickNav.tpl (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Resources/views/include_filterSyntaxDialog.tpl (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Resources/views/include_pdfheader.tpl (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Resources/views/plugins/block.zikularoutesmoduleFormFrame.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Resources/views/plugins/function.zikularoutesmoduleItemSelector.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Resources/views/plugins/function.zikularoutesmoduleObjectTypeSelector.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Resources/views/plugins/function.zikularoutesmoduleTemplateSelector.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Resources/views/plugins/function.zikularoutesmoduleValidationError.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Resources/views/plugins/modifier.zikularoutesmoduleActionUrl.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Resources/views/plugins/modifier.zikularoutesmoduleGetListEntry.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Resources/views/plugins/modifier.zikularoutesmoduleObjectState.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Resources/views/plugins/modifier.zikularoutesmodulePathToString.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Resources/views/plugins/modifier.zikularoutesmoduleToString.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/RoutesEvents.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/RoutesModuleInstaller.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/RoutesModuleVersion.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Routing/RouteFinder.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Routing/RouteLoader.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Routing/Util.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Tests/AllTests.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Tests/bootstrap.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Translation/ConsoleCommandListener.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Translation/DefaultRouteExclusionStrategy.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Translation/ZikulaPatternGenerationStrategy.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Translation/ZikulaRouteTranslationExtractor.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Util/Base/ControllerUtil.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Util/Base/ListEntriesUtil.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Util/Base/ModelUtil.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Util/Base/ViewUtil.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Util/Base/WorkflowUtil.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Util/ControllerUtil.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Util/ListEntriesUtil.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Util/ModelUtil.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Util/Regexp.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Util/ViewUtil.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/Util/WorkflowUtil.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/ZikulaRoutesModule.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/bootstrap.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/composer.json (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/phpunit.xml.dist (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/workflows/function.none_permissioncheck.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/workflows/none.xml (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/workflows/operations/function.delete.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/workflows/operations/function.update.php (100%) rename src/system/{ZikulaRoutesModule => RoutesModule}/zikula.manifest.json (100%) diff --git a/src/system/ZikulaRoutesModule/.gitignore b/src/system/RoutesModule/.gitignore similarity index 100% rename from src/system/ZikulaRoutesModule/.gitignore rename to src/system/RoutesModule/.gitignore diff --git a/src/system/ZikulaRoutesModule/.travis.yml b/src/system/RoutesModule/.travis.yml similarity index 100% rename from src/system/ZikulaRoutesModule/.travis.yml rename to src/system/RoutesModule/.travis.yml diff --git a/src/system/ZikulaRoutesModule/Api/AdminApi.php b/src/system/RoutesModule/Api/AdminApi.php similarity index 100% rename from src/system/ZikulaRoutesModule/Api/AdminApi.php rename to src/system/RoutesModule/Api/AdminApi.php diff --git a/src/system/ZikulaRoutesModule/Api/AjaxApi.php b/src/system/RoutesModule/Api/AjaxApi.php similarity index 100% rename from src/system/ZikulaRoutesModule/Api/AjaxApi.php rename to src/system/RoutesModule/Api/AjaxApi.php diff --git a/src/system/ZikulaRoutesModule/Api/Base/AdminApi.php b/src/system/RoutesModule/Api/Base/AdminApi.php similarity index 100% rename from src/system/ZikulaRoutesModule/Api/Base/AdminApi.php rename to src/system/RoutesModule/Api/Base/AdminApi.php diff --git a/src/system/ZikulaRoutesModule/Api/Base/AjaxApi.php b/src/system/RoutesModule/Api/Base/AjaxApi.php similarity index 100% rename from src/system/ZikulaRoutesModule/Api/Base/AjaxApi.php rename to src/system/RoutesModule/Api/Base/AjaxApi.php diff --git a/src/system/ZikulaRoutesModule/Api/Base/CacheApi.php b/src/system/RoutesModule/Api/Base/CacheApi.php similarity index 100% rename from src/system/ZikulaRoutesModule/Api/Base/CacheApi.php rename to src/system/RoutesModule/Api/Base/CacheApi.php diff --git a/src/system/ZikulaRoutesModule/Api/Base/SelectionApi.php b/src/system/RoutesModule/Api/Base/SelectionApi.php similarity index 100% rename from src/system/ZikulaRoutesModule/Api/Base/SelectionApi.php rename to src/system/RoutesModule/Api/Base/SelectionApi.php diff --git a/src/system/ZikulaRoutesModule/Api/CacheApi.php b/src/system/RoutesModule/Api/CacheApi.php similarity index 100% rename from src/system/ZikulaRoutesModule/Api/CacheApi.php rename to src/system/RoutesModule/Api/CacheApi.php diff --git a/src/system/ZikulaRoutesModule/Api/SelectionApi.php b/src/system/RoutesModule/Api/SelectionApi.php similarity index 100% rename from src/system/ZikulaRoutesModule/Api/SelectionApi.php rename to src/system/RoutesModule/Api/SelectionApi.php diff --git a/src/system/ZikulaRoutesModule/Base/RoutesEvents.php b/src/system/RoutesModule/Base/RoutesEvents.php similarity index 100% rename from src/system/ZikulaRoutesModule/Base/RoutesEvents.php rename to src/system/RoutesModule/Base/RoutesEvents.php diff --git a/src/system/ZikulaRoutesModule/Base/RoutesModuleInstaller.php b/src/system/RoutesModule/Base/RoutesModuleInstaller.php similarity index 100% rename from src/system/ZikulaRoutesModule/Base/RoutesModuleInstaller.php rename to src/system/RoutesModule/Base/RoutesModuleInstaller.php diff --git a/src/system/ZikulaRoutesModule/Base/RoutesModuleVersion.php b/src/system/RoutesModule/Base/RoutesModuleVersion.php similarity index 100% rename from src/system/ZikulaRoutesModule/Base/RoutesModuleVersion.php rename to src/system/RoutesModule/Base/RoutesModuleVersion.php diff --git a/src/system/ZikulaRoutesModule/Base/ZikulaRoutesModule.php b/src/system/RoutesModule/Base/ZikulaRoutesModule.php similarity index 100% rename from src/system/ZikulaRoutesModule/Base/ZikulaRoutesModule.php rename to src/system/RoutesModule/Base/ZikulaRoutesModule.php diff --git a/src/system/ZikulaRoutesModule/Base/bootstrap.php b/src/system/RoutesModule/Base/bootstrap.php similarity index 100% rename from src/system/ZikulaRoutesModule/Base/bootstrap.php rename to src/system/RoutesModule/Base/bootstrap.php diff --git a/src/system/ZikulaRoutesModule/Controller/AdminController.php b/src/system/RoutesModule/Controller/AdminController.php similarity index 100% rename from src/system/ZikulaRoutesModule/Controller/AdminController.php rename to src/system/RoutesModule/Controller/AdminController.php diff --git a/src/system/ZikulaRoutesModule/Controller/AjaxController.php b/src/system/RoutesModule/Controller/AjaxController.php similarity index 100% rename from src/system/ZikulaRoutesModule/Controller/AjaxController.php rename to src/system/RoutesModule/Controller/AjaxController.php diff --git a/src/system/ZikulaRoutesModule/Controller/Base/AdminController.php b/src/system/RoutesModule/Controller/Base/AdminController.php similarity index 100% rename from src/system/ZikulaRoutesModule/Controller/Base/AdminController.php rename to src/system/RoutesModule/Controller/Base/AdminController.php diff --git a/src/system/ZikulaRoutesModule/Controller/Base/AjaxController.php b/src/system/RoutesModule/Controller/Base/AjaxController.php similarity index 100% rename from src/system/ZikulaRoutesModule/Controller/Base/AjaxController.php rename to src/system/RoutesModule/Controller/Base/AjaxController.php diff --git a/src/system/ZikulaRoutesModule/Controller/Base/ExternalController.php b/src/system/RoutesModule/Controller/Base/ExternalController.php similarity index 100% rename from src/system/ZikulaRoutesModule/Controller/Base/ExternalController.php rename to src/system/RoutesModule/Controller/Base/ExternalController.php diff --git a/src/system/ZikulaRoutesModule/Controller/Base/RouteController.php b/src/system/RoutesModule/Controller/Base/RouteController.php similarity index 100% rename from src/system/ZikulaRoutesModule/Controller/Base/RouteController.php rename to src/system/RoutesModule/Controller/Base/RouteController.php diff --git a/src/system/ZikulaRoutesModule/Controller/ExternalController.php b/src/system/RoutesModule/Controller/ExternalController.php similarity index 100% rename from src/system/ZikulaRoutesModule/Controller/ExternalController.php rename to src/system/RoutesModule/Controller/ExternalController.php diff --git a/src/system/ZikulaRoutesModule/Controller/RedirectingController.php b/src/system/RoutesModule/Controller/RedirectingController.php similarity index 100% rename from src/system/ZikulaRoutesModule/Controller/RedirectingController.php rename to src/system/RoutesModule/Controller/RedirectingController.php diff --git a/src/system/ZikulaRoutesModule/Controller/RouteController.php b/src/system/RoutesModule/Controller/RouteController.php similarity index 100% rename from src/system/ZikulaRoutesModule/Controller/RouteController.php rename to src/system/RoutesModule/Controller/RouteController.php diff --git a/src/system/ZikulaRoutesModule/DependencyInjection/Base/ZikulaRoutesExtension.php b/src/system/RoutesModule/DependencyInjection/Base/ZikulaRoutesExtension.php similarity index 100% rename from src/system/ZikulaRoutesModule/DependencyInjection/Base/ZikulaRoutesExtension.php rename to src/system/RoutesModule/DependencyInjection/Base/ZikulaRoutesExtension.php diff --git a/src/system/ZikulaRoutesModule/DependencyInjection/ZikulaRoutesExtension.php b/src/system/RoutesModule/DependencyInjection/ZikulaRoutesExtension.php similarity index 100% rename from src/system/ZikulaRoutesModule/DependencyInjection/ZikulaRoutesExtension.php rename to src/system/RoutesModule/DependencyInjection/ZikulaRoutesExtension.php diff --git a/src/system/ZikulaRoutesModule/Entity/Base/AbstractRouteEntity.php b/src/system/RoutesModule/Entity/Base/AbstractRouteEntity.php similarity index 100% rename from src/system/ZikulaRoutesModule/Entity/Base/AbstractRouteEntity.php rename to src/system/RoutesModule/Entity/Base/AbstractRouteEntity.php diff --git a/src/system/ZikulaRoutesModule/Entity/Factory/Base/RouteFactory.php b/src/system/RoutesModule/Entity/Factory/Base/RouteFactory.php similarity index 100% rename from src/system/ZikulaRoutesModule/Entity/Factory/Base/RouteFactory.php rename to src/system/RoutesModule/Entity/Factory/Base/RouteFactory.php diff --git a/src/system/ZikulaRoutesModule/Entity/Factory/RouteFactory.php b/src/system/RoutesModule/Entity/Factory/RouteFactory.php similarity index 100% rename from src/system/ZikulaRoutesModule/Entity/Factory/RouteFactory.php rename to src/system/RoutesModule/Entity/Factory/RouteFactory.php diff --git a/src/system/ZikulaRoutesModule/Entity/Repository/Base/Route.php b/src/system/RoutesModule/Entity/Repository/Base/Route.php similarity index 100% rename from src/system/ZikulaRoutesModule/Entity/Repository/Base/Route.php rename to src/system/RoutesModule/Entity/Repository/Base/Route.php diff --git a/src/system/ZikulaRoutesModule/Entity/Repository/Route.php b/src/system/RoutesModule/Entity/Repository/Route.php similarity index 100% rename from src/system/ZikulaRoutesModule/Entity/Repository/Route.php rename to src/system/RoutesModule/Entity/Repository/Route.php diff --git a/src/system/ZikulaRoutesModule/Entity/RouteEntity.php b/src/system/RoutesModule/Entity/RouteEntity.php similarity index 100% rename from src/system/ZikulaRoutesModule/Entity/RouteEntity.php rename to src/system/RoutesModule/Entity/RouteEntity.php diff --git a/src/system/ZikulaRoutesModule/Event/Base/FilterRouteEvent.php b/src/system/RoutesModule/Event/Base/FilterRouteEvent.php similarity index 100% rename from src/system/ZikulaRoutesModule/Event/Base/FilterRouteEvent.php rename to src/system/RoutesModule/Event/Base/FilterRouteEvent.php diff --git a/src/system/ZikulaRoutesModule/Event/FilterRouteEvent.php b/src/system/RoutesModule/Event/FilterRouteEvent.php similarity index 100% rename from src/system/ZikulaRoutesModule/Event/FilterRouteEvent.php rename to src/system/RoutesModule/Event/FilterRouteEvent.php diff --git a/src/system/ZikulaRoutesModule/Form/Handler/Common/Base/EditHandler.php b/src/system/RoutesModule/Form/Handler/Common/Base/EditHandler.php similarity index 100% rename from src/system/ZikulaRoutesModule/Form/Handler/Common/Base/EditHandler.php rename to src/system/RoutesModule/Form/Handler/Common/Base/EditHandler.php diff --git a/src/system/ZikulaRoutesModule/Form/Handler/Common/EditHandler.php b/src/system/RoutesModule/Form/Handler/Common/EditHandler.php similarity index 100% rename from src/system/ZikulaRoutesModule/Form/Handler/Common/EditHandler.php rename to src/system/RoutesModule/Form/Handler/Common/EditHandler.php diff --git a/src/system/ZikulaRoutesModule/Form/Handler/Route/Base/EditHandler.php b/src/system/RoutesModule/Form/Handler/Route/Base/EditHandler.php similarity index 100% rename from src/system/ZikulaRoutesModule/Form/Handler/Route/Base/EditHandler.php rename to src/system/RoutesModule/Form/Handler/Route/Base/EditHandler.php diff --git a/src/system/ZikulaRoutesModule/Form/Handler/Route/EditHandler.php b/src/system/RoutesModule/Form/Handler/Route/EditHandler.php similarity index 100% rename from src/system/ZikulaRoutesModule/Form/Handler/Route/EditHandler.php rename to src/system/RoutesModule/Form/Handler/Route/EditHandler.php diff --git a/src/system/ZikulaRoutesModule/Form/Plugin/Base/ItemSelector.php b/src/system/RoutesModule/Form/Plugin/Base/ItemSelector.php similarity index 100% rename from src/system/ZikulaRoutesModule/Form/Plugin/Base/ItemSelector.php rename to src/system/RoutesModule/Form/Plugin/Base/ItemSelector.php diff --git a/src/system/ZikulaRoutesModule/Form/Plugin/FormFrame.php b/src/system/RoutesModule/Form/Plugin/FormFrame.php similarity index 100% rename from src/system/ZikulaRoutesModule/Form/Plugin/FormFrame.php rename to src/system/RoutesModule/Form/Plugin/FormFrame.php diff --git a/src/system/ZikulaRoutesModule/Form/Plugin/ItemSelector.php b/src/system/RoutesModule/Form/Plugin/ItemSelector.php similarity index 100% rename from src/system/ZikulaRoutesModule/Form/Plugin/ItemSelector.php rename to src/system/RoutesModule/Form/Plugin/ItemSelector.php diff --git a/src/system/ZikulaRoutesModule/Listener/Base/CoreListener.php b/src/system/RoutesModule/Listener/Base/CoreListener.php similarity index 100% rename from src/system/ZikulaRoutesModule/Listener/Base/CoreListener.php rename to src/system/RoutesModule/Listener/Base/CoreListener.php diff --git a/src/system/ZikulaRoutesModule/Listener/Base/GroupListener.php b/src/system/RoutesModule/Listener/Base/GroupListener.php similarity index 100% rename from src/system/ZikulaRoutesModule/Listener/Base/GroupListener.php rename to src/system/RoutesModule/Listener/Base/GroupListener.php diff --git a/src/system/ZikulaRoutesModule/Listener/Base/InstallerListener.php b/src/system/RoutesModule/Listener/Base/InstallerListener.php similarity index 100% rename from src/system/ZikulaRoutesModule/Listener/Base/InstallerListener.php rename to src/system/RoutesModule/Listener/Base/InstallerListener.php diff --git a/src/system/ZikulaRoutesModule/Listener/Base/KernelListener.php b/src/system/RoutesModule/Listener/Base/KernelListener.php similarity index 100% rename from src/system/ZikulaRoutesModule/Listener/Base/KernelListener.php rename to src/system/RoutesModule/Listener/Base/KernelListener.php diff --git a/src/system/ZikulaRoutesModule/Listener/Base/MailerListener.php b/src/system/RoutesModule/Listener/Base/MailerListener.php similarity index 100% rename from src/system/ZikulaRoutesModule/Listener/Base/MailerListener.php rename to src/system/RoutesModule/Listener/Base/MailerListener.php diff --git a/src/system/ZikulaRoutesModule/Listener/Base/ModuleDispatchListener.php b/src/system/RoutesModule/Listener/Base/ModuleDispatchListener.php similarity index 100% rename from src/system/ZikulaRoutesModule/Listener/Base/ModuleDispatchListener.php rename to src/system/RoutesModule/Listener/Base/ModuleDispatchListener.php diff --git a/src/system/ZikulaRoutesModule/Listener/Base/PageListener.php b/src/system/RoutesModule/Listener/Base/PageListener.php similarity index 100% rename from src/system/ZikulaRoutesModule/Listener/Base/PageListener.php rename to src/system/RoutesModule/Listener/Base/PageListener.php diff --git a/src/system/ZikulaRoutesModule/Listener/Base/ThemeListener.php b/src/system/RoutesModule/Listener/Base/ThemeListener.php similarity index 100% rename from src/system/ZikulaRoutesModule/Listener/Base/ThemeListener.php rename to src/system/RoutesModule/Listener/Base/ThemeListener.php diff --git a/src/system/ZikulaRoutesModule/Listener/Base/UserListener.php b/src/system/RoutesModule/Listener/Base/UserListener.php similarity index 100% rename from src/system/ZikulaRoutesModule/Listener/Base/UserListener.php rename to src/system/RoutesModule/Listener/Base/UserListener.php diff --git a/src/system/ZikulaRoutesModule/Listener/Base/UserLoginListener.php b/src/system/RoutesModule/Listener/Base/UserLoginListener.php similarity index 100% rename from src/system/ZikulaRoutesModule/Listener/Base/UserLoginListener.php rename to src/system/RoutesModule/Listener/Base/UserLoginListener.php diff --git a/src/system/ZikulaRoutesModule/Listener/Base/UserLogoutListener.php b/src/system/RoutesModule/Listener/Base/UserLogoutListener.php similarity index 100% rename from src/system/ZikulaRoutesModule/Listener/Base/UserLogoutListener.php rename to src/system/RoutesModule/Listener/Base/UserLogoutListener.php diff --git a/src/system/ZikulaRoutesModule/Listener/Base/UserRegistrationListener.php b/src/system/RoutesModule/Listener/Base/UserRegistrationListener.php similarity index 100% rename from src/system/ZikulaRoutesModule/Listener/Base/UserRegistrationListener.php rename to src/system/RoutesModule/Listener/Base/UserRegistrationListener.php diff --git a/src/system/ZikulaRoutesModule/Listener/Base/UsersListener.php b/src/system/RoutesModule/Listener/Base/UsersListener.php similarity index 100% rename from src/system/ZikulaRoutesModule/Listener/Base/UsersListener.php rename to src/system/RoutesModule/Listener/Base/UsersListener.php diff --git a/src/system/ZikulaRoutesModule/Listener/Base/ViewListener.php b/src/system/RoutesModule/Listener/Base/ViewListener.php similarity index 100% rename from src/system/ZikulaRoutesModule/Listener/Base/ViewListener.php rename to src/system/RoutesModule/Listener/Base/ViewListener.php diff --git a/src/system/ZikulaRoutesModule/Listener/CoreListener.php b/src/system/RoutesModule/Listener/CoreListener.php similarity index 100% rename from src/system/ZikulaRoutesModule/Listener/CoreListener.php rename to src/system/RoutesModule/Listener/CoreListener.php diff --git a/src/system/ZikulaRoutesModule/Listener/GroupListener.php b/src/system/RoutesModule/Listener/GroupListener.php similarity index 100% rename from src/system/ZikulaRoutesModule/Listener/GroupListener.php rename to src/system/RoutesModule/Listener/GroupListener.php diff --git a/src/system/ZikulaRoutesModule/Listener/InstallerListener.php b/src/system/RoutesModule/Listener/InstallerListener.php similarity index 100% rename from src/system/ZikulaRoutesModule/Listener/InstallerListener.php rename to src/system/RoutesModule/Listener/InstallerListener.php diff --git a/src/system/ZikulaRoutesModule/Listener/KernelListener.php b/src/system/RoutesModule/Listener/KernelListener.php similarity index 100% rename from src/system/ZikulaRoutesModule/Listener/KernelListener.php rename to src/system/RoutesModule/Listener/KernelListener.php diff --git a/src/system/ZikulaRoutesModule/Listener/MailerListener.php b/src/system/RoutesModule/Listener/MailerListener.php similarity index 100% rename from src/system/ZikulaRoutesModule/Listener/MailerListener.php rename to src/system/RoutesModule/Listener/MailerListener.php diff --git a/src/system/ZikulaRoutesModule/Listener/ModuleDispatchListener.php b/src/system/RoutesModule/Listener/ModuleDispatchListener.php similarity index 100% rename from src/system/ZikulaRoutesModule/Listener/ModuleDispatchListener.php rename to src/system/RoutesModule/Listener/ModuleDispatchListener.php diff --git a/src/system/ZikulaRoutesModule/Listener/PageListener.php b/src/system/RoutesModule/Listener/PageListener.php similarity index 100% rename from src/system/ZikulaRoutesModule/Listener/PageListener.php rename to src/system/RoutesModule/Listener/PageListener.php diff --git a/src/system/ZikulaRoutesModule/Listener/ThemeListener.php b/src/system/RoutesModule/Listener/ThemeListener.php similarity index 100% rename from src/system/ZikulaRoutesModule/Listener/ThemeListener.php rename to src/system/RoutesModule/Listener/ThemeListener.php diff --git a/src/system/ZikulaRoutesModule/Listener/UserListener.php b/src/system/RoutesModule/Listener/UserListener.php similarity index 100% rename from src/system/ZikulaRoutesModule/Listener/UserListener.php rename to src/system/RoutesModule/Listener/UserListener.php diff --git a/src/system/ZikulaRoutesModule/Listener/UserLoginListener.php b/src/system/RoutesModule/Listener/UserLoginListener.php similarity index 100% rename from src/system/ZikulaRoutesModule/Listener/UserLoginListener.php rename to src/system/RoutesModule/Listener/UserLoginListener.php diff --git a/src/system/ZikulaRoutesModule/Listener/UserLogoutListener.php b/src/system/RoutesModule/Listener/UserLogoutListener.php similarity index 100% rename from src/system/ZikulaRoutesModule/Listener/UserLogoutListener.php rename to src/system/RoutesModule/Listener/UserLogoutListener.php diff --git a/src/system/ZikulaRoutesModule/Listener/UserRegistrationListener.php b/src/system/RoutesModule/Listener/UserRegistrationListener.php similarity index 100% rename from src/system/ZikulaRoutesModule/Listener/UserRegistrationListener.php rename to src/system/RoutesModule/Listener/UserRegistrationListener.php diff --git a/src/system/ZikulaRoutesModule/Listener/UsersListener.php b/src/system/RoutesModule/Listener/UsersListener.php similarity index 100% rename from src/system/ZikulaRoutesModule/Listener/UsersListener.php rename to src/system/RoutesModule/Listener/UsersListener.php diff --git a/src/system/ZikulaRoutesModule/Listener/ViewListener.php b/src/system/RoutesModule/Listener/ViewListener.php similarity index 100% rename from src/system/ZikulaRoutesModule/Listener/ViewListener.php rename to src/system/RoutesModule/Listener/ViewListener.php diff --git a/src/system/ZikulaRoutesModule/Resources/config/custom_services.xml b/src/system/RoutesModule/Resources/config/custom_services.xml similarity index 100% rename from src/system/ZikulaRoutesModule/Resources/config/custom_services.xml rename to src/system/RoutesModule/Resources/config/custom_services.xml diff --git a/src/system/ZikulaRoutesModule/Resources/config/routing.yml b/src/system/RoutesModule/Resources/config/routing.yml similarity index 100% rename from src/system/ZikulaRoutesModule/Resources/config/routing.yml rename to src/system/RoutesModule/Resources/config/routing.yml diff --git a/src/system/ZikulaRoutesModule/Resources/config/services.yml b/src/system/RoutesModule/Resources/config/services.yml similarity index 100% rename from src/system/ZikulaRoutesModule/Resources/config/services.yml rename to src/system/RoutesModule/Resources/config/services.yml diff --git a/src/system/ZikulaRoutesModule/Resources/docs/credits.md b/src/system/RoutesModule/Resources/docs/credits.md similarity index 100% rename from src/system/ZikulaRoutesModule/Resources/docs/credits.md rename to src/system/RoutesModule/Resources/docs/credits.md diff --git a/src/system/ZikulaRoutesModule/Resources/docs/developers.md b/src/system/RoutesModule/Resources/docs/developers.md similarity index 100% rename from src/system/ZikulaRoutesModule/Resources/docs/developers.md rename to src/system/RoutesModule/Resources/docs/developers.md diff --git a/src/system/ZikulaRoutesModule/Resources/docs/doctrine.md b/src/system/RoutesModule/Resources/docs/doctrine.md similarity index 100% rename from src/system/ZikulaRoutesModule/Resources/docs/doctrine.md rename to src/system/RoutesModule/Resources/docs/doctrine.md diff --git a/src/system/ZikulaRoutesModule/Resources/docs/install.md b/src/system/RoutesModule/Resources/docs/install.md similarity index 100% rename from src/system/ZikulaRoutesModule/Resources/docs/install.md rename to src/system/RoutesModule/Resources/docs/install.md diff --git a/src/system/ZikulaRoutesModule/Resources/docs/license.md b/src/system/RoutesModule/Resources/docs/license.md similarity index 100% rename from src/system/ZikulaRoutesModule/Resources/docs/license.md rename to src/system/RoutesModule/Resources/docs/license.md diff --git a/src/system/ZikulaRoutesModule/Resources/docs/model/Routes.mostapp b/src/system/RoutesModule/Resources/docs/model/Routes.mostapp similarity index 100% rename from src/system/ZikulaRoutesModule/Resources/docs/model/Routes.mostapp rename to src/system/RoutesModule/Resources/docs/model/Routes.mostapp diff --git a/src/system/ZikulaRoutesModule/Resources/docs/modulestudio.md b/src/system/RoutesModule/Resources/docs/modulestudio.md similarity index 100% rename from src/system/ZikulaRoutesModule/Resources/docs/modulestudio.md rename to src/system/RoutesModule/Resources/docs/modulestudio.md diff --git a/src/system/ZikulaRoutesModule/Resources/docs/overridesTemplate_config.yml b/src/system/RoutesModule/Resources/docs/overridesTemplate_config.yml similarity index 100% rename from src/system/ZikulaRoutesModule/Resources/docs/overridesTemplate_config.yml rename to src/system/RoutesModule/Resources/docs/overridesTemplate_config.yml diff --git a/src/system/ZikulaRoutesModule/Resources/docs/overridesTemplate_theme.yml b/src/system/RoutesModule/Resources/docs/overridesTemplate_theme.yml similarity index 100% rename from src/system/ZikulaRoutesModule/Resources/docs/overridesTemplate_theme.yml rename to src/system/RoutesModule/Resources/docs/overridesTemplate_theme.yml diff --git a/src/system/ZikulaRoutesModule/Resources/locale/de/LC_MESSAGES/index.html b/src/system/RoutesModule/Resources/locale/de/LC_MESSAGES/index.html similarity index 100% rename from src/system/ZikulaRoutesModule/Resources/locale/de/LC_MESSAGES/index.html rename to src/system/RoutesModule/Resources/locale/de/LC_MESSAGES/index.html diff --git a/src/system/ZikulaRoutesModule/Resources/locale/de/index.html b/src/system/RoutesModule/Resources/locale/de/index.html similarity index 100% rename from src/system/ZikulaRoutesModule/Resources/locale/de/index.html rename to src/system/RoutesModule/Resources/locale/de/index.html diff --git a/src/system/ZikulaRoutesModule/Resources/locale/index.html b/src/system/RoutesModule/Resources/locale/index.html similarity index 100% rename from src/system/ZikulaRoutesModule/Resources/locale/index.html rename to src/system/RoutesModule/Resources/locale/index.html diff --git a/src/system/ZikulaRoutesModule/Resources/public/css/finder.css b/src/system/RoutesModule/Resources/public/css/finder.css similarity index 100% rename from src/system/ZikulaRoutesModule/Resources/public/css/finder.css rename to src/system/RoutesModule/Resources/public/css/finder.css diff --git a/src/system/ZikulaRoutesModule/Resources/public/css/style.css b/src/system/RoutesModule/Resources/public/css/style.css similarity index 100% rename from src/system/ZikulaRoutesModule/Resources/public/css/style.css rename to src/system/RoutesModule/Resources/public/css/style.css diff --git a/src/system/ZikulaRoutesModule/Resources/public/images/admin.png b/src/system/RoutesModule/Resources/public/images/admin.png similarity index 100% rename from src/system/ZikulaRoutesModule/Resources/public/images/admin.png rename to src/system/RoutesModule/Resources/public/images/admin.png diff --git a/src/system/ZikulaRoutesModule/Resources/public/images/index.html b/src/system/RoutesModule/Resources/public/images/index.html similarity index 100% rename from src/system/ZikulaRoutesModule/Resources/public/images/index.html rename to src/system/RoutesModule/Resources/public/images/index.html diff --git a/src/system/ZikulaRoutesModule/Resources/public/js/ZikulaRoutesModule.EditFunctions.js b/src/system/RoutesModule/Resources/public/js/ZikulaRoutesModule.EditFunctions.js similarity index 100% rename from src/system/ZikulaRoutesModule/Resources/public/js/ZikulaRoutesModule.EditFunctions.js rename to src/system/RoutesModule/Resources/public/js/ZikulaRoutesModule.EditFunctions.js diff --git a/src/system/ZikulaRoutesModule/Resources/public/js/ZikulaRoutesModule.Finder.js b/src/system/RoutesModule/Resources/public/js/ZikulaRoutesModule.Finder.js similarity index 100% rename from src/system/ZikulaRoutesModule/Resources/public/js/ZikulaRoutesModule.Finder.js rename to src/system/RoutesModule/Resources/public/js/ZikulaRoutesModule.Finder.js diff --git a/src/system/ZikulaRoutesModule/Resources/public/js/ZikulaRoutesModule.Validation.js b/src/system/RoutesModule/Resources/public/js/ZikulaRoutesModule.Validation.js similarity index 100% rename from src/system/ZikulaRoutesModule/Resources/public/js/ZikulaRoutesModule.Validation.js rename to src/system/RoutesModule/Resources/public/js/ZikulaRoutesModule.Validation.js diff --git a/src/system/ZikulaRoutesModule/Resources/public/js/ZikulaRoutesModule.js b/src/system/RoutesModule/Resources/public/js/ZikulaRoutesModule.js similarity index 100% rename from src/system/ZikulaRoutesModule/Resources/public/js/ZikulaRoutesModule.js rename to src/system/RoutesModule/Resources/public/js/ZikulaRoutesModule.js diff --git a/src/system/ZikulaRoutesModule/Resources/views/Admin/footer.tpl b/src/system/RoutesModule/Resources/views/Admin/footer.tpl similarity index 100% rename from src/system/ZikulaRoutesModule/Resources/views/Admin/footer.tpl rename to src/system/RoutesModule/Resources/views/Admin/footer.tpl diff --git a/src/system/ZikulaRoutesModule/Resources/views/Admin/header.tpl b/src/system/RoutesModule/Resources/views/Admin/header.tpl similarity index 100% rename from src/system/ZikulaRoutesModule/Resources/views/Admin/header.tpl rename to src/system/RoutesModule/Resources/views/Admin/header.tpl diff --git a/src/system/ZikulaRoutesModule/Resources/views/Admin/nakedmessage.tpl b/src/system/RoutesModule/Resources/views/Admin/nakedmessage.tpl similarity index 100% rename from src/system/ZikulaRoutesModule/Resources/views/Admin/nakedmessage.tpl rename to src/system/RoutesModule/Resources/views/Admin/nakedmessage.tpl diff --git a/src/system/ZikulaRoutesModule/Resources/views/Admin/reloadRoutes.tpl b/src/system/RoutesModule/Resources/views/Admin/reloadRoutes.tpl similarity index 100% rename from src/system/ZikulaRoutesModule/Resources/views/Admin/reloadRoutes.tpl rename to src/system/RoutesModule/Resources/views/Admin/reloadRoutes.tpl diff --git a/src/system/ZikulaRoutesModule/Resources/views/Admin/renew.tpl b/src/system/RoutesModule/Resources/views/Admin/renew.tpl similarity index 100% rename from src/system/ZikulaRoutesModule/Resources/views/Admin/renew.tpl rename to src/system/RoutesModule/Resources/views/Admin/renew.tpl diff --git a/src/system/ZikulaRoutesModule/Resources/views/External/Route/display.tpl b/src/system/RoutesModule/Resources/views/External/Route/display.tpl similarity index 100% rename from src/system/ZikulaRoutesModule/Resources/views/External/Route/display.tpl rename to src/system/RoutesModule/Resources/views/External/Route/display.tpl diff --git a/src/system/ZikulaRoutesModule/Resources/views/External/Route/find.tpl b/src/system/RoutesModule/Resources/views/External/Route/find.tpl similarity index 100% rename from src/system/ZikulaRoutesModule/Resources/views/External/Route/find.tpl rename to src/system/RoutesModule/Resources/views/External/Route/find.tpl diff --git a/src/system/ZikulaRoutesModule/Resources/views/External/Route/info.tpl b/src/system/RoutesModule/Resources/views/External/Route/info.tpl similarity index 100% rename from src/system/ZikulaRoutesModule/Resources/views/External/Route/info.tpl rename to src/system/RoutesModule/Resources/views/External/Route/info.tpl diff --git a/src/system/ZikulaRoutesModule/Resources/views/External/Route/select.tpl b/src/system/RoutesModule/Resources/views/External/Route/select.tpl similarity index 100% rename from src/system/ZikulaRoutesModule/Resources/views/External/Route/select.tpl rename to src/system/RoutesModule/Resources/views/External/Route/select.tpl diff --git a/src/system/ZikulaRoutesModule/Resources/views/Helper/include_standardfields_display.tpl b/src/system/RoutesModule/Resources/views/Helper/include_standardfields_display.tpl similarity index 100% rename from src/system/ZikulaRoutesModule/Resources/views/Helper/include_standardfields_display.tpl rename to src/system/RoutesModule/Resources/views/Helper/include_standardfields_display.tpl diff --git a/src/system/ZikulaRoutesModule/Resources/views/Helper/include_standardfields_edit.tpl b/src/system/RoutesModule/Resources/views/Helper/include_standardfields_edit.tpl similarity index 100% rename from src/system/ZikulaRoutesModule/Resources/views/Helper/include_standardfields_edit.tpl rename to src/system/RoutesModule/Resources/views/Helper/include_standardfields_edit.tpl diff --git a/src/system/ZikulaRoutesModule/Resources/views/Route/delete.tpl b/src/system/RoutesModule/Resources/views/Route/delete.tpl similarity index 100% rename from src/system/ZikulaRoutesModule/Resources/views/Route/delete.tpl rename to src/system/RoutesModule/Resources/views/Route/delete.tpl diff --git a/src/system/ZikulaRoutesModule/Resources/views/Route/display.tpl b/src/system/RoutesModule/Resources/views/Route/display.tpl similarity index 100% rename from src/system/ZikulaRoutesModule/Resources/views/Route/display.tpl rename to src/system/RoutesModule/Resources/views/Route/display.tpl diff --git a/src/system/ZikulaRoutesModule/Resources/views/Route/edit.tpl b/src/system/RoutesModule/Resources/views/Route/edit.tpl similarity index 100% rename from src/system/ZikulaRoutesModule/Resources/views/Route/edit.tpl rename to src/system/RoutesModule/Resources/views/Route/edit.tpl diff --git a/src/system/ZikulaRoutesModule/Resources/views/Route/include_displayItemListMany.tpl b/src/system/RoutesModule/Resources/views/Route/include_displayItemListMany.tpl similarity index 100% rename from src/system/ZikulaRoutesModule/Resources/views/Route/include_displayItemListMany.tpl rename to src/system/RoutesModule/Resources/views/Route/include_displayItemListMany.tpl diff --git a/src/system/ZikulaRoutesModule/Resources/views/Route/include_displayItemListOne.tpl b/src/system/RoutesModule/Resources/views/Route/include_displayItemListOne.tpl similarity index 100% rename from src/system/ZikulaRoutesModule/Resources/views/Route/include_displayItemListOne.tpl rename to src/system/RoutesModule/Resources/views/Route/include_displayItemListOne.tpl diff --git a/src/system/ZikulaRoutesModule/Resources/views/Route/index.tpl b/src/system/RoutesModule/Resources/views/Route/index.tpl similarity index 100% rename from src/system/ZikulaRoutesModule/Resources/views/Route/index.tpl rename to src/system/RoutesModule/Resources/views/Route/index.tpl diff --git a/src/system/ZikulaRoutesModule/Resources/views/Route/inlineRedirectHandler.tpl b/src/system/RoutesModule/Resources/views/Route/inlineRedirectHandler.tpl similarity index 100% rename from src/system/ZikulaRoutesModule/Resources/views/Route/inlineRedirectHandler.tpl rename to src/system/RoutesModule/Resources/views/Route/inlineRedirectHandler.tpl diff --git a/src/system/ZikulaRoutesModule/Resources/views/Route/reload.tpl b/src/system/RoutesModule/Resources/views/Route/reload.tpl similarity index 100% rename from src/system/ZikulaRoutesModule/Resources/views/Route/reload.tpl rename to src/system/RoutesModule/Resources/views/Route/reload.tpl diff --git a/src/system/ZikulaRoutesModule/Resources/views/Route/view.tpl b/src/system/RoutesModule/Resources/views/Route/view.tpl similarity index 100% rename from src/system/ZikulaRoutesModule/Resources/views/Route/view.tpl rename to src/system/RoutesModule/Resources/views/Route/view.tpl diff --git a/src/system/ZikulaRoutesModule/Resources/views/Route/view_quickNav.tpl b/src/system/RoutesModule/Resources/views/Route/view_quickNav.tpl similarity index 100% rename from src/system/ZikulaRoutesModule/Resources/views/Route/view_quickNav.tpl rename to src/system/RoutesModule/Resources/views/Route/view_quickNav.tpl diff --git a/src/system/ZikulaRoutesModule/Resources/views/include_filterSyntaxDialog.tpl b/src/system/RoutesModule/Resources/views/include_filterSyntaxDialog.tpl similarity index 100% rename from src/system/ZikulaRoutesModule/Resources/views/include_filterSyntaxDialog.tpl rename to src/system/RoutesModule/Resources/views/include_filterSyntaxDialog.tpl diff --git a/src/system/ZikulaRoutesModule/Resources/views/include_pdfheader.tpl b/src/system/RoutesModule/Resources/views/include_pdfheader.tpl similarity index 100% rename from src/system/ZikulaRoutesModule/Resources/views/include_pdfheader.tpl rename to src/system/RoutesModule/Resources/views/include_pdfheader.tpl diff --git a/src/system/ZikulaRoutesModule/Resources/views/plugins/block.zikularoutesmoduleFormFrame.php b/src/system/RoutesModule/Resources/views/plugins/block.zikularoutesmoduleFormFrame.php similarity index 100% rename from src/system/ZikulaRoutesModule/Resources/views/plugins/block.zikularoutesmoduleFormFrame.php rename to src/system/RoutesModule/Resources/views/plugins/block.zikularoutesmoduleFormFrame.php diff --git a/src/system/ZikulaRoutesModule/Resources/views/plugins/function.zikularoutesmoduleItemSelector.php b/src/system/RoutesModule/Resources/views/plugins/function.zikularoutesmoduleItemSelector.php similarity index 100% rename from src/system/ZikulaRoutesModule/Resources/views/plugins/function.zikularoutesmoduleItemSelector.php rename to src/system/RoutesModule/Resources/views/plugins/function.zikularoutesmoduleItemSelector.php diff --git a/src/system/ZikulaRoutesModule/Resources/views/plugins/function.zikularoutesmoduleObjectTypeSelector.php b/src/system/RoutesModule/Resources/views/plugins/function.zikularoutesmoduleObjectTypeSelector.php similarity index 100% rename from src/system/ZikulaRoutesModule/Resources/views/plugins/function.zikularoutesmoduleObjectTypeSelector.php rename to src/system/RoutesModule/Resources/views/plugins/function.zikularoutesmoduleObjectTypeSelector.php diff --git a/src/system/ZikulaRoutesModule/Resources/views/plugins/function.zikularoutesmoduleTemplateSelector.php b/src/system/RoutesModule/Resources/views/plugins/function.zikularoutesmoduleTemplateSelector.php similarity index 100% rename from src/system/ZikulaRoutesModule/Resources/views/plugins/function.zikularoutesmoduleTemplateSelector.php rename to src/system/RoutesModule/Resources/views/plugins/function.zikularoutesmoduleTemplateSelector.php diff --git a/src/system/ZikulaRoutesModule/Resources/views/plugins/function.zikularoutesmoduleValidationError.php b/src/system/RoutesModule/Resources/views/plugins/function.zikularoutesmoduleValidationError.php similarity index 100% rename from src/system/ZikulaRoutesModule/Resources/views/plugins/function.zikularoutesmoduleValidationError.php rename to src/system/RoutesModule/Resources/views/plugins/function.zikularoutesmoduleValidationError.php diff --git a/src/system/ZikulaRoutesModule/Resources/views/plugins/modifier.zikularoutesmoduleActionUrl.php b/src/system/RoutesModule/Resources/views/plugins/modifier.zikularoutesmoduleActionUrl.php similarity index 100% rename from src/system/ZikulaRoutesModule/Resources/views/plugins/modifier.zikularoutesmoduleActionUrl.php rename to src/system/RoutesModule/Resources/views/plugins/modifier.zikularoutesmoduleActionUrl.php diff --git a/src/system/ZikulaRoutesModule/Resources/views/plugins/modifier.zikularoutesmoduleGetListEntry.php b/src/system/RoutesModule/Resources/views/plugins/modifier.zikularoutesmoduleGetListEntry.php similarity index 100% rename from src/system/ZikulaRoutesModule/Resources/views/plugins/modifier.zikularoutesmoduleGetListEntry.php rename to src/system/RoutesModule/Resources/views/plugins/modifier.zikularoutesmoduleGetListEntry.php diff --git a/src/system/ZikulaRoutesModule/Resources/views/plugins/modifier.zikularoutesmoduleObjectState.php b/src/system/RoutesModule/Resources/views/plugins/modifier.zikularoutesmoduleObjectState.php similarity index 100% rename from src/system/ZikulaRoutesModule/Resources/views/plugins/modifier.zikularoutesmoduleObjectState.php rename to src/system/RoutesModule/Resources/views/plugins/modifier.zikularoutesmoduleObjectState.php diff --git a/src/system/ZikulaRoutesModule/Resources/views/plugins/modifier.zikularoutesmodulePathToString.php b/src/system/RoutesModule/Resources/views/plugins/modifier.zikularoutesmodulePathToString.php similarity index 100% rename from src/system/ZikulaRoutesModule/Resources/views/plugins/modifier.zikularoutesmodulePathToString.php rename to src/system/RoutesModule/Resources/views/plugins/modifier.zikularoutesmodulePathToString.php diff --git a/src/system/ZikulaRoutesModule/Resources/views/plugins/modifier.zikularoutesmoduleToString.php b/src/system/RoutesModule/Resources/views/plugins/modifier.zikularoutesmoduleToString.php similarity index 100% rename from src/system/ZikulaRoutesModule/Resources/views/plugins/modifier.zikularoutesmoduleToString.php rename to src/system/RoutesModule/Resources/views/plugins/modifier.zikularoutesmoduleToString.php diff --git a/src/system/ZikulaRoutesModule/RoutesEvents.php b/src/system/RoutesModule/RoutesEvents.php similarity index 100% rename from src/system/ZikulaRoutesModule/RoutesEvents.php rename to src/system/RoutesModule/RoutesEvents.php diff --git a/src/system/ZikulaRoutesModule/RoutesModuleInstaller.php b/src/system/RoutesModule/RoutesModuleInstaller.php similarity index 100% rename from src/system/ZikulaRoutesModule/RoutesModuleInstaller.php rename to src/system/RoutesModule/RoutesModuleInstaller.php diff --git a/src/system/ZikulaRoutesModule/RoutesModuleVersion.php b/src/system/RoutesModule/RoutesModuleVersion.php similarity index 100% rename from src/system/ZikulaRoutesModule/RoutesModuleVersion.php rename to src/system/RoutesModule/RoutesModuleVersion.php diff --git a/src/system/ZikulaRoutesModule/Routing/RouteFinder.php b/src/system/RoutesModule/Routing/RouteFinder.php similarity index 100% rename from src/system/ZikulaRoutesModule/Routing/RouteFinder.php rename to src/system/RoutesModule/Routing/RouteFinder.php diff --git a/src/system/ZikulaRoutesModule/Routing/RouteLoader.php b/src/system/RoutesModule/Routing/RouteLoader.php similarity index 100% rename from src/system/ZikulaRoutesModule/Routing/RouteLoader.php rename to src/system/RoutesModule/Routing/RouteLoader.php diff --git a/src/system/ZikulaRoutesModule/Routing/Util.php b/src/system/RoutesModule/Routing/Util.php similarity index 100% rename from src/system/ZikulaRoutesModule/Routing/Util.php rename to src/system/RoutesModule/Routing/Util.php diff --git a/src/system/ZikulaRoutesModule/Tests/AllTests.php b/src/system/RoutesModule/Tests/AllTests.php similarity index 100% rename from src/system/ZikulaRoutesModule/Tests/AllTests.php rename to src/system/RoutesModule/Tests/AllTests.php diff --git a/src/system/ZikulaRoutesModule/Tests/bootstrap.php b/src/system/RoutesModule/Tests/bootstrap.php similarity index 100% rename from src/system/ZikulaRoutesModule/Tests/bootstrap.php rename to src/system/RoutesModule/Tests/bootstrap.php diff --git a/src/system/ZikulaRoutesModule/Translation/ConsoleCommandListener.php b/src/system/RoutesModule/Translation/ConsoleCommandListener.php similarity index 100% rename from src/system/ZikulaRoutesModule/Translation/ConsoleCommandListener.php rename to src/system/RoutesModule/Translation/ConsoleCommandListener.php diff --git a/src/system/ZikulaRoutesModule/Translation/DefaultRouteExclusionStrategy.php b/src/system/RoutesModule/Translation/DefaultRouteExclusionStrategy.php similarity index 100% rename from src/system/ZikulaRoutesModule/Translation/DefaultRouteExclusionStrategy.php rename to src/system/RoutesModule/Translation/DefaultRouteExclusionStrategy.php diff --git a/src/system/ZikulaRoutesModule/Translation/ZikulaPatternGenerationStrategy.php b/src/system/RoutesModule/Translation/ZikulaPatternGenerationStrategy.php similarity index 100% rename from src/system/ZikulaRoutesModule/Translation/ZikulaPatternGenerationStrategy.php rename to src/system/RoutesModule/Translation/ZikulaPatternGenerationStrategy.php diff --git a/src/system/ZikulaRoutesModule/Translation/ZikulaRouteTranslationExtractor.php b/src/system/RoutesModule/Translation/ZikulaRouteTranslationExtractor.php similarity index 100% rename from src/system/ZikulaRoutesModule/Translation/ZikulaRouteTranslationExtractor.php rename to src/system/RoutesModule/Translation/ZikulaRouteTranslationExtractor.php diff --git a/src/system/ZikulaRoutesModule/Util/Base/ControllerUtil.php b/src/system/RoutesModule/Util/Base/ControllerUtil.php similarity index 100% rename from src/system/ZikulaRoutesModule/Util/Base/ControllerUtil.php rename to src/system/RoutesModule/Util/Base/ControllerUtil.php diff --git a/src/system/ZikulaRoutesModule/Util/Base/ListEntriesUtil.php b/src/system/RoutesModule/Util/Base/ListEntriesUtil.php similarity index 100% rename from src/system/ZikulaRoutesModule/Util/Base/ListEntriesUtil.php rename to src/system/RoutesModule/Util/Base/ListEntriesUtil.php diff --git a/src/system/ZikulaRoutesModule/Util/Base/ModelUtil.php b/src/system/RoutesModule/Util/Base/ModelUtil.php similarity index 100% rename from src/system/ZikulaRoutesModule/Util/Base/ModelUtil.php rename to src/system/RoutesModule/Util/Base/ModelUtil.php diff --git a/src/system/ZikulaRoutesModule/Util/Base/ViewUtil.php b/src/system/RoutesModule/Util/Base/ViewUtil.php similarity index 100% rename from src/system/ZikulaRoutesModule/Util/Base/ViewUtil.php rename to src/system/RoutesModule/Util/Base/ViewUtil.php diff --git a/src/system/ZikulaRoutesModule/Util/Base/WorkflowUtil.php b/src/system/RoutesModule/Util/Base/WorkflowUtil.php similarity index 100% rename from src/system/ZikulaRoutesModule/Util/Base/WorkflowUtil.php rename to src/system/RoutesModule/Util/Base/WorkflowUtil.php diff --git a/src/system/ZikulaRoutesModule/Util/ControllerUtil.php b/src/system/RoutesModule/Util/ControllerUtil.php similarity index 100% rename from src/system/ZikulaRoutesModule/Util/ControllerUtil.php rename to src/system/RoutesModule/Util/ControllerUtil.php diff --git a/src/system/ZikulaRoutesModule/Util/ListEntriesUtil.php b/src/system/RoutesModule/Util/ListEntriesUtil.php similarity index 100% rename from src/system/ZikulaRoutesModule/Util/ListEntriesUtil.php rename to src/system/RoutesModule/Util/ListEntriesUtil.php diff --git a/src/system/ZikulaRoutesModule/Util/ModelUtil.php b/src/system/RoutesModule/Util/ModelUtil.php similarity index 100% rename from src/system/ZikulaRoutesModule/Util/ModelUtil.php rename to src/system/RoutesModule/Util/ModelUtil.php diff --git a/src/system/ZikulaRoutesModule/Util/Regexp.php b/src/system/RoutesModule/Util/Regexp.php similarity index 100% rename from src/system/ZikulaRoutesModule/Util/Regexp.php rename to src/system/RoutesModule/Util/Regexp.php diff --git a/src/system/ZikulaRoutesModule/Util/ViewUtil.php b/src/system/RoutesModule/Util/ViewUtil.php similarity index 100% rename from src/system/ZikulaRoutesModule/Util/ViewUtil.php rename to src/system/RoutesModule/Util/ViewUtil.php diff --git a/src/system/ZikulaRoutesModule/Util/WorkflowUtil.php b/src/system/RoutesModule/Util/WorkflowUtil.php similarity index 100% rename from src/system/ZikulaRoutesModule/Util/WorkflowUtil.php rename to src/system/RoutesModule/Util/WorkflowUtil.php diff --git a/src/system/ZikulaRoutesModule/ZikulaRoutesModule.php b/src/system/RoutesModule/ZikulaRoutesModule.php similarity index 100% rename from src/system/ZikulaRoutesModule/ZikulaRoutesModule.php rename to src/system/RoutesModule/ZikulaRoutesModule.php diff --git a/src/system/ZikulaRoutesModule/bootstrap.php b/src/system/RoutesModule/bootstrap.php similarity index 100% rename from src/system/ZikulaRoutesModule/bootstrap.php rename to src/system/RoutesModule/bootstrap.php diff --git a/src/system/ZikulaRoutesModule/composer.json b/src/system/RoutesModule/composer.json similarity index 100% rename from src/system/ZikulaRoutesModule/composer.json rename to src/system/RoutesModule/composer.json diff --git a/src/system/ZikulaRoutesModule/phpunit.xml.dist b/src/system/RoutesModule/phpunit.xml.dist similarity index 100% rename from src/system/ZikulaRoutesModule/phpunit.xml.dist rename to src/system/RoutesModule/phpunit.xml.dist diff --git a/src/system/ZikulaRoutesModule/workflows/function.none_permissioncheck.php b/src/system/RoutesModule/workflows/function.none_permissioncheck.php similarity index 100% rename from src/system/ZikulaRoutesModule/workflows/function.none_permissioncheck.php rename to src/system/RoutesModule/workflows/function.none_permissioncheck.php diff --git a/src/system/ZikulaRoutesModule/workflows/none.xml b/src/system/RoutesModule/workflows/none.xml similarity index 100% rename from src/system/ZikulaRoutesModule/workflows/none.xml rename to src/system/RoutesModule/workflows/none.xml diff --git a/src/system/ZikulaRoutesModule/workflows/operations/function.delete.php b/src/system/RoutesModule/workflows/operations/function.delete.php similarity index 100% rename from src/system/ZikulaRoutesModule/workflows/operations/function.delete.php rename to src/system/RoutesModule/workflows/operations/function.delete.php diff --git a/src/system/ZikulaRoutesModule/workflows/operations/function.update.php b/src/system/RoutesModule/workflows/operations/function.update.php similarity index 100% rename from src/system/ZikulaRoutesModule/workflows/operations/function.update.php rename to src/system/RoutesModule/workflows/operations/function.update.php diff --git a/src/system/ZikulaRoutesModule/zikula.manifest.json b/src/system/RoutesModule/zikula.manifest.json similarity index 100% rename from src/system/ZikulaRoutesModule/zikula.manifest.json rename to src/system/RoutesModule/zikula.manifest.json From 694165e6ad6428b44406fa16f41a1cbcf4206fb6 Mon Sep 17 00:00:00 2001 From: Craig Heydenburg Date: Sun, 16 Aug 2015 19:31:20 -0400 Subject: [PATCH 16/35] simplify composer.jsob autoload settings --- composer.json | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/composer.json b/composer.json index f5905aae5d..a7d2391ff1 100644 --- a/composer.json +++ b/composer.json @@ -7,7 +7,6 @@ "prefer-stable": true, "autoload": { "psr-0": { - "Zikula\\Module\\": "src/system", "Zikula\\Theme\\": "src/themes", "Zikula\\": "src/lib", "Zikula_": "src/lib/legacy", @@ -15,20 +14,7 @@ "CustomBundle\\": "src/app/custom" }, "psr-4": { - "Zikula\\AdminModule\\": "src/system/AdminModule", - "Zikula\\BlocksModule\\": "src/system/BlocksModule", - "Zikula\\CategoriesModule\\": "src/system/CategoriesModule", - "Zikula\\ExtensionsModule\\": "src/system/ExtensionsModule", - "Zikula\\GroupsModule\\": "src/system/GroupsModule", - "Zikula\\MailerModule\\": "src/system/MailerModule", - "Zikula\\PageLockModule\\": "src/system/PageLockModule", - "Zikula\\PermissionsModule\\": "src/system/PermissionsModule", - "Zikula\\RoutesModule\\": "src/system/ZikulaRoutesModule", - "Zikula\\SearchModule\\": "src/system/SearchModule", - "Zikula\\SecurityCenterModule\\": "src/system/SecurityCenterModule", - "Zikula\\SettingsModule\\": "src/system/SettingsModule", - "Zikula\\ThemeModule\\": "src/system/ThemeModule", - "Zikula\\UsersModule\\": "src/system/UsersModule" + "Zikula\\": "src/system" }, "classmap": [ "src/lib/util/", From daebf6258dc69ce3ba033d5eca02e77d137888ef Mon Sep 17 00:00:00 2001 From: Craig Heydenburg Date: Sun, 16 Aug 2015 20:03:33 -0400 Subject: [PATCH 17/35] remove unneeded or commented code related to theme autoloading. (all themes are persisted) --- composer.json | 1 - src/app/ZikulaKernel.php | 6 ------ 2 files changed, 7 deletions(-) diff --git a/composer.json b/composer.json index a7d2391ff1..d77be3ab34 100644 --- a/composer.json +++ b/composer.json @@ -7,7 +7,6 @@ "prefer-stable": true, "autoload": { "psr-0": { - "Zikula\\Theme\\": "src/themes", "Zikula\\": "src/lib", "Zikula_": "src/lib/legacy", "DoctrineExtensions\\StandardFields\\": "src/lib/legacy", diff --git a/src/app/ZikulaKernel.php b/src/app/ZikulaKernel.php index 6d6f2c32af..f3b1b5118c 100644 --- a/src/app/ZikulaKernel.php +++ b/src/app/ZikulaKernel.php @@ -77,12 +77,6 @@ private function registerCoreModules(array &$bundles) $bundles[] = new Zikula\ThemeModule\ZikulaThemeModule(); $bundles[] = new Zikula\UsersModule\ZikulaUsersModule(); $bundles[] = new Zikula\RoutesModule\ZikulaRoutesModule(); -// $bundles[] = new Zikula\Theme\Andreas08Theme\ZikulaAndreas08Theme(); -// $bundles[] = new Zikula\Theme\AtomTheme\ZikulaAtomTheme(); -// $bundles[] = new Zikula\Theme\RssTheme\ZikulaRssTheme(); -// $bundles[] = new Zikula\Theme\PrinterTheme\ZikulaPrinterTheme(); -// $bundles[] = new Zikula\Theme\MobileTheme\ZikulaMobileTheme(); -// $bundles[] = new Zikula\Theme\SeaBreezeTheme\ZikulaSeaBreezeTheme(); $boot = new \Zikula\Bundle\CoreBundle\Bundle\Bootstrap(); $boot->getPersistedBundles($this, $bundles); From 183e7cdaa7eb6e68cf032d779c5ec801c9f4de30 Mon Sep 17 00:00:00 2001 From: Craig Heydenburg Date: Sun, 16 Aug 2015 20:25:08 -0400 Subject: [PATCH 18/35] convert Andreas08Theme to psr-4 --- .gitignore | 3 +-- .../Andreas08Theme/Andreas08ThemeVersion.php | 2 +- .../Andreas08Theme/Resources/config/admin.ini | 0 .../Andreas08Theme/Resources/config/home.ini | 0 .../Andreas08Theme/Resources/config/master.ini | 0 .../Andreas08Theme/Resources/config/overrides.yml | 0 .../Resources/config/pageconfigurations.ini | 0 .../Resources/config/themepalettes.ini | 0 .../Resources/config/themevariables.ini | 0 .../css/ZikulaBlocksModule/menutree/horizontal.css | 0 .../Resources/public/css/fluid960gs/960.css | 0 .../Resources/public/css/fluid960gs/grid.css | 0 .../Resources/public/css/fluid960gs/ie.css | 0 .../Resources/public/css/fluid960gs/ie6.css | 0 .../Resources/public/css/fluid960gs/reset.css | 0 .../Andreas08Theme/Resources/public/css/style.css | 0 .../Resources/public/images/preview_large.png | Bin .../Resources/public/images/preview_medium.png | Bin .../Resources/public/images/preview_small.png | Bin .../translations/zikulaandreas08theme.en.po | 10 ++++++++++ .../Andreas08Theme/Resources/views/admin.tpl | 0 .../Andreas08Theme/Resources/views/blocks/block.tpl | 0 .../Resources/views/blocks/searchblock.tpl | 0 .../Resources/views/blocks/topnavblock.tpl | 0 .../Andreas08Theme/Resources/views/body/1col.tpl | 0 .../Andreas08Theme/Resources/views/body/2col.tpl | 0 .../Resources/views/body/2col_w_centerblock.tpl | 0 .../Andreas08Theme/Resources/views/body/3col.tpl | 0 .../Resources/views/body/3col_w_centerblock.tpl | 0 .../Andreas08Theme/Resources/views/home.tpl | 0 .../Resources/views/includes/footer.tpl | 0 .../Resources/views/includes/header.tpl | 0 .../Andreas08Theme/Resources/views/master.tpl | 0 .../ZikulaBlocksModule/Block/Extmenu/topnav.tpl | 0 .../modules/ZikulaSearchModule/Block/search.tpl | 0 .../Andreas08Theme/ZikulaAndreas08Theme.php | 2 +- .../{Zikula/Theme => }/Andreas08Theme/composer.json | 4 ++-- 37 files changed, 15 insertions(+), 6 deletions(-) rename src/themes/{Zikula/Theme => }/Andreas08Theme/Andreas08ThemeVersion.php (93%) rename src/themes/{Zikula/Theme => }/Andreas08Theme/Resources/config/admin.ini (100%) rename src/themes/{Zikula/Theme => }/Andreas08Theme/Resources/config/home.ini (100%) rename src/themes/{Zikula/Theme => }/Andreas08Theme/Resources/config/master.ini (100%) rename src/themes/{Zikula/Theme => }/Andreas08Theme/Resources/config/overrides.yml (100%) rename src/themes/{Zikula/Theme => }/Andreas08Theme/Resources/config/pageconfigurations.ini (100%) rename src/themes/{Zikula/Theme => }/Andreas08Theme/Resources/config/themepalettes.ini (100%) rename src/themes/{Zikula/Theme => }/Andreas08Theme/Resources/config/themevariables.ini (100%) rename src/themes/{Zikula/Theme => }/Andreas08Theme/Resources/public/css/ZikulaBlocksModule/menutree/horizontal.css (100%) rename src/themes/{Zikula/Theme => }/Andreas08Theme/Resources/public/css/fluid960gs/960.css (100%) rename src/themes/{Zikula/Theme => }/Andreas08Theme/Resources/public/css/fluid960gs/grid.css (100%) rename src/themes/{Zikula/Theme => }/Andreas08Theme/Resources/public/css/fluid960gs/ie.css (100%) rename src/themes/{Zikula/Theme => }/Andreas08Theme/Resources/public/css/fluid960gs/ie6.css (100%) rename src/themes/{Zikula/Theme => }/Andreas08Theme/Resources/public/css/fluid960gs/reset.css (100%) rename src/themes/{Zikula/Theme => }/Andreas08Theme/Resources/public/css/style.css (100%) rename src/themes/{Zikula/Theme => }/Andreas08Theme/Resources/public/images/preview_large.png (100%) rename src/themes/{Zikula/Theme => }/Andreas08Theme/Resources/public/images/preview_medium.png (100%) rename src/themes/{Zikula/Theme => }/Andreas08Theme/Resources/public/images/preview_small.png (100%) create mode 100644 src/themes/Andreas08Theme/Resources/translations/zikulaandreas08theme.en.po rename src/themes/{Zikula/Theme => }/Andreas08Theme/Resources/views/admin.tpl (100%) rename src/themes/{Zikula/Theme => }/Andreas08Theme/Resources/views/blocks/block.tpl (100%) rename src/themes/{Zikula/Theme => }/Andreas08Theme/Resources/views/blocks/searchblock.tpl (100%) rename src/themes/{Zikula/Theme => }/Andreas08Theme/Resources/views/blocks/topnavblock.tpl (100%) rename src/themes/{Zikula/Theme => }/Andreas08Theme/Resources/views/body/1col.tpl (100%) rename src/themes/{Zikula/Theme => }/Andreas08Theme/Resources/views/body/2col.tpl (100%) rename src/themes/{Zikula/Theme => }/Andreas08Theme/Resources/views/body/2col_w_centerblock.tpl (100%) rename src/themes/{Zikula/Theme => }/Andreas08Theme/Resources/views/body/3col.tpl (100%) rename src/themes/{Zikula/Theme => }/Andreas08Theme/Resources/views/body/3col_w_centerblock.tpl (100%) rename src/themes/{Zikula/Theme => }/Andreas08Theme/Resources/views/home.tpl (100%) rename src/themes/{Zikula/Theme => }/Andreas08Theme/Resources/views/includes/footer.tpl (100%) rename src/themes/{Zikula/Theme => }/Andreas08Theme/Resources/views/includes/header.tpl (100%) rename src/themes/{Zikula/Theme => }/Andreas08Theme/Resources/views/master.tpl (100%) rename src/themes/{Zikula/Theme => }/Andreas08Theme/Resources/views/modules/ZikulaBlocksModule/Block/Extmenu/topnav.tpl (100%) rename src/themes/{Zikula/Theme => }/Andreas08Theme/Resources/views/modules/ZikulaSearchModule/Block/search.tpl (100%) rename src/themes/{Zikula/Theme => }/Andreas08Theme/ZikulaAndreas08Theme.php (75%) rename src/themes/{Zikula/Theme => }/Andreas08Theme/composer.json (73%) diff --git a/.gitignore b/.gitignore index 18e2d68646..5bac768d39 100644 --- a/.gitignore +++ b/.gitignore @@ -14,13 +14,12 @@ /src/modules/* !/src/modules/acme-example /src/themes/* -!/src/themes/Zikula/Theme/Andreas08Theme +!/src/themes/Andreas08Theme !/src/themes/Zikula/Theme/AtomTheme !/src/themes/Zikula/Theme/BootstrapTheme !/src/themes/Zikula/Theme/MobileTheme !/src/themes/Zikula/Theme/PrinterTheme !/src/themes/Zikula/Theme/RssTheme -!/src/themes/Zikula/Theme/SeaBreezeTheme !/src/themes/SeaBreezeTheme /src/app/Resources/locale/* !/src/app/Resources/locale/en diff --git a/src/themes/Zikula/Theme/Andreas08Theme/Andreas08ThemeVersion.php b/src/themes/Andreas08Theme/Andreas08ThemeVersion.php similarity index 93% rename from src/themes/Zikula/Theme/Andreas08Theme/Andreas08ThemeVersion.php rename to src/themes/Andreas08Theme/Andreas08ThemeVersion.php index 4537eb0bf2..21db880fee 100644 --- a/src/themes/Zikula/Theme/Andreas08Theme/Andreas08ThemeVersion.php +++ b/src/themes/Andreas08Theme/Andreas08ThemeVersion.php @@ -1,6 +1,6 @@ =5.4.1" }, "extra": { "zikula" : { - "class": "Zikula\\Theme\\Andreas08Theme\\ZikulaAndreas08Theme" + "class": "Zikula\\Andreas08Theme\\ZikulaAndreas08Theme" } } } From 622c69580e98f8725d141ce14f45e29f514a39e9 Mon Sep 17 00:00:00 2001 From: Craig Heydenburg Date: Sun, 16 Aug 2015 20:30:17 -0400 Subject: [PATCH 19/35] convert AtomTheme to psr-4 --- .gitignore | 2 +- .../{Zikula/Theme => }/AtomTheme/AtomThemeVersion.php | 2 +- .../Theme => }/AtomTheme/Resources/config/master.ini | 0 .../AtomTheme/Resources/config/pageconfigurations.ini | 0 .../AtomTheme/Resources/config/themevariables.ini | 0 .../Resources/translations/zikulaatomtheme.en.po | 10 ++++++++++ .../Theme => }/AtomTheme/Resources/views/master.tpl | 0 .../{Zikula/Theme => }/AtomTheme/ZikulaAtomTheme.php | 2 +- src/themes/{Zikula/Theme => }/AtomTheme/composer.json | 4 ++-- .../Theme => }/AtomTheme/plugins/function.id.php | 0 .../Theme => }/AtomTheme/plugins/function.updated.php | 0 .../AtomTheme/plugins/modifier.published.php | 0 .../Theme => }/AtomTheme/plugins/modifier.updated.php | 0 13 files changed, 15 insertions(+), 5 deletions(-) rename src/themes/{Zikula/Theme => }/AtomTheme/AtomThemeVersion.php (94%) rename src/themes/{Zikula/Theme => }/AtomTheme/Resources/config/master.ini (100%) rename src/themes/{Zikula/Theme => }/AtomTheme/Resources/config/pageconfigurations.ini (100%) rename src/themes/{Zikula/Theme => }/AtomTheme/Resources/config/themevariables.ini (100%) create mode 100644 src/themes/AtomTheme/Resources/translations/zikulaatomtheme.en.po rename src/themes/{Zikula/Theme => }/AtomTheme/Resources/views/master.tpl (100%) rename src/themes/{Zikula/Theme => }/AtomTheme/ZikulaAtomTheme.php (77%) rename src/themes/{Zikula/Theme => }/AtomTheme/composer.json (75%) rename src/themes/{Zikula/Theme => }/AtomTheme/plugins/function.id.php (100%) rename src/themes/{Zikula/Theme => }/AtomTheme/plugins/function.updated.php (100%) rename src/themes/{Zikula/Theme => }/AtomTheme/plugins/modifier.published.php (100%) rename src/themes/{Zikula/Theme => }/AtomTheme/plugins/modifier.updated.php (100%) diff --git a/.gitignore b/.gitignore index 5bac768d39..c3a2e61670 100644 --- a/.gitignore +++ b/.gitignore @@ -15,7 +15,7 @@ !/src/modules/acme-example /src/themes/* !/src/themes/Andreas08Theme -!/src/themes/Zikula/Theme/AtomTheme +!/src/themes/AtomTheme !/src/themes/Zikula/Theme/BootstrapTheme !/src/themes/Zikula/Theme/MobileTheme !/src/themes/Zikula/Theme/PrinterTheme diff --git a/src/themes/Zikula/Theme/AtomTheme/AtomThemeVersion.php b/src/themes/AtomTheme/AtomThemeVersion.php similarity index 94% rename from src/themes/Zikula/Theme/AtomTheme/AtomThemeVersion.php rename to src/themes/AtomTheme/AtomThemeVersion.php index 691ae5b29c..9da633c9be 100644 --- a/src/themes/Zikula/Theme/AtomTheme/AtomThemeVersion.php +++ b/src/themes/AtomTheme/AtomThemeVersion.php @@ -1,6 +1,6 @@ =5.4.1" }, "extra": { "zikula" : { - "class": "Zikula\\Theme\\AtomTheme\\ZikulaAtomTheme" + "class": "Zikula\\AtomTheme\\ZikulaAtomTheme" } } } diff --git a/src/themes/Zikula/Theme/AtomTheme/plugins/function.id.php b/src/themes/AtomTheme/plugins/function.id.php similarity index 100% rename from src/themes/Zikula/Theme/AtomTheme/plugins/function.id.php rename to src/themes/AtomTheme/plugins/function.id.php diff --git a/src/themes/Zikula/Theme/AtomTheme/plugins/function.updated.php b/src/themes/AtomTheme/plugins/function.updated.php similarity index 100% rename from src/themes/Zikula/Theme/AtomTheme/plugins/function.updated.php rename to src/themes/AtomTheme/plugins/function.updated.php diff --git a/src/themes/Zikula/Theme/AtomTheme/plugins/modifier.published.php b/src/themes/AtomTheme/plugins/modifier.published.php similarity index 100% rename from src/themes/Zikula/Theme/AtomTheme/plugins/modifier.published.php rename to src/themes/AtomTheme/plugins/modifier.published.php diff --git a/src/themes/Zikula/Theme/AtomTheme/plugins/modifier.updated.php b/src/themes/AtomTheme/plugins/modifier.updated.php similarity index 100% rename from src/themes/Zikula/Theme/AtomTheme/plugins/modifier.updated.php rename to src/themes/AtomTheme/plugins/modifier.updated.php From 1eb2fc563464595fc4f32f330e83663c7517b7f1 Mon Sep 17 00:00:00 2001 From: Craig Heydenburg Date: Sun, 16 Aug 2015 20:39:50 -0400 Subject: [PATCH 20/35] convert BootstrapTheme to psr-4 --- .gitignore | 2 +- .../BootstrapTheme/BootstrapThemeVersion.php | 2 +- .../{Zikula/Theme => }/BootstrapTheme/README.md | 2 +- .../BootstrapTheme/Resources/config/admin.ini | 0 .../BootstrapTheme/Resources/config/home.ini | 0 .../BootstrapTheme/Resources/config/master.ini | 0 .../BootstrapTheme/Resources/config/overrides.yml | 0 .../Resources/config/pageconfigurations.ini | 0 .../Resources/config/themepalettes.ini | 0 .../Resources/config/themevariables.ini | 0 .../BootstrapTheme/Resources/public/css/style.css | 0 .../Resources/public/images/preview_large.png | Bin .../Resources/public/images/preview_medium.png | Bin .../Resources/public/images/preview_small.png | Bin .../translations/zikulabootstraptheme.en.po | 10 ++++++++++ .../BootstrapTheme/Resources/views/admin.tpl | 0 .../BootstrapTheme/Resources/views/blocks/block.tpl | 0 .../Resources/views/blocks/searchblock.tpl | 0 .../Resources/views/blocks/topnavblock.tpl | 0 .../BootstrapTheme/Resources/views/body/1col.tpl | 0 .../BootstrapTheme/Resources/views/body/2col.tpl | 0 .../Resources/views/body/2col_w_centerblock.tpl | 0 .../BootstrapTheme/Resources/views/body/3col.tpl | 0 .../Resources/views/body/3col_w_centerblock.tpl | 0 .../BootstrapTheme/Resources/views/home.tpl | 0 .../Resources/views/includes/footer.tpl | 0 .../Resources/views/includes/header.tpl | 0 .../Resources/views/includes/main_menu.tpl | 0 .../BootstrapTheme/Resources/views/master.tpl | 0 .../modules/ZikulaThemeModule/moduleheader.tpl | 0 .../views/modules/ZikulaUsersModule/User/main.tpl | 0 .../BootstrapTheme/ZikulaBootstrapTheme.php | 2 +- .../{Zikula/Theme => }/BootstrapTheme/composer.json | 4 ++-- 33 files changed, 16 insertions(+), 6 deletions(-) rename src/themes/{Zikula/Theme => }/BootstrapTheme/BootstrapThemeVersion.php (92%) rename src/themes/{Zikula/Theme => }/BootstrapTheme/README.md (91%) rename src/themes/{Zikula/Theme => }/BootstrapTheme/Resources/config/admin.ini (100%) rename src/themes/{Zikula/Theme => }/BootstrapTheme/Resources/config/home.ini (100%) rename src/themes/{Zikula/Theme => }/BootstrapTheme/Resources/config/master.ini (100%) rename src/themes/{Zikula/Theme => }/BootstrapTheme/Resources/config/overrides.yml (100%) rename src/themes/{Zikula/Theme => }/BootstrapTheme/Resources/config/pageconfigurations.ini (100%) rename src/themes/{Zikula/Theme => }/BootstrapTheme/Resources/config/themepalettes.ini (100%) rename src/themes/{Zikula/Theme => }/BootstrapTheme/Resources/config/themevariables.ini (100%) rename src/themes/{Zikula/Theme => }/BootstrapTheme/Resources/public/css/style.css (100%) rename src/themes/{Zikula/Theme => }/BootstrapTheme/Resources/public/images/preview_large.png (100%) rename src/themes/{Zikula/Theme => }/BootstrapTheme/Resources/public/images/preview_medium.png (100%) rename src/themes/{Zikula/Theme => }/BootstrapTheme/Resources/public/images/preview_small.png (100%) create mode 100644 src/themes/BootstrapTheme/Resources/translations/zikulabootstraptheme.en.po rename src/themes/{Zikula/Theme => }/BootstrapTheme/Resources/views/admin.tpl (100%) rename src/themes/{Zikula/Theme => }/BootstrapTheme/Resources/views/blocks/block.tpl (100%) rename src/themes/{Zikula/Theme => }/BootstrapTheme/Resources/views/blocks/searchblock.tpl (100%) rename src/themes/{Zikula/Theme => }/BootstrapTheme/Resources/views/blocks/topnavblock.tpl (100%) rename src/themes/{Zikula/Theme => }/BootstrapTheme/Resources/views/body/1col.tpl (100%) rename src/themes/{Zikula/Theme => }/BootstrapTheme/Resources/views/body/2col.tpl (100%) rename src/themes/{Zikula/Theme => }/BootstrapTheme/Resources/views/body/2col_w_centerblock.tpl (100%) rename src/themes/{Zikula/Theme => }/BootstrapTheme/Resources/views/body/3col.tpl (100%) rename src/themes/{Zikula/Theme => }/BootstrapTheme/Resources/views/body/3col_w_centerblock.tpl (100%) rename src/themes/{Zikula/Theme => }/BootstrapTheme/Resources/views/home.tpl (100%) rename src/themes/{Zikula/Theme => }/BootstrapTheme/Resources/views/includes/footer.tpl (100%) rename src/themes/{Zikula/Theme => }/BootstrapTheme/Resources/views/includes/header.tpl (100%) rename src/themes/{Zikula/Theme => }/BootstrapTheme/Resources/views/includes/main_menu.tpl (100%) rename src/themes/{Zikula/Theme => }/BootstrapTheme/Resources/views/master.tpl (100%) rename src/themes/{Zikula/Theme => }/BootstrapTheme/Resources/views/modules/ZikulaThemeModule/moduleheader.tpl (100%) rename src/themes/{Zikula/Theme => }/BootstrapTheme/Resources/views/modules/ZikulaUsersModule/User/main.tpl (100%) rename src/themes/{Zikula/Theme => }/BootstrapTheme/ZikulaBootstrapTheme.php (75%) rename src/themes/{Zikula/Theme => }/BootstrapTheme/composer.json (73%) diff --git a/.gitignore b/.gitignore index c3a2e61670..edcec5e4a2 100644 --- a/.gitignore +++ b/.gitignore @@ -16,7 +16,7 @@ /src/themes/* !/src/themes/Andreas08Theme !/src/themes/AtomTheme -!/src/themes/Zikula/Theme/BootstrapTheme +!/src/themes/BootstrapTheme !/src/themes/Zikula/Theme/MobileTheme !/src/themes/Zikula/Theme/PrinterTheme !/src/themes/Zikula/Theme/RssTheme diff --git a/src/themes/Zikula/Theme/BootstrapTheme/BootstrapThemeVersion.php b/src/themes/BootstrapTheme/BootstrapThemeVersion.php similarity index 92% rename from src/themes/Zikula/Theme/BootstrapTheme/BootstrapThemeVersion.php rename to src/themes/BootstrapTheme/BootstrapThemeVersion.php index d0fc898d9f..1d3dae8958 100644 --- a/src/themes/Zikula/Theme/BootstrapTheme/BootstrapThemeVersion.php +++ b/src/themes/BootstrapTheme/BootstrapThemeVersion.php @@ -1,6 +1,6 @@ =5.4.1" }, "extra": { "zikula" : { - "class": "Zikula\\Theme\\BootstrapTheme\\ZikulaBootstrapTheme" + "class": "Zikula\\BootstrapTheme\\ZikulaBootstrapTheme" } } } From c3c8cc7524498201dafb5965d8ba7c3bbbeeb401 Mon Sep 17 00:00:00 2001 From: Craig Heydenburg Date: Sun, 16 Aug 2015 20:46:00 -0400 Subject: [PATCH 21/35] convert PrinterTheme to psr-4 --- .gitignore | 3 +-- .../Theme => }/PrinterTheme/PrinterThemeVersion.php | 2 +- .../PrinterTheme/Resources/config/master.ini | 0 .../Resources/config/pageconfigurations.ini | 0 .../PrinterTheme/Resources/config/themepalettes.ini | 0 .../Resources/config/themevariables.ini | 0 .../PrinterTheme/Resources/public/css/style.css | 0 .../PrinterTheme/Resources/public/images/logo.gif | Bin .../Resources/translations/zikulaprintertheme.en.po | 10 ++++++++++ .../PrinterTheme/Resources/views/master.tpl | 0 .../Theme => }/PrinterTheme/ZikulaPrinterTheme.php | 2 +- .../{Zikula/Theme => }/PrinterTheme/composer.json | 4 ++-- .../PrinterTheme/plugins/function.footnotes.php | 0 .../PrinterTheme/plugins/modifier.footnotes.php | 0 14 files changed, 15 insertions(+), 6 deletions(-) rename src/themes/{Zikula/Theme => }/PrinterTheme/PrinterThemeVersion.php (93%) rename src/themes/{Zikula/Theme => }/PrinterTheme/Resources/config/master.ini (100%) rename src/themes/{Zikula/Theme => }/PrinterTheme/Resources/config/pageconfigurations.ini (100%) rename src/themes/{Zikula/Theme => }/PrinterTheme/Resources/config/themepalettes.ini (100%) rename src/themes/{Zikula/Theme => }/PrinterTheme/Resources/config/themevariables.ini (100%) rename src/themes/{Zikula/Theme => }/PrinterTheme/Resources/public/css/style.css (100%) rename src/themes/{Zikula/Theme => }/PrinterTheme/Resources/public/images/logo.gif (100%) create mode 100644 src/themes/PrinterTheme/Resources/translations/zikulaprintertheme.en.po rename src/themes/{Zikula/Theme => }/PrinterTheme/Resources/views/master.tpl (100%) rename src/themes/{Zikula/Theme => }/PrinterTheme/ZikulaPrinterTheme.php (76%) rename src/themes/{Zikula/Theme => }/PrinterTheme/composer.json (74%) rename src/themes/{Zikula/Theme => }/PrinterTheme/plugins/function.footnotes.php (100%) rename src/themes/{Zikula/Theme => }/PrinterTheme/plugins/modifier.footnotes.php (100%) diff --git a/.gitignore b/.gitignore index edcec5e4a2..8e0906ee18 100644 --- a/.gitignore +++ b/.gitignore @@ -17,8 +17,7 @@ !/src/themes/Andreas08Theme !/src/themes/AtomTheme !/src/themes/BootstrapTheme -!/src/themes/Zikula/Theme/MobileTheme -!/src/themes/Zikula/Theme/PrinterTheme +!/src/themes/PrinterTheme !/src/themes/Zikula/Theme/RssTheme !/src/themes/SeaBreezeTheme /src/app/Resources/locale/* diff --git a/src/themes/Zikula/Theme/PrinterTheme/PrinterThemeVersion.php b/src/themes/PrinterTheme/PrinterThemeVersion.php similarity index 93% rename from src/themes/Zikula/Theme/PrinterTheme/PrinterThemeVersion.php rename to src/themes/PrinterTheme/PrinterThemeVersion.php index b87bf9bd8d..49dead5b9a 100644 --- a/src/themes/Zikula/Theme/PrinterTheme/PrinterThemeVersion.php +++ b/src/themes/PrinterTheme/PrinterThemeVersion.php @@ -1,6 +1,6 @@ =5.4.1" }, "extra": { "zikula" : { - "class": "Zikula\\Theme\\PrinterTheme\\ZikulaPrinterTheme" + "class": "Zikula\\PrinterTheme\\ZikulaPrinterTheme" } } } diff --git a/src/themes/Zikula/Theme/PrinterTheme/plugins/function.footnotes.php b/src/themes/PrinterTheme/plugins/function.footnotes.php similarity index 100% rename from src/themes/Zikula/Theme/PrinterTheme/plugins/function.footnotes.php rename to src/themes/PrinterTheme/plugins/function.footnotes.php diff --git a/src/themes/Zikula/Theme/PrinterTheme/plugins/modifier.footnotes.php b/src/themes/PrinterTheme/plugins/modifier.footnotes.php similarity index 100% rename from src/themes/Zikula/Theme/PrinterTheme/plugins/modifier.footnotes.php rename to src/themes/PrinterTheme/plugins/modifier.footnotes.php From 07b377be044823ce3ad7c454d3c59386f9ea630d Mon Sep 17 00:00:00 2001 From: Craig Heydenburg Date: Sun, 16 Aug 2015 20:48:37 -0400 Subject: [PATCH 22/35] convert RssTheme to psr-4 --- .gitignore | 3 +-- .../Theme => }/RssTheme/Resources/config/master.ini | 0 .../RssTheme/Resources/config/pageconfigurations.ini | 0 .../RssTheme/Resources/config/themepalettes.ini | 0 .../RssTheme/Resources/config/themevariables.ini | 0 .../Resources/translations/zikularsstheme.en.po | 10 ++++++++++ .../Theme => }/RssTheme/Resources/views/master.tpl | 0 .../{Zikula/Theme => }/RssTheme/RssThemeVersion.php | 2 +- .../{Zikula/Theme => }/RssTheme/ZikulaRssTheme.php | 2 +- src/themes/{Zikula/Theme => }/RssTheme/composer.json | 4 ++-- .../Theme => }/RssTheme/plugins/function.updated.php | 0 .../Theme => }/RssTheme/plugins/function.xmlHeader.php | 0 .../Theme => }/RssTheme/plugins/modifier.published.php | 0 .../Theme => }/RssTheme/plugins/modifier.updated.php | 0 14 files changed, 15 insertions(+), 6 deletions(-) rename src/themes/{Zikula/Theme => }/RssTheme/Resources/config/master.ini (100%) rename src/themes/{Zikula/Theme => }/RssTheme/Resources/config/pageconfigurations.ini (100%) rename src/themes/{Zikula/Theme => }/RssTheme/Resources/config/themepalettes.ini (100%) rename src/themes/{Zikula/Theme => }/RssTheme/Resources/config/themevariables.ini (100%) create mode 100644 src/themes/RssTheme/Resources/translations/zikularsstheme.en.po rename src/themes/{Zikula/Theme => }/RssTheme/Resources/views/master.tpl (100%) rename src/themes/{Zikula/Theme => }/RssTheme/RssThemeVersion.php (94%) rename src/themes/{Zikula/Theme => }/RssTheme/ZikulaRssTheme.php (77%) rename src/themes/{Zikula/Theme => }/RssTheme/composer.json (76%) rename src/themes/{Zikula/Theme => }/RssTheme/plugins/function.updated.php (100%) rename src/themes/{Zikula/Theme => }/RssTheme/plugins/function.xmlHeader.php (100%) rename src/themes/{Zikula/Theme => }/RssTheme/plugins/modifier.published.php (100%) rename src/themes/{Zikula/Theme => }/RssTheme/plugins/modifier.updated.php (100%) diff --git a/.gitignore b/.gitignore index 8e0906ee18..8e7ed58386 100644 --- a/.gitignore +++ b/.gitignore @@ -12,13 +12,12 @@ /src/config/personal_config.php /src/config/multisites_config.php /src/modules/* -!/src/modules/acme-example /src/themes/* !/src/themes/Andreas08Theme !/src/themes/AtomTheme !/src/themes/BootstrapTheme !/src/themes/PrinterTheme -!/src/themes/Zikula/Theme/RssTheme +!/src/themes/RssTheme !/src/themes/SeaBreezeTheme /src/app/Resources/locale/* !/src/app/Resources/locale/en diff --git a/src/themes/Zikula/Theme/RssTheme/Resources/config/master.ini b/src/themes/RssTheme/Resources/config/master.ini similarity index 100% rename from src/themes/Zikula/Theme/RssTheme/Resources/config/master.ini rename to src/themes/RssTheme/Resources/config/master.ini diff --git a/src/themes/Zikula/Theme/RssTheme/Resources/config/pageconfigurations.ini b/src/themes/RssTheme/Resources/config/pageconfigurations.ini similarity index 100% rename from src/themes/Zikula/Theme/RssTheme/Resources/config/pageconfigurations.ini rename to src/themes/RssTheme/Resources/config/pageconfigurations.ini diff --git a/src/themes/Zikula/Theme/RssTheme/Resources/config/themepalettes.ini b/src/themes/RssTheme/Resources/config/themepalettes.ini similarity index 100% rename from src/themes/Zikula/Theme/RssTheme/Resources/config/themepalettes.ini rename to src/themes/RssTheme/Resources/config/themepalettes.ini diff --git a/src/themes/Zikula/Theme/RssTheme/Resources/config/themevariables.ini b/src/themes/RssTheme/Resources/config/themevariables.ini similarity index 100% rename from src/themes/Zikula/Theme/RssTheme/Resources/config/themevariables.ini rename to src/themes/RssTheme/Resources/config/themevariables.ini diff --git a/src/themes/RssTheme/Resources/translations/zikularsstheme.en.po b/src/themes/RssTheme/Resources/translations/zikularsstheme.en.po new file mode 100644 index 0000000000..08f856e419 --- /dev/null +++ b/src/themes/RssTheme/Resources/translations/zikularsstheme.en.po @@ -0,0 +1,10 @@ +msgid "" +msgstr "" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: en\n" + +msgid "RSS" +msgstr "RSS" +msgid "The RSS theme is an auxiliary theme designed specially for outputting pages as an RSS feed." +msgstr "The RSS theme is an auxiliary theme designed specially for outputting pages as an RSS feed." \ No newline at end of file diff --git a/src/themes/Zikula/Theme/RssTheme/Resources/views/master.tpl b/src/themes/RssTheme/Resources/views/master.tpl similarity index 100% rename from src/themes/Zikula/Theme/RssTheme/Resources/views/master.tpl rename to src/themes/RssTheme/Resources/views/master.tpl diff --git a/src/themes/Zikula/Theme/RssTheme/RssThemeVersion.php b/src/themes/RssTheme/RssThemeVersion.php similarity index 94% rename from src/themes/Zikula/Theme/RssTheme/RssThemeVersion.php rename to src/themes/RssTheme/RssThemeVersion.php index 8ca8e02c5c..52e0901c6d 100644 --- a/src/themes/Zikula/Theme/RssTheme/RssThemeVersion.php +++ b/src/themes/RssTheme/RssThemeVersion.php @@ -1,6 +1,6 @@ =5.4.1" }, "extra": { "zikula" : { - "class": "Zikula\\Theme\\RssTheme\\ZikulaRssTheme" + "class": "Zikula\\RssTheme\\ZikulaRssTheme" } } } diff --git a/src/themes/Zikula/Theme/RssTheme/plugins/function.updated.php b/src/themes/RssTheme/plugins/function.updated.php similarity index 100% rename from src/themes/Zikula/Theme/RssTheme/plugins/function.updated.php rename to src/themes/RssTheme/plugins/function.updated.php diff --git a/src/themes/Zikula/Theme/RssTheme/plugins/function.xmlHeader.php b/src/themes/RssTheme/plugins/function.xmlHeader.php similarity index 100% rename from src/themes/Zikula/Theme/RssTheme/plugins/function.xmlHeader.php rename to src/themes/RssTheme/plugins/function.xmlHeader.php diff --git a/src/themes/Zikula/Theme/RssTheme/plugins/modifier.published.php b/src/themes/RssTheme/plugins/modifier.published.php similarity index 100% rename from src/themes/Zikula/Theme/RssTheme/plugins/modifier.published.php rename to src/themes/RssTheme/plugins/modifier.published.php diff --git a/src/themes/Zikula/Theme/RssTheme/plugins/modifier.updated.php b/src/themes/RssTheme/plugins/modifier.updated.php similarity index 100% rename from src/themes/Zikula/Theme/RssTheme/plugins/modifier.updated.php rename to src/themes/RssTheme/plugins/modifier.updated.php From bd5bf57a6b947863a44092f9cd679fee4af66e11 Mon Sep 17 00:00:00 2001 From: Craig Heydenburg Date: Sun, 16 Aug 2015 21:10:10 -0400 Subject: [PATCH 23/35] add themes to autoloading for psr-4. this allows the `composer update` to install the assets. --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index d77be3ab34..ce020fa486 100644 --- a/composer.json +++ b/composer.json @@ -13,7 +13,7 @@ "CustomBundle\\": "src/app/custom" }, "psr-4": { - "Zikula\\": "src/system" + "Zikula\\": ["src/system", "src/themes"] }, "classmap": [ "src/lib/util/", From 85bf4138befc6f59feae3e82ed312a7950e1f575 Mon Sep 17 00:00:00 2001 From: Craig Heydenburg Date: Sun, 16 Aug 2015 21:17:18 -0400 Subject: [PATCH 24/35] correct classname path to correct installation error --- .../CoreInstallerBundle/Controller/AjaxInstallController.php | 2 +- .../CoreInstallerBundle/Controller/AjaxUpgradeController.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/Zikula/Bundle/CoreInstallerBundle/Controller/AjaxInstallController.php b/src/lib/Zikula/Bundle/CoreInstallerBundle/Controller/AjaxInstallController.php index a5de4a633e..10ec39efc1 100644 --- a/src/lib/Zikula/Bundle/CoreInstallerBundle/Controller/AjaxInstallController.php +++ b/src/lib/Zikula/Bundle/CoreInstallerBundle/Controller/AjaxInstallController.php @@ -291,7 +291,7 @@ private function finalizeParameters() // add admin email as site email \System::setVar('adminmail', $params['email']); // regenerate the theme list - \Zikula\Module\ThemeModule\Util::regenerate(); + \Zikula\ThemeModule\Util::regenerate(); // add remaining parameters and remove unneeded ones unset($params['username'], $params['password'], $params['email'], $params['dbtabletype']); diff --git a/src/lib/Zikula/Bundle/CoreInstallerBundle/Controller/AjaxUpgradeController.php b/src/lib/Zikula/Bundle/CoreInstallerBundle/Controller/AjaxUpgradeController.php index 21b0823223..7e5b830cf5 100644 --- a/src/lib/Zikula/Bundle/CoreInstallerBundle/Controller/AjaxUpgradeController.php +++ b/src/lib/Zikula/Bundle/CoreInstallerBundle/Controller/AjaxUpgradeController.php @@ -17,7 +17,7 @@ use Symfony\Component\DependencyInjection\ContainerInterface; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Request; -use Zikula\Module\ThemeModule\Util as ThemeUtil; +use Zikula\ThemeModule\Util as ThemeUtil; use Zikula\Bundle\CoreBundle\YamlDumper; /** From f59657c9520dd999d8abeb540cde4d24291679c3 Mon Sep 17 00:00:00 2001 From: Craig Heydenburg Date: Mon, 17 Aug 2015 07:59:35 -0400 Subject: [PATCH 25/35] add comment to upgrade procedure. Themes and modules are already regenerated as part of the upgrade process, so additional steps not required to compensate for change from psr-0 to psr-4. --- .../CoreInstallerBundle/Controller/AjaxUpgradeController.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lib/Zikula/Bundle/CoreInstallerBundle/Controller/AjaxUpgradeController.php b/src/lib/Zikula/Bundle/CoreInstallerBundle/Controller/AjaxUpgradeController.php index 7e5b830cf5..82af51c232 100644 --- a/src/lib/Zikula/Bundle/CoreInstallerBundle/Controller/AjaxUpgradeController.php +++ b/src/lib/Zikula/Bundle/CoreInstallerBundle/Controller/AjaxUpgradeController.php @@ -130,6 +130,7 @@ private function upgradeModules() { // force load the modules admin API \ModUtil::loadApi('ZikulaExtensionsModule', 'admin', true); + // this also regenerates all the modules return \ModUtil::apiFunc('ZikulaExtensionsModule', 'admin', 'upgradeall'); // returns array(array(modname => boolean)) } From 97fb019e9cd74b2cbe8b2a36a999df1ed08c2ae1 Mon Sep 17 00:00:00 2001 From: Craig Heydenburg Date: Mon, 17 Aug 2015 16:35:02 -0400 Subject: [PATCH 26/35] update changelog --- CHANGELOG-1.4.md | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/CHANGELOG-1.4.md b/CHANGELOG-1.4.md index 7815490267..c1cdb9f010 100644 --- a/CHANGELOG-1.4.md +++ b/CHANGELOG-1.4.md @@ -1,6 +1,20 @@ -CHANGELOG - ZIKULA 1.4.0 +CHANGELOG - ZIKULA 1.4.x ------------------------ +* 1.4.1 () + + - Symfony update to 2.7.3(#2551) + - All system modules and themes updated to PSR-4 (#2563, #2424) + - Core-2.0 Theme Specification finalized and enabled (#2500, #2560) + - Core-2.0 Module Specification finalized and enabled (#2500, #2560) + - TranslatorTrait added (#2560) + - Add vierbergenlars/php-semver vendor lib for version comparison (#2560) + - Add Twig-based theme engine (refs #1753) + - Categorization of Entities enabled (#411) + + +* 1.4.0 (2015-07-20) + BC Breaks: - Zikula 1.4.0 requires PHP >=5.4.1 - Removed interactive installer from module specification. From 3e8c47008f0ccebc1e66503d6bca90e518833639 Mon Sep 17 00:00:00 2001 From: Craig Heydenburg Date: Wed, 19 Aug 2015 13:30:37 -0400 Subject: [PATCH 27/35] Add two more BC stub classes needed due to refactoring to psr-4 --- .../CategoriesModule/Entity/CategoryEntity.php | 17 +++++++++++++++++ .../Module/UsersModule/Entity/UserEntity.php | 17 +++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 src/lib/legacy/Zikula/Module/CategoriesModule/Entity/CategoryEntity.php create mode 100644 src/lib/legacy/Zikula/Module/UsersModule/Entity/UserEntity.php diff --git a/src/lib/legacy/Zikula/Module/CategoriesModule/Entity/CategoryEntity.php b/src/lib/legacy/Zikula/Module/CategoriesModule/Entity/CategoryEntity.php new file mode 100644 index 0000000000..f04c8d9ac0 --- /dev/null +++ b/src/lib/legacy/Zikula/Module/CategoriesModule/Entity/CategoryEntity.php @@ -0,0 +1,17 @@ + Date: Fri, 21 Aug 2015 09:47:27 -0400 Subject: [PATCH 28/35] correct method of maintaining BC with psr-0 classes. --- .../Entity/CategoryEntity.php | 17 - .../SearchModule/AbstractSearchable.php | 19 - .../Module/UsersModule/Entity/UserEntity.php | 17 - .../ZikulaCategoriesModule.php | 41 +- .../SearchModule/ZikulaSearchModule.php | 19 + .../UsersModule/Entity/BaseUserEntity.php | 560 ++++++++++++++++++ src/system/UsersModule/Entity/UserEntity.php | 530 +---------------- src/system/UsersModule/ZikulaUsersModule.php | 23 + 8 files changed, 640 insertions(+), 586 deletions(-) delete mode 100644 src/lib/legacy/Zikula/Module/CategoriesModule/Entity/CategoryEntity.php delete mode 100644 src/lib/legacy/Zikula/Module/SearchModule/AbstractSearchable.php delete mode 100644 src/lib/legacy/Zikula/Module/UsersModule/Entity/UserEntity.php create mode 100644 src/system/UsersModule/Entity/BaseUserEntity.php diff --git a/src/lib/legacy/Zikula/Module/CategoriesModule/Entity/CategoryEntity.php b/src/lib/legacy/Zikula/Module/CategoriesModule/Entity/CategoryEntity.php deleted file mode 100644 index f04c8d9ac0..0000000000 --- a/src/lib/legacy/Zikula/Module/CategoriesModule/Entity/CategoryEntity.php +++ /dev/null @@ -1,17 +0,0 @@ -uname = ''; + $this->email = ''; + $this->pass = ''; + $this->passreminder = ''; + $this->activated = 0; + $this->approved_date = new \DateTime("1970-01-01 00:00:00"); + $this->approved_by = 0; + $this->user_regdate = new \DateTime("1970-01-01 00:00:00"); + $this->lastlogin = new \DateTime("1970-01-01 00:00:00"); + $this->theme = ''; + $this->ublockon = 0; + $this->ublock = ''; + $this->tz = ''; + $this->locale = ''; + + $this->attributes = new \Doctrine\Common\Collections\ArrayCollection(); + } + + /** + * get the uid of the user + * + * @return integer the user's uid + */ + public function getUid() + { + return $this->uid; + } + + /** + * set the uid for the user + * + * @param integer $uid the user's uid + */ + public function setUid($uid) + { + $this->uid = $uid; + } + + /** + * get the uname of the user + * + * @return string the user's uname + */ + public function getUname() + { + return $this->uname; + } + + /** + * set the uname for the user + * + * @param string $uname the user's uname + */ + public function setUname($uname) + { + $this->uname = $uname; + } + + /** + * get the email of the user + * + * @return string the user's email + */ + public function getEmail() + { + return $this->email; + } + + /** + * set the email for the user + * + * @param string $email the user's email + */ + public function setEmail($email) + { + $this->email = $email; + } + + /** + * get the password of the user + * + * @return string the user's password + */ + public function getPass() + { + return $this->pass; + } + + /** + * set the password for the user + * + * @param string $pass the user's password + */ + public function setPass($pass) + { + $this->pass = $pass; + } + + /** + * get the password reminder of the user + * + * @return string the user's password reminder + */ + public function getPassreminder() + { + return $this->passreminder; + } + + /** + * set the password reminder for the user + * + * @param string $passreminder the user's password reminder + */ + public function setPassreminder($passreminder) + { + $this->passreminder = $passreminder; + } + + /** + * get the activation status of the user + * + * @return integer the user's activation status + */ + public function getActivated() + { + return $this->activated; + } + + /** + * set the activation status for the user + * + * @param integer $activated the user's activation status + */ + public function setActivated($activated) + { + $this->activated = $activated; + } + + /** + * get the approved date of the user + * + * @return \Datetime the user's approved date + */ + public function getApproved_Date() + { + return $this->approved_date; + } + + /** + * set the approved date for the user + * + * @param \Datetime $approved_date the user's approved date + */ + public function setApproved_Date($approved_date) + { + $this->approved_date = new \DateTime($approved_date); + } + + /** + * get the user id who approved the user + * + * @return integer the user's id who approved the user + */ + public function getApproved_By() + { + return $this->approved_by; + } + + /** + * set the user id who approved the user + * + * @param integer $approved_by the user's id who approved the user + */ + public function setApproved_By($approved_by) + { + $this->approved_by = $approved_by; + } + + /** + * get the regdate of the user + * + * @return \Datetime the user's regdate + */ + public function getUser_Regdate() + { + return $this->user_regdate; + } + + /** + * set the regdate for the user + * + * @param \Datetime $user_regdate the user's regdate + */ + public function setUser_Regdate($user_regdate) + { + $this->user_regdate = new \DateTime($user_regdate); + } + + /** + * get the last login of the user + * + * @return \Datetime the user's last login + */ + public function getLastlogin() + { + return $this->lastlogin; + } + + /** + * set the last login for the user + * + * @param \Datetime $lastlogin the user's last login + */ + public function setLastlogin($lastlogin) + { + $this->lastlogin = new \DateTime($lastlogin); + } + + /** + * get the theme of the user + * + * @return string the user's theme + */ + public function getTheme() + { + return $this->theme; + } + + /** + * set the theme for the user + * + * @param string $theme the user's theme + */ + public function setTheme($theme) + { + $this->theme = $theme; + } + + /** + * get the ublockon of the user + * + * @return integer the user's ublockon + */ + public function getUblockon() + { + return $this->ublockon; + } + + /** + * set the ublockon for the user + * + * @param integer $ublockon the user's ublockon + */ + public function setUblockon($ublockon) + { + $this->ublockon = $ublockon; + } + + /** + * get the ublock of the user + * + * @return string the user's ublock + */ + public function getUblock() + { + return $this->ublock; + } + + /** + * set the ublock for the user + * + * @param string $ublock the user's ublock + */ + public function setUblock($ublock) + { + $this->ublock = $ublock; + } + + /** + * get the tz of the user + * + * @return string the user's tz + */ + public function getTz() + { + return $this->tz; + } + + /** + * set the tz for the user + * + * @param string $tz the user's tz + */ + public function setTz($tz) + { + $this->tz = $tz; + } + + /** + * get the locale of the user + * + * @return string the user's locale + */ + public function getLocale() + { + return $this->locale; + } + + /** + * set the locale for the user + * + * @param string $locale the user's locale + */ + public function setLocale($locale) + { + $this->locale = $locale; + } + + /** + * get the attributes of the user + * + * @return UserAttributeEntity the user's attributes + */ + public function getAttributes() + { + return $this->attributes; + } + + /** + * set the attributes for the user + * + * @param UserAttributeEntity $attributes the attributes for the user + */ + public function setAttributes($attributes) + { + $this->attributes = $attributes; + } + + /** + * set a single attribute for the user + * + * @param $name string attribute name + * @param $value string attribute value + */ + public function setAttribute($name, $value) + { + if (isset($this->attributes[$name])) { + $this->attributes[$name]->setValue($value); + } else { + $this->attributes[$name] = new UserAttributeEntity($this, $name, $value); + } + } + + /** + * delete a single attribute of the user + * + * @param $name string attribute name + */ + public function delAttribute($name) + { + if (isset($this->attributes[$name])) { + $this->attributes->remove($name); + } + } +} diff --git a/src/system/UsersModule/Entity/UserEntity.php b/src/system/UsersModule/Entity/UserEntity.php index 45ad5ee6a1..5e7c7d7c24 100644 --- a/src/system/UsersModule/Entity/UserEntity.php +++ b/src/system/UsersModule/Entity/UserEntity.php @@ -19,535 +19,13 @@ /** * User entity class. * - * We use annotations to define the entity mappings to database (see http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/basic-mapping.html). + * @todo remove this class at Core-2.0 + * see notes in \Zikula\UsersModule\Entity\BaseUserEntity + * This class is not technically deprecated, but will be return to an concrete class in Core-2.0 * * @ORM\Entity * @ORM\Table(name="users",indexes={@ORM\Index(name="uname",columns={"uname"}), @ORM\Index(name="email",columns={"email"})}) - * - * Main Users table. - * Stores core information about each user account. */ -class UserEntity extends EntityAccess +class UserEntity extends BaseUserEntity { - /** - * User ID: Primary user identifier - * - * @ORM\Id - * @ORM\Column(type="integer") - * @ORM\GeneratedValue(strategy="AUTO") - */ - private $uid; - - /** - * User Name: Primary user display name, primary log in identifier. - * - * @ORM\Column(type="string", length=25) - */ - private $uname; - - /** - * E-mail Address: Secondary log in identifier, user notifications. - * For pending registrations awaiting e-mail address verification, this will be an empty string, and the email address for the account will be found in the users_verifychg table. - * ("Regular" user accounts may also have e-mail addresses pending verification in the users_verifychg table, however those are the result of a request to change the account's address.) - * - * @ORM\Column(type="string", length=60) - */ - private $email; - - /** - * Password: User's password for logging in. - * This value is salted and hashed. The salt is stored in this field, delimited from the hash with a dollar sign character ($). - * The hash algorithm is stored as a numeric code in the hash_method field. This field may be blank in instances - * where the user registered with an alternative authentication module (e.g., OpenID) and did not also establish a password for his web site account. - * - * @ORM\Column(type="string", length=138) - */ - private $pass; - - /** - * Password reminder: Set during registration or password changes, to remind the user what his password is. - * - * This field may be blank if pass is blank. - * @ORM\Column(type="string", length=255) - */ - private $passreminder; - - /** - * Account State: The user's current state, see UsersConstant::ACTIVE_* for defined constants. - * A state represented by a negative integer means that the user's account is in a pending state, and should not yet be considered a "real" user account. - * For example, user accounts pending the completion of the registration process (because either moderation, e-mail verification, or both are in use) - * will have a negative integer representing their state. If the user's registration request expires before it the process is completed, or if the administrator - * denies the request for an new account, the user account record will be deleted. - * When this deletion happens, it will be assumed by the system that no external module has yet interacted with the user account record, - * because its state never progressed beyond its pending state, and therefore normal hooks/events may not be triggered - * (although it is possible that events regarding the pending account may be triggered). - * - * @ORM\Column(type="smallint") - */ - private $activated; - - /** - * Account Approved Date/Time: The date and time the user's registration request was approved through the moderation process. - * If the moderation process was not in effect at the time the user made a registration request, then this will be the date and time of the registration request. - * NOTE: This is stored as an SQL datetime, using the UTC time zone. The date/time is NEITHER server local time nor user local time (unless one or the other happens to be UTC). - * WARNING: The date and time related functions available in SQL on many RDBMS servers are highly dependent on the database server's timezone setting. - * All parameters to these functions are treated as if the dates and times they represent are in the time zone that is set in the database server's settings. - * Use of date/time functions in SQL queries should be avoided if at all possible. PHP functions using UTC as the base time zone should be used instead. - * If SQL date/time functions must be used, then care should be taken to ensure that either the function is time zone neutral, - * or that the function and its relationship to time zone settings is completely understood. - * - * @ORM\Column(type="datetime") - */ - private $approved_date; - - /** - * The uid of the user account that approved the request to register a new account. - * If this is the same as the user account's uid, then moderation was not in use at the time the request for a new account was made. - * If this is -1, the the user account that approved the request has since been deleted. If this is 0, the user account has not yet been approved. - * - * @ORM\Column(type="integer") - */ - private $approved_by; - - /** - * Registration Date/Time: Date/time the user account was registered. - * For users not pending the completion of the registration process, this is the date and time the user account completed the process. - * For example, if registrations are moderated, then this is the date and time the registration request was approved. - * If registration e-mail addresses must be verified, then this is the date and time the user completed the verification process. - * If both moderation and verification are in use, then this is the later of those two dates. - * If neither is in use, then this is simply the date and time the user's registration request was made. - * If the user account's activated state is "pending registration" (implying that either moderation, verification, or both are in use) - * then this will be the date and time the user made the registration request UNTIL the registration process is complete, and then it is updated as above. - * NOTE: This is stored as an SQL datetime, using the UTC time zone. The date/time is NEITHER server local time nor user local time. SEE WARNING under approved_date, above. - * - * @ORM\Column(type="datetime") - */ - private $user_regdate; - - /** - * Last Login Date/Time: Date/time user last successfully logged into the site. - * NOTE: This is stored as an SQL datetime, using the UTC time zone. The date/time is NEITHER server local time nor user local time. SEE WARNING under approved_date, above. - * - * @ORM\Column(type="datetime") - */ - private $lastlogin; - - /** - * User's Theme: The name (identifier) of the per-user theme the user would like to use while viewing the site, when user theme switching is enabled. - * - * @ORM\Column(type="string", length=255) - */ - private $theme; - - /** - * User-defined Block On?: Whether the custom user-defined block is displayed or not (1 == true == displayed) - * - * @ORM\Column(type="smallint") - */ - private $ublockon; - - /** - * User-defined Block: Custom user-defined block content. - * - * @ORM\Column(type="text") - */ - private $ublock; - - /** - * User's timezone, as supported by PHP (listed at http://us2.php.net/manual/en/timezones.php), and as expressed by the Olson tz database. - * Optional, if blank then the system default timezone should be used. [FUTURE USE] - * - * @ORM\Column(type="string", length=30) - */ - private $tz; - - /** - * The user's chosen locale for i18n purposes, as defined by gettext, POSIX, and the Common Locale Data Repository; - * Optional, if blank then the system default locale should be used. [FUTURE USE] - * - * @ORM\Column(type="string", length=5) - */ - private $locale; - - /** - * Additional attributes of this user - * - * @ORM\OneToMany(targetEntity="UserAttributeEntity", - * mappedBy="user", - * cascade={"all"}, - * orphanRemoval=true, - * indexBy="name") - */ - private $attributes; - - - /** - * constructor - */ - public function __construct() - { - $this->uname = ''; - $this->email = ''; - $this->pass = ''; - $this->passreminder = ''; - $this->activated = 0; - $this->approved_date = new \DateTime("1970-01-01 00:00:00"); - $this->approved_by = 0; - $this->user_regdate = new \DateTime("1970-01-01 00:00:00"); - $this->lastlogin = new \DateTime("1970-01-01 00:00:00"); - $this->theme = ''; - $this->ublockon = 0; - $this->ublock = ''; - $this->tz = ''; - $this->locale = ''; - - $this->attributes = new \Doctrine\Common\Collections\ArrayCollection(); - } - - /** - * get the uid of the user - * - * @return integer the user's uid - */ - public function getUid() - { - return $this->uid; - } - - /** - * set the uid for the user - * - * @param integer $uid the user's uid - */ - public function setUid($uid) - { - $this->uid = $uid; - } - - /** - * get the uname of the user - * - * @return string the user's uname - */ - public function getUname() - { - return $this->uname; - } - - /** - * set the uname for the user - * - * @param string $uname the user's uname - */ - public function setUname($uname) - { - $this->uname = $uname; - } - - /** - * get the email of the user - * - * @return string the user's email - */ - public function getEmail() - { - return $this->email; - } - - /** - * set the email for the user - * - * @param string $email the user's email - */ - public function setEmail($email) - { - $this->email = $email; - } - - /** - * get the password of the user - * - * @return string the user's password - */ - public function getPass() - { - return $this->pass; - } - - /** - * set the password for the user - * - * @param string $pass the user's password - */ - public function setPass($pass) - { - $this->pass = $pass; - } - - /** - * get the password reminder of the user - * - * @return string the user's password reminder - */ - public function getPassreminder() - { - return $this->passreminder; - } - - /** - * set the password reminder for the user - * - * @param string $passreminder the user's password reminder - */ - public function setPassreminder($passreminder) - { - $this->passreminder = $passreminder; - } - - /** - * get the activation status of the user - * - * @return integer the user's activation status - */ - public function getActivated() - { - return $this->activated; - } - - /** - * set the activation status for the user - * - * @param integer $activated the user's activation status - */ - public function setActivated($activated) - { - $this->activated = $activated; - } - - /** - * get the approved date of the user - * - * @return \Datetime the user's approved date - */ - public function getApproved_Date() - { - return $this->approved_date; - } - - /** - * set the approved date for the user - * - * @param \Datetime $approved_date the user's approved date - */ - public function setApproved_Date($approved_date) - { - $this->approved_date = new \DateTime($approved_date); - } - - /** - * get the user id who approved the user - * - * @return integer the user's id who approved the user - */ - public function getApproved_By() - { - return $this->approved_by; - } - - /** - * set the user id who approved the user - * - * @param integer $approved_by the user's id who approved the user - */ - public function setApproved_By($approved_by) - { - $this->approved_by = $approved_by; - } - - /** - * get the regdate of the user - * - * @return \Datetime the user's regdate - */ - public function getUser_Regdate() - { - return $this->user_regdate; - } - - /** - * set the regdate for the user - * - * @param \Datetime $user_regdate the user's regdate - */ - public function setUser_Regdate($user_regdate) - { - $this->user_regdate = new \DateTime($user_regdate); - } - - /** - * get the last login of the user - * - * @return \Datetime the user's last login - */ - public function getLastlogin() - { - return $this->lastlogin; - } - - /** - * set the last login for the user - * - * @param \Datetime $lastlogin the user's last login - */ - public function setLastlogin($lastlogin) - { - $this->lastlogin = new \DateTime($lastlogin); - } - - /** - * get the theme of the user - * - * @return string the user's theme - */ - public function getTheme() - { - return $this->theme; - } - - /** - * set the theme for the user - * - * @param string $theme the user's theme - */ - public function setTheme($theme) - { - $this->theme = $theme; - } - - /** - * get the ublockon of the user - * - * @return integer the user's ublockon - */ - public function getUblockon() - { - return $this->ublockon; - } - - /** - * set the ublockon for the user - * - * @param integer $ublockon the user's ublockon - */ - public function setUblockon($ublockon) - { - $this->ublockon = $ublockon; - } - - /** - * get the ublock of the user - * - * @return string the user's ublock - */ - public function getUblock() - { - return $this->ublock; - } - - /** - * set the ublock for the user - * - * @param string $ublock the user's ublock - */ - public function setUblock($ublock) - { - $this->ublock = $ublock; - } - - /** - * get the tz of the user - * - * @return string the user's tz - */ - public function getTz() - { - return $this->tz; - } - - /** - * set the tz for the user - * - * @param string $tz the user's tz - */ - public function setTz($tz) - { - $this->tz = $tz; - } - - /** - * get the locale of the user - * - * @return string the user's locale - */ - public function getLocale() - { - return $this->locale; - } - - /** - * set the locale for the user - * - * @param string $locale the user's locale - */ - public function setLocale($locale) - { - $this->locale = $locale; - } - - /** - * get the attributes of the user - * - * @return UserAttributeEntity the user's attributes - */ - public function getAttributes() - { - return $this->attributes; - } - - /** - * set the attributes for the user - * - * @param UserAttributeEntity $attributes the attributes for the user - */ - public function setAttributes($attributes) - { - $this->attributes = $attributes; - } - - /** - * set a single attribute for the user - * - * @param $name string attribute name - * @param $value string attribute value - */ - public function setAttribute($name, $value) - { - if (isset($this->attributes[$name])) { - $this->attributes[$name]->setValue($value); - } else { - $this->attributes[$name] = new UserAttributeEntity($this, $name, $value); - } - } - - /** - * delete a single attribute of the user - * - * @param $name string attribute name - */ - public function delAttribute($name) - { - if (isset($this->attributes[$name])) { - $this->attributes->remove($name); - } - } } diff --git a/src/system/UsersModule/ZikulaUsersModule.php b/src/system/UsersModule/ZikulaUsersModule.php index 8777b9ca77..bdea67c2e6 100644 --- a/src/system/UsersModule/ZikulaUsersModule.php +++ b/src/system/UsersModule/ZikulaUsersModule.php @@ -61,4 +61,27 @@ class Users_Helper_AuthenticationMethodList extends \Zikula\UsersModule\Helper\A class Users_Helper_HasMethodList extends \Zikula\UsersModule\Helper\HashMethodListHelper { } +} + +namespace Zikula\Module\UsersModule\Entity { + use Doctrine\ORM\Mapping as ORM; + use Zikula\UsersModule\Entity\BaseUserEntity; + + /** + * @deprecated remove at Core-2.0 + * @see Zikula\UsersModule\Entity\UserEntity + * @see Zikula\UsersModule\Entity\BaseUserEntity + * + * This class is necessary because of the refactoring to psr-4 + * This class maintains the 1.4.x BC API + * + * @ORM\Entity + * @ORM\Table(name="users",indexes={@ORM\Index(name="uname",columns={"uname"}), @ORM\Index(name="email",columns={"email"})}) + * + * Class UserEntity + * @package Zikula\Module\UsersModule\Entity + */ + class UserEntity extends BaseUserEntity + { + } } \ No newline at end of file From 0a1925ddd81a9424a5a2a6e9c1a05c82860e3e9b Mon Sep 17 00:00:00 2001 From: Craig Heydenburg Date: Fri, 21 Aug 2015 16:32:11 -0400 Subject: [PATCH 29/35] correct paths in theme overrides.yml --- src/themes/Andreas08Theme/Resources/config/overrides.yml | 4 ++-- src/themes/BootstrapTheme/Resources/config/overrides.yml | 4 ++-- src/themes/SeaBreezeTheme/Resources/config/overrides.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/themes/Andreas08Theme/Resources/config/overrides.yml b/src/themes/Andreas08Theme/Resources/config/overrides.yml index dac01ff2ee..f9da11733b 100644 --- a/src/themes/Andreas08Theme/Resources/config/overrides.yml +++ b/src/themes/Andreas08Theme/Resources/config/overrides.yml @@ -1,5 +1,5 @@ ## YAML Override template ## original/file.tpl: override/file.tpl --- -system/Zikula/Module/SearchModule/Resources/views/Block/search.tpl: themes/Zikula/Theme/Andreas08Theme/Resources/views/modules/ZikulaSearchModule/Block/search.tpl -system/Zikula/Module/BlocksModule/Resources/views/Block/Extmenu/topnav.tpl: themes/Zikula/Theme/Andreas08Theme/Resources/views/modules/ZikulaBlocksModule/Block/Extmenu/topnav.tpl \ No newline at end of file +system/SearchModule/Resources/views/Block/search.tpl: themes/Andreas08Theme/Resources/views/modules/ZikulaSearchModule/Block/search.tpl +system/BlocksModule/Resources/views/Block/Extmenu/topnav.tpl: themes/Andreas08Theme/Resources/views/modules/ZikulaBlocksModule/Block/Extmenu/topnav.tpl \ No newline at end of file diff --git a/src/themes/BootstrapTheme/Resources/config/overrides.yml b/src/themes/BootstrapTheme/Resources/config/overrides.yml index 0b6c5f854c..401cc2642c 100644 --- a/src/themes/BootstrapTheme/Resources/config/overrides.yml +++ b/src/themes/BootstrapTheme/Resources/config/overrides.yml @@ -1,5 +1,5 @@ ## YAML Override template ## original/file.tpl: override/file.tpl --- -system/Zikula/Module/UsersModule/Resources/views/User/main.tpl: themes/Zikula/Theme/BootstrapTheme/Resources/views/modules/ZikulaUsersModule/User/main.tpl -system/Zikula/Module/ThemeModule/Resources/views/moduleheader.tpl: themes/Zikula/Theme/BootstrapTheme/Resources/views/modules/ZikulaThemeModule/moduleheader.tpl +system/UsersModule/Resources/views/User/main.tpl: themes/BootstrapTheme/Resources/views/modules/ZikulaUsersModule/User/main.tpl +system/ThemeModule/Resources/views/moduleheader.tpl: themes/BootstrapTheme/Resources/views/modules/ZikulaThemeModule/moduleheader.tpl diff --git a/src/themes/SeaBreezeTheme/Resources/config/overrides.yml b/src/themes/SeaBreezeTheme/Resources/config/overrides.yml index c7fbda1367..fbfcedfe50 100644 --- a/src/themes/SeaBreezeTheme/Resources/config/overrides.yml +++ b/src/themes/SeaBreezeTheme/Resources/config/overrides.yml @@ -1,5 +1,5 @@ ## YAML Override template ## original/file.tpl: override/file.tpl --- -system/Zikula/Module/SearchModule/Resources/views/Block/search.tpl: themes/SeaBreezeTheme/Resources/views/modules/ZikulaSearchModule/Block/search.tpl -system/Zikula/Module/BlocksModule/Resources/views/Block/Extmenu/topnav.tpl: themes/SeaBreezeTheme/Resources/views/modules/ZikulaBlocksModule/Block/Extmenu/topnav.tpl \ No newline at end of file +system/SearchModule/Resources/views/Block/search.tpl: themes/SeaBreezeTheme/Resources/views/modules/ZikulaSearchModule/Block/search.tpl +system/BlocksModule/Resources/views/Block/Extmenu/topnav.tpl: themes/SeaBreezeTheme/Resources/views/modules/ZikulaBlocksModule/Block/Extmenu/topnav.tpl \ No newline at end of file From 37306d61dc8e3d83f12244e4b0ea3907b1a89f50 Mon Sep 17 00:00:00 2001 From: Craig Heydenburg Date: Sat, 22 Aug 2015 08:43:15 -0400 Subject: [PATCH 30/35] correct hard-coded asset paths for psr-4 change --- src/docs/VENDORS.md | 2 +- .../CoreInstallerBundle/Stage/Upgrade/InitStage.php | 4 ++-- src/lib/legacy/Zikula/Form/Block/ContextMenu.php | 2 +- src/lib/legacy/viewplugins/formplugins/block.form.php | 2 +- src/lib/legacy/viewplugins/function.pagesetvar.php | 2 +- src/lib/legacy/viewplugins/function.previewimage.php | 2 +- src/lib/legacy/viewplugins/function.zdebug.php | 2 +- src/lib/util/ModUtil.php | 2 +- src/lib/util/System.php | 2 +- .../AdminModule/Resources/views/Admin/admintabs.tpl | 2 +- .../Resources/views/Admin/systemnotices.tpl | 2 +- src/system/BlocksModule/MenutreeTree.php | 4 ++-- src/system/BlocksModule/MenutreeUtil.php | 10 +++++----- .../Resources/views/Admin/modifyposition.tpl | 4 ++-- src/system/BlocksModule/Resources/views/Admin/view.tpl | 2 +- .../Resources/views/Block/Extmenu/modify.tpl | 2 +- .../Resources/views/Block/Menutree/modify.tpl | 8 ++++---- .../Resources/views/Block/Menutree/tree.tpl | 2 +- .../CategoriesModule/Resources/views/Admin/edit.tpl | 2 +- .../CategoriesModule/Resources/views/Admin/view.tpl | 4 ++-- .../Resources/views/Admin/HookUi/hooks.tpl | 4 ++-- src/system/GroupsModule/Resources/views/Admin/view.tpl | 2 +- src/system/PageLockModule/Api/UserApi.php | 2 +- .../Resources/views/Admin/modifyconfig.tpl | 2 +- .../PermissionsModule/Resources/views/Admin/view.tpl | 2 +- src/system/RoutesModule/Util/Base/ViewUtil.php | 2 +- src/system/SearchModule/Resources/views/User/form.tpl | 2 +- .../Resources/views/Admin/allowedhtml.tpl | 2 +- .../SettingsModule/Resources/views/Admin/phpinfo.tpl | 2 +- src/system/ThemeModule/Block/ThemeswitcherBlock.php | 2 +- src/system/ThemeModule/Controller/UserController.php | 4 ++-- .../ThemeModule/Resources/views/Admin/modifyconfig.tpl | 2 +- src/system/ThemeModule/Resources/views/Admin/view.tpl | 2 +- .../Resources/views/Block/themeswitcher.tpl | 2 +- src/system/ThemeModule/Resources/views/pagercss2.tpl | 2 +- .../UsersModule/Resources/views/Admin/mailusers.tpl | 2 +- .../UsersModule/Resources/views/Admin/modify.tpl | 6 +++--- .../UsersModule/Resources/views/Admin/newuser.tpl | 2 +- .../Resources/views/Admin/search_results.tpl | 2 +- src/system/UsersModule/Resources/views/Admin/view.tpl | 2 +- .../Authentication/LoginFormFields/Default/Default.tpl | 2 +- .../Resources/views/User/changepassword.tpl | 2 +- .../Resources/views/User/verifyregistration.tpl | 2 +- 43 files changed, 58 insertions(+), 58 deletions(-) diff --git a/src/docs/VENDORS.md b/src/docs/VENDORS.md index 2ff5dc3bbf..f873c1fa1f 100644 --- a/src/docs/VENDORS.md +++ b/src/docs/VENDORS.md @@ -130,7 +130,7 @@ jQuery.mmenu 5.0.3 Vendor website: http://mmenu.frebsite.nl/ Downloaded from: http://mmenu.frebsite.nl/ License: MIT - Location in Zikula: system/Zikula/Module/AdminModule/Resources/public/js/jQuery.mmenu-master + Location in Zikula: system/AdminModule/Resources/public/js/jQuery.mmenu-master Patch details: none ICON LIBRARIES diff --git a/src/lib/Zikula/Bundle/CoreInstallerBundle/Stage/Upgrade/InitStage.php b/src/lib/Zikula/Bundle/CoreInstallerBundle/Stage/Upgrade/InitStage.php index cd80fd21be..eadc010d96 100644 --- a/src/lib/Zikula/Bundle/CoreInstallerBundle/Stage/Upgrade/InitStage.php +++ b/src/lib/Zikula/Bundle/CoreInstallerBundle/Stage/Upgrade/InitStage.php @@ -82,7 +82,7 @@ private function init() 'Settings', 'Theme', 'Users', ); foreach ($oldModuleNames as $module) { - $conn->executeQuery("UPDATE modules SET name = 'Zikula{$module}Module', directory = 'Zikula/Module/{$module}Module' WHERE name = '$module'"); + $conn->executeQuery("UPDATE modules SET name = 'Zikula{$module}Module', directory = '{$module}Module' WHERE name = '$module'"); $conn->executeQuery("UPDATE module_vars SET modname = 'Zikula{$module}Module' WHERE modname = '$module'"); $strlen = strlen($module) + 1; $conn->executeQuery("UPDATE group_perms SET component = CONCAT('Zikula{$module}Module', SUBSTRING(component, $strlen)) WHERE component LIKE '{$module}%'"); @@ -93,7 +93,7 @@ private function init() 'Andreas08', 'Atom', 'SeaBreeze', 'Mobile', 'Printer', ); foreach ($oldThemeNames as $theme) { - $conn->executeQuery("UPDATE themes SET name = 'Zikula{$theme}Theme', directory = 'Zikula/Theme/{$theme}Theme' WHERE name = '$theme'"); + $conn->executeQuery("UPDATE themes SET name = 'Zikula{$theme}Theme', directory = '{$theme}Theme' WHERE name = '$theme'"); } $conn->executeQuery("UPDATE themes SET name = 'ZikulaRssTheme', directory = 'Zikula/Theme/RssTheme' WHERE name = 'RSS'"); diff --git a/src/lib/legacy/Zikula/Form/Block/ContextMenu.php b/src/lib/legacy/Zikula/Form/Block/ContextMenu.php index 61882d39b3..876363e6be 100644 --- a/src/lib/legacy/Zikula/Form/Block/ContextMenu.php +++ b/src/lib/legacy/Zikula/Form/Block/ContextMenu.php @@ -117,7 +117,7 @@ public function create(Zikula_Form_View $view, &$params) */ public function dataBound(Zikula_Form_View $view, &$params) { - PageUtil::AddVar('javascript', 'system/Zikula/Module/ThemeModule/Resources/public/js/form/form.js'); + PageUtil::AddVar('javascript', 'system/ThemeModule/Resources/public/js/form/form.js'); PageUtil::AddVar('javascript', 'javascript/ajax/prototype.js'); } diff --git a/src/lib/legacy/viewplugins/formplugins/block.form.php b/src/lib/legacy/viewplugins/formplugins/block.form.php index 37797abdfd..22dba0b002 100644 --- a/src/lib/legacy/viewplugins/formplugins/block.form.php +++ b/src/lib/legacy/viewplugins/formplugins/block.form.php @@ -25,7 +25,7 @@ function smarty_block_form($params, $content, $view) { if ($content) { - PageUtil::AddVar('stylesheet', 'system/Zikula/Module/ThemeModule/Resources/public/css/form/style.css'); + PageUtil::AddVar('stylesheet', 'system/ThemeModule/Resources/public/css/form/style.css'); $action = htmlspecialchars(System::getCurrentUri()); $classString = ''; $roleString = ''; diff --git a/src/lib/legacy/viewplugins/function.pagesetvar.php b/src/lib/legacy/viewplugins/function.pagesetvar.php index 9a5bcdde31..09fdb7589d 100644 --- a/src/lib/legacy/viewplugins/function.pagesetvar.php +++ b/src/lib/legacy/viewplugins/function.pagesetvar.php @@ -64,7 +64,7 @@ function smarty_function_pagesetvar($params, Zikula_View $view) // handle Clip which is manually loading a Theme's stylesheets if ($name == 'stylesheet' && false !== strpos($value, 'system/Theme/style/')) { - $value = str_replace('system/Theme/style/', 'system/Zikula/Module/ThemeModule/Resources/public/css/', $value); + $value = str_replace('system/Theme/style/', 'system/ThemeModule/Resources/public/css/', $value); } if (in_array($name, array('stylesheet', 'javascript'))) { diff --git a/src/lib/legacy/viewplugins/function.previewimage.php b/src/lib/legacy/viewplugins/function.previewimage.php index 5cfac45c1f..b558a77452 100644 --- a/src/lib/legacy/viewplugins/function.previewimage.php +++ b/src/lib/legacy/viewplugins/function.previewimage.php @@ -55,7 +55,7 @@ function smarty_function_previewimage($params, Zikula_View $view) if (file_exists("$themePath/preview_{$params['size']}.png")) { $filesrc = "$themePath/preview_{$params['size']}.png"; } else { - $filesrc = "system/Zikula/Module/ThemeModule/Resources/public/images/preview_{$params['size']}.png"; + $filesrc = "system/ThemeModule/Resources/public/images/preview_{$params['size']}.png"; } $markup = ""; diff --git a/src/lib/legacy/viewplugins/function.zdebug.php b/src/lib/legacy/viewplugins/function.zdebug.php index d82c11f6f9..1a046a12bc 100644 --- a/src/lib/legacy/viewplugins/function.zdebug.php +++ b/src/lib/legacy/viewplugins/function.zdebug.php @@ -54,7 +54,7 @@ function smarty_function_zdebug($params, Zikula_View $view) $_plugins_outputfilter = $view->_plugins['outputfilter']; $_compile_id_orig = $view->_compile_id; - $view->template_dir = 'system/Zikula/Module/ThemeModule/Resources/views'; + $view->template_dir = 'system/ThemeModule/Resources/views'; $view->default_resource_type = 'file'; $view->_plugins['outputfilter'] = null; $view->_compile_id = null; diff --git a/src/lib/util/ModUtil.php b/src/lib/util/ModUtil.php index 97d41a8891..45c91bf268 100644 --- a/src/lib/util/ModUtil.php +++ b/src/lib/util/ModUtil.php @@ -1931,7 +1931,7 @@ public static function getModuleImagePath($moduleName) $paths[] = $modpath . '/' . $osmoddir . '/images/admin.png'; $paths[] = $modpath . '/' . $osmoddir . '/images/admin.jpg'; $paths[] = $modpath . '/' . $osmoddir . '/images/admin.gif'; - $paths[] = 'system/Zikula/Module/AdminModule/Resources/public/images/default.gif'; + $paths[] = 'system/AdminModule/Resources/public/images/default.gif'; foreach ($paths as $path) { if (is_readable($path)) { diff --git a/src/lib/util/System.php b/src/lib/util/System.php index 51698de76f..bd9e722a7a 100644 --- a/src/lib/util/System.php +++ b/src/lib/util/System.php @@ -1105,7 +1105,7 @@ public static function isDevelopmentMode() */ public static function getSystemErrorTemplate($templateFile) { - $templatePath = "system/Zikula/Module/ThemeModule/Resources/views/system/$templateFile"; + $templatePath = "system/ThemeModule/Resources/views/system/$templateFile"; $override = Zikula_View::getTemplateOverride($templatePath); if ($override !== false) { return $override; diff --git a/src/system/AdminModule/Resources/views/Admin/admintabs.tpl b/src/system/AdminModule/Resources/views/Admin/admintabs.tpl index 6d102b5efe..6b5709de76 100644 --- a/src/system/AdminModule/Resources/views/Admin/admintabs.tpl +++ b/src/system/AdminModule/Resources/views/Admin/admintabs.tpl @@ -1,4 +1,4 @@ -{pageaddvar name='javascript' value='system/Zikula/Module/AdminModule/Resources/public/js/admin_admin_admintabs.js'} +{pageaddvar name='javascript' value='system/AdminModule/Resources/public/js/admin_admin_admintabs.js'} {pageaddvar name='javascript' value='web/bootstrap-jqueryui/bootstrap-jqueryui.min.js'}
diff --git a/src/system/AdminModule/Resources/views/Admin/systemnotices.tpl b/src/system/AdminModule/Resources/views/Admin/systemnotices.tpl index 2f83f76ca2..5f9557b202 100644 --- a/src/system/AdminModule/Resources/views/Admin/systemnotices.tpl +++ b/src/system/AdminModule/Resources/views/Admin/systemnotices.tpl @@ -1,4 +1,4 @@ -{pageaddvar name='javascript' value='system/Zikula/Module/AdminModule/Resources/public/js/admin_admin_systemnotices.js'} +{pageaddvar name='javascript' value='system/AdminModule/Resources/public/js/admin_admin_systemnotices.js'}