Welcome to Mouf. Please login to access the administration interface of your web application.
@@ -1893,23 +1834,7 @@ array ( ), ), - 'setPriority' => - array ( - 'value' => '', - 'type' => 'string', - 'metadata' => - array ( - ), - ), - 'setPropagatedUrlParameters' => - array ( - 'value' => false, - 'type' => 'string', - 'metadata' => - array ( - ), - ), - 'setActivateBasedOnUrl' => + 'setActivateBasedOnUrl' => array ( 'value' => false, 'type' => 'string', @@ -1930,17 +1855,19 @@ array ( 'class' => 'Mouf\\Html\\Widgets\\Menu\\MenuItemStyleIcon', 'external' => false, - 'setterProperties' => - array ( - 'setUrl' => - array ( - 'value' => 'src-dev/views/images/door_open.png', - 'type' => 'string', - 'metadata' => - array ( - ), - ), - ), + 'constructor' => + array ( + 0 => + array ( + 'value' => 'src-dev/views/images/door_open.png', + 'parametertype' => 'primitive', + 'type' => 'string', + 'metadata' => + array ( + ), + ), + ), + ), 'mainMenu' => array ( @@ -2057,15 +1984,7 @@ ), 'setPriority' => array ( - 'value' => '100', - 'type' => 'string', - 'metadata' => - array ( - ), - ), - 'setPropagatedUrlParameters' => - array ( - 'value' => false, + 'value' => 100.0, 'type' => 'string', 'metadata' => array ( @@ -2083,7 +2002,7 @@ 'contentBlock' => 'block.content', ), ), - 'moufInstallController' => +/* 'moufInstallController' => array ( 'class' => 'Mouf\\Controllers\\MoufInstallController', 'external' => false, @@ -2096,12 +2015,34 @@ 'template' => 'moufInstallTemplate', 'contentBlock' => 'block.content', ), - ), + ),*/ 'moufInstallTemplate' => array ( 'class' => 'Mouf\\Html\\Template\\BootstrapTemplate', 'external' => false, - 'setterBinds' => + 'constructor' => + array ( + 0 => + array ( + 'value' => WebLibraryManager::class, + 'parametertype' => 'object', + 'type' => 'string', + 'metadata' => + array ( + ), + ), + 1 => + array ( + 'value' => 'moufInstallTemplate', + 'parametertype' => 'primitive', + 'type' => 'string', + 'metadata' => + array ( + ), + ), + ), + + 'setterBinds' => array ( 'setFooter' => 'block.footer', 'setRight' => 'block.right', @@ -2128,48 +2069,7 @@ ), ), ), - 'moufInstallTemplate2' => - array ( - 'class' => 'Mouf\\Html\\Template\\MoufTemplate\\MoufTemplate', - 'external' => false, - 'fieldBinds' => - array ( - 'head' => - array ( - ), - ), - 'fieldProperties' => - array ( - 'logoImg' => - array ( - 'value' => 'src-dev/views/images/MoufLogo.png', - 'type' => 'string', - 'metadata' => - array ( - ), - ), - 'title' => - array ( - 'value' => 'Mouf - Build your website', - 'type' => 'string', - 'metadata' => - array ( - ), - ), - 'css_files' => - array ( - 'value' => - array ( - 0 => 'src-dev/views/styles.css', - ), - 'type' => 'string', - 'metadata' => - array ( - ), - ), - ), - ), - 'moufLoginTemplate' => + 'moufLoginTemplate' => array ( 'class' => 'Mouf\\Html\\Template\\BootstrapTemplate', 'external' => false, @@ -2299,15 +2199,7 @@ array ( ), ), - 'setPriority' => - array ( - 'value' => '', - 'type' => 'string', - 'metadata' => - array ( - ), - ), - 'setPropagatedUrlParameters' => + 'setPropagatedUrlParameters' => array ( 'value' => array ( @@ -2339,17 +2231,19 @@ array ( 'class' => 'Mouf\\Html\\Widgets\\Menu\\MenuItemStyleIcon', 'external' => false, - 'setterProperties' => - array ( - 'setUrl' => - array ( - 'value' => 'src-dev/views/images/tick.png', - 'type' => 'string', - 'metadata' => - array ( - ), - ), - ), + 'constructor' => + array ( + 0 => + array ( + 'value' => 'src-dev/views/images/tick.png', + 'parametertype' => 'primitive', + 'type' => 'string', + 'metadata' => + array ( + ), + ), + ), + ), 'moufTemplate' => array ( @@ -2551,6 +2445,15 @@ array ( ), ), + 1 => + array ( + 'value' => 'root_url', + 'parametertype' => 'object', + 'type' => 'string', + 'metadata' => + array ( + ), + ), ), 'fieldProperties' => array ( @@ -2641,15 +2544,7 @@ ), 'setPriority' => array ( - 'value' => '20', - 'type' => 'string', - 'metadata' => - array ( - ), - ), - 'setPropagatedUrlParameters' => - array ( - 'value' => false, + 'value' => 20.0, 'type' => 'string', 'metadata' => array ( @@ -2717,21 +2612,13 @@ ), 'setPriority' => array ( - 'value' => '0', - 'type' => 'string', - 'metadata' => - array ( - ), - ), - 'setPropagatedUrlParameters' => - array ( - 'value' => false, + 'value' => 0.0, 'type' => 'string', 'metadata' => array ( ), ), - 'setActivateBasedOnUrl' => + 'setActivateBasedOnUrl' => array ( 'value' => false, 'type' => 'string', @@ -2933,7 +2820,7 @@ array ( 'userFile' => array ( - 'value' => '../../../mouf/no_commit/MoufUsers.php', + 'value' => '../../../mouf/no_commit/user.php', 'type' => 'string', 'metadata' => array ( @@ -2995,10 +2882,10 @@ array ( 'template' => 'moufTemplate', 'contentBlock' => 'block.content', - 'validatorService' => 'validatorService', + 'validatorService' => 'Mouf\\Validator\\MoufValidatorService', ), ), - 'validatorService' => + 'Mouf\\Validator\\MoufValidatorService' => array ( 'class' => 'Mouf\\Validator\\MoufValidatorService', 'external' => false, @@ -3057,15 +2944,7 @@ array ( ), ), - 'setPriority' => - array ( - 'value' => '', - 'type' => 'string', - 'metadata' => - array ( - ), - ), - 'setPropagatedUrlParameters' => + 'setPropagatedUrlParameters' => array ( 'value' => array ( @@ -3097,17 +2976,18 @@ array ( 'class' => 'Mouf\\Html\\Widgets\\Menu\\MenuItemStyleIcon', 'external' => false, - 'setterProperties' => - array ( - 'setUrl' => - array ( - 'value' => 'src-dev/views/images/page_white_stack.png', - 'type' => 'string', - 'metadata' => - array ( - ), - ), - ), + 'constructor' => + array ( + 0 => + array ( + 'value' => 'src-dev/views/images/page_white_stack.png', + 'parametertype' => 'primitive', + 'type' => 'string', + 'metadata' => + array ( + ), + ), + ), ), 'viewDocumentationMenuItem' => array ( @@ -3157,21 +3037,13 @@ ), 'setPriority' => array ( - 'value' => '90', + 'value' => 90.0, 'type' => 'string', 'metadata' => array ( ), ), - 'setPropagatedUrlParameters' => - array ( - 'value' => false, - 'type' => 'string', - 'metadata' => - array ( - ), - ), - 'setActivateBasedOnUrl' => + 'setActivateBasedOnUrl' => array ( 'value' => false, 'type' => 'string', @@ -3192,17 +3064,18 @@ array ( 'class' => 'Mouf\\Html\\Widgets\\Menu\\MenuItemStyleIcon', 'external' => false, - 'setterProperties' => - array ( - 'setUrl' => - array ( - 'value' => 'src-dev/views/images/report.png', - 'type' => 'string', - 'metadata' => - array ( - ), - ), - ), + 'constructor' => + array ( + 0 => + array ( + 'value' => 'src-dev/views/images/report.png', + 'parametertype' => 'primitive', + 'type' => 'string', + 'metadata' => + array ( + ), + ), + ), ), 'weblibrary.qtip2' => array ( @@ -3237,20 +3110,440 @@ ), ), ), + 'splashMiddleware' => + array ( + 'class' => 'Mouf\\Mvc\\Splash\\SplashMiddleware', + 'external' => false, + 'weak' => false, + 'constructor' => + array ( + 0 => + array ( + 'value' => + array ( + 0 => '__anonymous__b67b_1753892387', + 1 => '__anonymous__b67b_59788333', + 2 => '__anonymous__b67b_632286537', + 3 => '__anonymous__b67b_351917355', + 4 => '__anonymous__b67b_282937984', + ), + 'parametertype' => 'object', + 'type' => 'string', + 'metadata' => + array ( + ), + ), + ), + ), + + '__anonymous__b67b_1344235188' => + array ( + 'class' => 'Mouf\\Utils\\Common\\Condition\\ToCondition', + 'external' => false, + 'anonymous' => true, + 'weak' => true, + 'constructor' => + array ( + 0 => + array ( + 'value' => '__anonymous__b67b_1934177810', + 'parametertype' => 'object', + 'type' => 'string', + 'metadata' => + array ( + ), + ), + ), + ), + '__anonymous__b67b_1753892387' => + array ( + 'class' => 'Mouf\\Mvc\\Splash\\Routers\\Router', + 'external' => false, + 'anonymous' => true, + 'weak' => true, + 'constructor' => + array ( + 0 => + array ( + 'value' => 'phpVarsCheckRouter', + 'parametertype' => 'object', + 'type' => 'string', + 'metadata' => + array ( + ), + ), + ), + ), + '__anonymous__b67b_1934177810' => + array ( + 'class' => 'Mouf\\Utils\\Value\\Variable', + 'external' => false, + 'anonymous' => true, + 'weak' => true, + 'constructor' => + array ( + 0 => + array ( + 'value' => true, + 'parametertype' => 'primitive', + 'type' => 'string', + 'metadata' => + array ( + ), + ), + ), + ), + '__anonymous__b67b_282937984' => + array ( + 'class' => 'Mouf\\Mvc\\Splash\\Routers\\ErrorRouter', + 'external' => false, + 'anonymous' => true, + 'weak' => true, + 'constructor' => + array ( + 0 => + array ( + 'value' => 'exceptionRouter', + 'parametertype' => 'object', + 'type' => 'string', + 'metadata' => + array ( + ), + ), + ), + ), + '__anonymous__b67b_351917355' => + array ( + 'class' => 'Mouf\\Mvc\\Splash\\Routers\\ErrorRouter', + 'external' => false, + 'anonymous' => true, + 'weak' => true, + 'constructor' => + array ( + 0 => + array ( + 'value' => 'return $container->get(\'whoopsMiddleware\');', + 'parametertype' => 'primitive', + 'type' => 'php', + 'metadata' => + array ( + ), + ), + 1 => + array ( + 'value' => NULL, + 'parametertype' => 'primitive', + 'type' => 'string', + 'metadata' => + array ( + ), + ), + 2 => + array ( + 'value' => '__anonymous__b67b_1344235188', + 'parametertype' => 'object', + 'type' => 'string', + 'metadata' => + array ( + ), + ), + ), + ), + '__anonymous__b67b_59788333' => + array ( + 'class' => 'Mouf\\Mvc\\Splash\\Routers\\Router', + 'external' => false, + 'anonymous' => true, + 'weak' => true, + 'constructor' => + array ( + 0 => + array ( + 'value' => 'splashDefaultRouter', + 'parametertype' => 'object', + 'type' => 'string', + 'metadata' => + array ( + ), + ), + ), + ), + '__anonymous__b67b_632286537' => + array ( + 'class' => 'Mouf\\Mvc\\Splash\\Routers\\Router', + 'external' => false, + 'anonymous' => true, + 'weak' => true, + 'constructor' => + array ( + 0 => + array ( + 'value' => 'notFoundRouter', + 'parametertype' => 'object', + 'type' => 'string', + 'metadata' => + array ( + ), + ), + ), + ), + 'exceptionRouter' => + array ( + 'class' => 'Mouf\\Mvc\\Splash\\Routers\\ExceptionRouter', + 'external' => false, + 'weak' => false, + 'constructor' => + array ( + 0 => + array ( + 'value' => 'httpErrorsController', + 'parametertype' => 'object', + 'type' => 'string', + 'metadata' => + array ( + ), + ), + 1 => + array ( + 'value' => 'psr.errorLogLogger', + 'parametertype' => 'object', + 'type' => 'string', + 'metadata' => + array ( + ), + ), + ), + ), + 'httpErrorsController' => + array ( + 'class' => 'Mouf\\Mvc\\Splash\\Controllers\\HttpErrorsController', + 'external' => false, + 'weak' => false, + 'fieldBinds' => + array ( + ), + 'fieldProperties' => + array ( + ), + 'constructor' => + array ( + 0 => + array ( + 'value' => 'moufTemplate', + 'parametertype' => 'object', + 'type' => 'string', + 'metadata' => + array ( + ), + ), + 1 => + array ( + 'value' => 'block.content', + 'parametertype' => 'object', + 'type' => 'string', + 'metadata' => + array ( + ), + ), + 2 => + array ( + 'value' => true, + 'parametertype' => 'primitive', + 'type' => 'string', + 'metadata' => + array ( + ), + ), + ), + ), + 'notFoundRouter' => + array ( + 'class' => 'Mouf\\Mvc\\Splash\\Routers\\NotFoundRouter', + 'external' => false, + 'weak' => false, + 'constructor' => + array ( + 0 => + array ( + 'value' => 'httpErrorsController', + 'parametertype' => 'object', + 'type' => 'string', + 'metadata' => + array ( + ), + ), + ), + ), + 'phpVarsCheckRouter' => + array ( + 'class' => 'Mouf\\Mvc\\Splash\\Routers\\PhpVarsCheckRouter', + 'external' => false, + 'weak' => false, + 'constructor' => + array ( + 0 => + array ( + 'value' => 'psr.errorLogLogger', + 'parametertype' => 'object', + 'type' => 'string', + 'metadata' => + array ( + ), + ), + ), + ), + + 'splashDefaultRouter' => + array ( + 'class' => 'Mouf\\Mvc\\Splash\\Routers\\SplashDefaultRouter', + 'external' => false, + 'weak' => false, + 'constructor' => + array ( + 0 => + array ( + 'value' => + array ( + 0 => 'moufExplorerUrlProvider', + ), + 'parametertype' => 'object', + 'type' => 'string', + 'metadata' => + array ( + ), + ), + 1 => + array ( + 'value' => 'splashCacheApc', + 'parametertype' => 'object', + 'type' => 'string', + 'metadata' => + array ( + ), + ), + 2 => + array ( + 'value' => NULL, + 'parametertype' => 'primitive', + 'type' => 'string', + 'metadata' => + array ( + ), + ), + 3 => + array ( + 'value' => 'weak', + 'parametertype' => 'primitive', + 'type' => 'string', + 'metadata' => + array ( + ), + ), + 4 => + array ( + 'value' => true, + 'parametertype' => 'primitive', + 'type' => 'string', + 'metadata' => + array ( + ), + ), + ), + ), + + 'whoopsMiddleware' => + array ( + 'class' => 'Franzl\\Middleware\\Whoops\\ErrorMiddleware', + 'external' => false, + 'weak' => false, + ), + + 'psr.errorLogLogger' => + array ( + 'class' => 'Mouf\\Utils\\Log\\Psr\\ErrorLogLogger', + 'external' => false, + 'weak' => false, + 'constructor' => + array ( + 0 => + array ( + 'value' => 'warning', + 'parametertype' => 'primitive', + 'type' => 'string', + 'metadata' => + array ( + ), + ), + ), + ), + + 'moufExplorerUrlProvider' => + array ( + 'class' => 'Mouf\\Mvc\\Splash\\Services\\MoufExplorerUrlProvider', + 'external' => false, + 'weak' => false, + ), + + 'splashCacheApc' => + array ( + 'class' => 'Mouf\\Utils\\Cache\\ApcCache', + 'external' => false, + 'weak' => false, + 'fieldProperties' => + array ( + 'prefix' => + array ( + 'value' => 'ROOT_PATH', + 'type' => 'config', + 'metadata' => + array ( + ), + ), + ), + 'fieldBinds' => + array ( + 'fallback' => 'splashCacheFile', + ), + ), + 'splashCacheFile' => + array ( + 'class' => 'Mouf\\Utils\\Cache\\FileCache', + 'external' => false, + 'weak' => false, + 'fieldProperties' => + array ( + 'prefix' => + array ( + 'value' => 'ROOT_PATH', + 'type' => 'config', + 'metadata' => + array ( + ), + ), + 'cacheDirectory' => + array ( + 'value' => 'splashCache/', + 'type' => 'string', + 'metadata' => + array ( + ), + ), + ), + ), )); unset($moufManager); -/** - * This is the base class of the Manage Object User Friendly or Modular object user framework (MOUF) framework. - * This object can be used to get the objects manage by MOUF. - * - */ -class MoufAdmin { - public function getClosures() { +/** + * This is the base class of the Manage Object User Friendly or Modular object user framework (MOUF) framework. + * This object can be used to get the objects manage by MOUF. + * + */ +class MoufAdmin { + public function getClosures() { return [ - ]; + ]; } /** * @return Mouf\Controllers\MoufAjaxInstanceController @@ -3921,7 +4214,7 @@ public static function getValidate() { * @return Mouf\Validator\MoufValidatorService */ public static function getValidatorService() { - return MoufManager::getMoufManager()->get('validatorService'); + return MoufManager::getMoufManager()->get('Mouf\\Validator\\MoufValidatorService'); } /** diff --git a/mouf/MoufUI.php b/mouf/MoufUI.php index ab0c2ce..b22dad2 100644 --- a/mouf/MoufUI.php +++ b/mouf/MoufUI.php @@ -4,14 +4,7 @@ */ // Files declared in the extra:mouf:adminRequire section. -require_once __DIR__.'/../vendor/mouf/utils.cache.cache-interface/CacheAdmin.php'; -require_once __DIR__.'/../vendor/mouf/html.utils.weblibrarymanager/src/WebLibraryAdmin.php'; +require_once __DIR__.'/../vendor/mouf/utils.cache.purge-ui/CacheAdmin.php'; require_once __DIR__.'/../vendor/mouf/utils.i18n.fine/src/FineAdmin.php'; -require_once __DIR__.'/../vendor/mouf/mvc.splash-common/src/SplashCommonAdmin.php'; -require_once __DIR__.'/../vendor/mouf/mvc.splash/src/SplashAdmin.php'; -require_once __DIR__.'/../vendor/mouf/mvc.splash/src/Mouf/Mvc/Splash/SplashGenerateService.php'; -require_once __DIR__.'/../vendor/mouf/mvc.splash/src/Mouf/Mvc/Splash/Controllers/Admin/SplashPurgeCacheController.php'; -require_once __DIR__.'/../vendor/mouf/mvc.splash/src/Mouf/Mvc/Splash/Controllers/Admin/SplashAdminApacheConfigureController.php'; -require_once __DIR__.'/../vendor/mouf/mvc.splash/src/Mouf/Mvc/Splash/Controllers/Admin/SplashInstallController.php'; ?> \ No newline at end of file diff --git a/mouf/no_commit/.gitkeep b/mouf/no_commit/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/src-dev/Mouf/Controllers/MoufConfigureLocalUrlController.php b/src-dev/Mouf/Controllers/MoufConfigureLocalUrlController.php index 29ed9d4..3db4688 100644 --- a/src-dev/Mouf/Controllers/MoufConfigureLocalUrlController.php +++ b/src-dev/Mouf/Controllers/MoufConfigureLocalUrlController.php @@ -11,9 +11,13 @@ use Mouf\Html\HtmlElement\HtmlBlock; +use Mouf\Html\Template\TemplateInterface; use Mouf\MoufException; use Mouf\Mvc\Splash\Controllers\Controller; +use Mouf\Mvc\Splash\HtmlResponse; use Mouf\Reflection\MoufReflectionProxy; +use Mouf\Security\Logged; +use TheCodingMachine\Splash\Annotations\URL; /** * The controller that will enable you to set up the local URL (if needed) @@ -23,30 +27,32 @@ class MoufConfigureLocalUrlController extends Controller { /** * The template used by the main page for mouf. * - * @Property - * @Compulsory * @var TemplateInterface */ - public $template; + private $template; /** * The content block the template will be writting into. * - * @Property - * @Compulsory * @var HtmlBlock */ - public $contentBlock; + private $contentBlock; protected $status; protected $localUrl; protected $selfedit; + public function __construct(TemplateInterface $template, HtmlBlock $contentBlock) + { + $this->template = $template; + $this->contentBlock = $contentBlock; + } + /** * The default action will redirect to the MoufController defaultAction. * - * @Action - * @Logged + * @URL("configureLocalUrl/") + * @Logged() */ public function index($selfedit = "false") { $this->selfedit = $selfedit; @@ -61,16 +67,16 @@ public function index($selfedit = "false") { $this->localUrl = MoufReflectionProxy::getLocalUrlToProject(); $this->contentBlock->addFile(ROOT_PATH."src-dev/views/configureLocalUrl.php", $this); - $this->template->toHtml(); + return new HtmlResponse($this->template); } /** - * @Action - * @Logged + * @URL("configureLocalUrl/setLocalUrl") + * @Logged() */ - public function setLocalUrl($localUrl, $selfedit = "false") { + public function setLocalUrl(string $localUrl, string $selfedit = "false") { $this->selfedit = $selfedit; MoufReflectionProxy::setLocalUrlToProject($localUrl); - $this->index($selfedit); + return $this->index($selfedit); } } diff --git a/src-dev/Mouf/Controllers/MoufController.php b/src-dev/Mouf/Controllers/MoufController.php index b85059b..315cc48 100644 --- a/src-dev/Mouf/Controllers/MoufController.php +++ b/src-dev/Mouf/Controllers/MoufController.php @@ -10,6 +10,7 @@ namespace Mouf\Controllers; +use Mouf\Html\Template\TemplateInterface; use Mouf\MoufCache; use Mouf\MoufClassExplorer; @@ -17,17 +18,20 @@ use Mouf\Composer\ComposerService; use Mouf\Html\HtmlElement\HtmlBlock; +use Mouf\Mvc\Splash\HtmlResponse; use Mouf\Reflection\MoufReflectionProxy; use Mouf\MoufManager; use Mouf\MoufSearchable; use Mouf\Mvc\Splash\Controllers\Controller; +use Mouf\Security\Logged; +use TheCodingMachine\Splash\Annotations\URL; +use Zend\Diactoros\Response\RedirectResponse; /** * The controller allowing access to the Mouf framework. * - * @Component */ class MoufController extends Controller implements MoufSearchable { @@ -48,20 +52,16 @@ class MoufController extends Controller implements MoufSearchable { /** * The template used by the main page for mouf. * - * @Property - * @Compulsory * @var TemplateInterface */ - public $template; + private $template; /** * The content block the template will be writting into. * - * @Property - * @Compulsory * @var HtmlBlock */ - public $contentBlock; + private $contentBlock; /** * Array of all instances sorted by package and by class. @@ -98,12 +98,18 @@ class MoufController extends Controller implements MoufSearchable { */ protected $anonymousNames = array(); + public function __construct(TemplateInterface $template, HtmlBlock $contentBlock) + { + $this->template = $template; + $this->contentBlock = $contentBlock; + } + /** * Redirects the user to the right controller. - * This can be the detail controller, or any other controller, depending on the @ExtendedAction annotation. + * This can be the detail controller, or any other controller, depending on the #@ExtendedAction annotation. * - * @Action - * @Logged + * @URL("mouf/displayComponent") + * @Logged() * @param string $name the name of the component to display * @param string $selfedit If true, the name of the component must be a component from the Mouf framework itself (internal use only) */ @@ -133,8 +139,7 @@ public function displayComponent($name, $selfedit = "false") { } // Note: performing a redirect is not optimal as it requires a reload of the page! - header("Location: ".$destinationUrl."?name=".urlencode($name)."&selfedit=".urlencode($selfedit)); - exit; + return new RedirectResponse($destinationUrl."?name=".urlencode($name)."&selfedit=".urlencode($selfedit)); } /** @@ -149,8 +154,8 @@ public function displayComponent($name, $selfedit = "false") { /** * Lists all the instances available, sorted by "package" (directory of the class). * - * @Action - * @Logged + * @URL("mouf/") + * @Logged() */ public function defaultAction($selfedit = "false", $query = null, $show_anonymous = "false") { //$test = new ComposerService(); @@ -357,7 +362,7 @@ public function defaultAction($selfedit = "false", $query = null, $show_anonymou } else { $this->contentBlock->addFile(dirname(__FILE__)."/../../views/listComponentsByDirectory.php", $this); //$this->contentBlock->addFile(dirname(__FILE__)."/../views/listComponentsByDirectory.php", $this); - $this->template->toHtml(); + return new HtmlResponse($this->template); } } @@ -383,8 +388,8 @@ private function getAnonymousInstanceName($instanceName) { /** * Lists all the components available, ordered by creation date, in order to edit them. * - * @Action - * @Logged + * @URL("mouf/instancesByDate") + * @Logged() */ public function instancesByDate($selfedit = "false") { $this->selfedit = $selfedit; @@ -396,7 +401,7 @@ public function instancesByDate($selfedit = "false") { } $this->contentBlock->addFile(dirname(__FILE__)."/../views/listComponents.php", $this); - $this->template->toHtml(); + return new HtmlResponse($this->template->toHtml()); } /** @@ -405,7 +410,7 @@ public function instancesByDate($selfedit = "false") { * @Action * @Logged */ - public function newInstance($selfedit = "false", $instanceName=null, $instanceClass=null) { + /*public function newInstance($selfedit = "false", $instanceName=null, $instanceClass=null) { //$componentsList = Moufspector::getComponentsList(); $this->selfedit = $selfedit; $componentsList = MoufReflectionProxy::getComponentsList($selfedit=="true"); @@ -415,13 +420,13 @@ public function newInstance($selfedit = "false", $instanceName=null, $instanceCl $template->addContentFunction(array($this, "displayNewInstanceScreen"), $componentsList, $selfedit, $instanceName, $instanceClass); //$template->addContentFile(dirname(__FILE__)."/../views/displayNewInstance.php", $this); $template->toHtml(); - } + }*/ /** * Displays the screen allowing to create new instances. * - * @Action - * @Logged + * @URL("mouf/newInstance2") + * @Logged() */ public function newInstance2($selfedit = "false", $instanceName=null, $instanceClass=null) { $this->instanceName = $instanceName; @@ -429,20 +434,20 @@ public function newInstance2($selfedit = "false", $instanceName=null, $instanceC $this->selfedit = $selfedit; $this->contentBlock->addFile(dirname(__FILE__)."/../../views/instances/newInstance.php", $this); - $this->template->toHtml(); + return new HtmlResponse($this->template); } /** * Purge the cache and redisplays the screen allowing to create new instances. * - * @Action - * @Logged + * @URL("mouf/refreshNewInstance") + * @Logged() */ public function refreshNewInstance($selfedit = "false", $instanceName=null, $instanceClass=null) { $moufCache = new MoufCache(); $moufCache->purgeAll(); - header("Location: newInstance2?selfedit=".$selfedit."&instanceName=".urlencode($instanceName)."&instanceClass=".urlencode($instanceClass)); + return new RedirectResponse("newInstance2?selfedit=".$selfedit."&instanceName=".urlencode($instanceName)."&instanceClass=".urlencode($instanceClass)); } /** @@ -456,8 +461,8 @@ public function displayNewInstanceScreen($componentsList, $selfedit, $instanceNa /** * The action that creates a new component instance. * - * @Action - * @Logged + * @URL("mouf/createComponent") + * @Logged() * @param string $instanceName The name of the instance to create * @param string $instanceClass The class of the component to create */ @@ -481,8 +486,8 @@ public function createComponent($instanceName, $instanceClass, $selfedit) { /** * Removes the instance passed in parameter. * - * @Action - * @Logged + * @URL("mouf/deleteInstance") + * @Logged() */ public function deleteInstance($selfedit = "false", $instanceName=null, $returnurl = null) { $this->selfedit = $selfedit; @@ -497,16 +502,16 @@ public function deleteInstance($selfedit = "false", $instanceName=null, $returnu $this->moufManager->rewriteMouf(); if ($returnurl) { - header("Location:".$returnurl); + return new RedirectResponse($returnurl); } else { - header("Location: .?selfedit=".$selfedit); + return new RedirectResponse(".?selfedit=".$selfedit); } } /** * Removes all the instances passed in parameter - * @Action - * @Logged + * @URL("mouf/deleteInstances") + * @Logged() * @param string $selfedit * @param array $instancesNames * @param string $returnurl @@ -529,9 +534,9 @@ public function deleteInstances($selfedit = "false", $instancesNames = array(), } if ($returnurl) { - header("Location:".$returnurl); + return new RedirectResponse($returnurl); } else { - header("Location: .?selfedit=".$selfedit); + return new RedirectResponse(".?selfedit=".$selfedit); } } @@ -539,13 +544,14 @@ public function deleteInstances($selfedit = "false", $instancesNames = array(), * Outputs HTML that will be displayed in the search result screen. * If there are no results, this should not return anything. * - * @Action + * @URL("mouf/search") + * @Logged() * @param string $query The full-text search query performed. * @param string $selfedit Whether we are in self-edit mode or not. */ public function search($query, $selfedit = "false") { $this->ajax = true; - $this->defaultAction($selfedit, $query); + return $this->defaultAction($selfedit, $query); } /** @@ -561,22 +567,22 @@ public function getSearchModuleName() { /** * Displays the screen allowing to create a new instance by PHP code. * - * @Action - * @Logged + * @URL("mouf/newInstanceByCallback") + * @Logged() */ public function newInstanceByCallback($selfedit = "false", $instanceName=null) { $this->instanceName = $instanceName; $this->selfedit = $selfedit; $this->contentBlock->addFile(dirname(__FILE__)."/../../views/instances/newInstanceByCallback.php", $this); - $this->template->toHtml(); + return new HtmlResponse($this->template); } /** * Performs the action of creating a new instance. * - * @Action - * @Logged + * @URL("mouf/createInstanceByCode") + * @Logged() */ public function createInstanceByCode($selfedit = "false", $instanceName=null) { if (!$instanceName) { @@ -594,7 +600,6 @@ public function createInstanceByCode($selfedit = "false", $instanceName=null) { $this->moufManager->createInstanceByCode()->setName($instanceName); $this->moufManager->rewriteMouf(); - header("Location: ".MOUF_URL."ajaxinstance/?name=".urlencode($instanceName)."&selfedit=".$selfedit); + return new RedirectResponse(MOUF_URL."ajaxinstance/?name=".urlencode($instanceName)."&selfedit=".$selfedit); } } -?> \ No newline at end of file diff --git a/src-dev/Mouf/Controllers/MoufInstallController.php b/src-dev/Mouf/Controllers/MoufInstallController.php index 9eedb94..b56c8cb 100644 --- a/src-dev/Mouf/Controllers/MoufInstallController.php +++ b/src-dev/Mouf/Controllers/MoufInstallController.php @@ -20,6 +20,13 @@ use Mouf\Html\HtmlElement\HtmlBlock; use Mouf\Mvc\Splash\Controllers\Controller; +use Mouf\Mvc\Splash\HtmlResponse; +use Mouf\Security\UserFileDao\UserFileBean; +use Mouf\Security\UserFileDao\UserFileDao; +use Psr\Http\Message\ResponseInterface; +use TheCodingMachine\Splash\Annotations\Post; +use TheCodingMachine\Splash\Annotations\URL; +use Zend\Diactoros\Response\RedirectResponse; /** @@ -33,16 +40,29 @@ class MoufInstallController extends Controller { * * @var TemplateInterface */ - public $template; + private $template; /** * The content block the template will be writting into. * * @var HtmlBlock */ - public $contentBlock; - - /** + private $contentBlock; + + /** + * @var UserFileDao + */ + private $userFileDao; + + public function __construct(TemplateInterface $template, HtmlBlock $contentBlock, UserFileDao $userFileDao) + { + $this->template = $template; + $this->contentBlock = $contentBlock; + $this->userFileDao = $userFileDao; + } + + + /** * Displays the page to install Mouf. * Note: this is not a typical controller. This controller is called directly from index.php * @@ -82,13 +102,13 @@ public function htaccessNotDetected() { /** * Performs the installation by creating all required files. * - * @URL install + * @URL("install") + * @Post() */ - public function install() { - if (file_exists(__DIR__.'/../../../../../../mouf/no_commit/MoufUsers.php')) { + public function install(string $login, string $password): ResponseInterface { + if (file_exists(__DIR__.'/../../../../../../mouf/no_commit/user.php')) { $this->contentBlock->addFile(dirname(__FILE__)."/../../views/mouf_installer/moufusers_exists.php", $this); - $this->template->toHtml(); - return; + return new HtmlResponse($this->template); } $oldUmask = umask(); @@ -168,25 +188,16 @@ public function install() { chmod(__DIR__."/../../../../../../config.php", 0664); } - // Finally 3 :), let's generate the MoufUsers.php file: - if (!file_exists(__DIR__."/../../../../../../mouf/no_commit/MoufUsers.php")) { - $moufConfig = "".var_export(sha1(userinput_to_plainstring($_REQUEST['password'])), true).", 'options'=>null); - -?>"; - - file_put_contents(__DIR__."/../../../../../../mouf/no_commit/MoufUsers.php", $moufConfig); - chmod(__DIR__."/../../../../../../mouf/no_commit/MoufUsers.php", 0664); + // Finally 3 :), let's generate the user.php file: + if (!file_exists(__DIR__."/../../../../../../mouf/no_commit/user.php")) { + $user = new UserFileBean($login); + $user->setClearTextPassword($password); + $this->userFileDao->registerUser($user); + $this->userFileDao->write(); } umask($oldUmask); - header("Location: ".ROOT_URL); - - + return new RedirectResponse(ROOT_URL); } } -?> \ No newline at end of file diff --git a/src-dev/Mouf/Controllers/MoufLoginController.php b/src-dev/Mouf/Controllers/MoufLoginController.php deleted file mode 100644 index e78dd56..0000000 --- a/src-dev/Mouf/Controllers/MoufLoginController.php +++ /dev/null @@ -1,43 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE.txt - * file that was distributed with this source code. - */ -namespace Mouf\Controllers; - -use Mouf\Mvc\Splash\Controllers\Controller; -use Mouf\Security\Controllers\SimpleLoginController; - -/** - * The MoufLoginController class provides the login page and login/logout mechanism for Mouf. - * It is actually getting its behaviour from the SimpleLoginController with one simple addition: - * if the MoufUsers.php file does not exist, it will guide the user towards a solution to be able to get logged. - * - * @Component - */ -class MoufLoginController extends SimpleLoginController { - - - /** - * The index page will display the login form (from SimpleLoginController) or an explanation on how to setup users - * if users are not set up yet. - * - * @Action - * @param string $login The login to fill by default. - * @param string $redirecturl The URL to redirect to when login is done. If not specified, the default login URL defined in the controller will be used instead. - */ - public function defaultAction($login = null, $redirect = null) { - /*if (!file_exists(ROOT_PATH."../../../mouf/MoufUsers.php")) { - $this->contentBlock->addFile(dirname(__FILE__)."/../../views/missing_password_file.php", $this); - $this->template->toHtml(); - return; - }*/ - - parent::defaultAction($login, $redirect); - } - -} \ No newline at end of file diff --git a/src-dev/Mouf/Controllers/MoufRootController.php b/src-dev/Mouf/Controllers/MoufRootController.php index 08cc5a0..c692837 100644 --- a/src-dev/Mouf/Controllers/MoufRootController.php +++ b/src-dev/Mouf/Controllers/MoufRootController.php @@ -1,31 +1,39 @@ - * - * For the full copyright and license information, please view the LICENSE.txt - * file that was distributed with this source code. - */ +/* + * This file is part of the Mouf core package. + * + * (c) 2012 David Negriermouf/no_commit/MoufUsers.php file already exists.mouf/no_commit/user.php file already exists.If you want to reinstall Mouf, you should delete the mouf/no_commit/MoufUsers.php page and then refresh this page.
If you want to reinstall Mouf, you should delete the mouf/no_commit/user.php page and then refresh this page.
You can follow the installation document if you need help.
diff --git a/src-dev/views/mouf_installer/welcome.php b/src-dev/views/mouf_installer/welcome.php index 00a59bd..bd707ed 100644 --- a/src-dev/views/mouf_installer/welcome.php +++ b/src-dev/views/mouf_installer/welcome.php @@ -81,9 +81,9 @@