diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 4f2f0aa..405297d 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,532 +1,636 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1388849992742 - 1388849992742 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1388849992742 + 1388849992742 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/composer.json b/composer.json index 0015a42..cf679b9 100644 --- a/composer.json +++ b/composer.json @@ -1,23 +1,27 @@ -{ - "name": "zendframework/skeleton-application", - "description": "Skeleton Application for ZF2", - "license": "BSD-3-Clause", - "keywords": [ - "framework", - "zf2" - ], - "homepage": "http://framework.zend.com/", - "require": { - "php": ">=5.3.3", - "zendframework/zendframework": "2.2.*", - "zf-commons/zfc-user": "dev-master", - "hybridauth/hybridauth": "dev-master", - "socalnick/scn-social-auth": "dev-master" - - }, - "autoload": { - "classmap": [ - "./vendor/hybridauth/hybridauth/additional-providers" - ] - } -} +{ + "name": "zendframework/skeleton-application", + "description": "Skeleton Application for ZF2", + "license": "BSD-3-Clause", + "keywords": [ + "framework", + "zf2" + ], + "homepage": "http://framework.zend.com/", + "require": { + "php": ">=5.3.3", + "zendframework/zendframework": "2.2.*", + "zf-commons/zfc-user": "dev-master", + "doctrine/doctrine-module": "0.*", + "doctrine/doctrine-orm-module": "0.*", + "doctrine/common": "dev-master", + "doctrine/orm": "dev-master", + "hybridauth/hybridauth": "dev-master", + "socalnick/scn-social-auth": "dev-master" + + }, + "autoload": { + "classmap": [ + "./vendor/hybridauth/hybridauth/additional-providers" + ] + } +} diff --git a/config/application.config.php b/config/application.config.php index 47722ee..2beacba 100644 --- a/config/application.config.php +++ b/config/application.config.php @@ -1,70 +1,72 @@ - array( - 'Application', - 'ScnSocialAuth', - 'ZfcBase', - 'ZfcUser', - - // - 'Secret', - ), - - // These are various options for the listeners attached to the ModuleManager - 'module_listener_options' => array( - // This should be an array of paths in which modules reside. - // If a string key is provided, the listener will consider that a module - // namespace, the value of that key the specific path to that module's - // Module class. - 'module_paths' => array( - './module', - './vendor', - ), - - // An array of paths from which to glob configuration files after - // modules are loaded. These effectively override configuration - // provided by modules themselves. Paths may use GLOB_BRACE notation. - 'config_glob_paths' => array( - 'config/autoload/{,*.}{global,local}.php', - ), - - // Whether or not to enable a configuration cache. - // If enabled, the merged configuration will be cached and used in - // subsequent requests. - //'config_cache_enabled' => $booleanValue, - - // The key used to create the configuration cache file name. - //'config_cache_key' => $stringKey, - - // Whether or not to enable a module class map cache. - // If enabled, creates a module class map cache which will be used - // by in future requests, to reduce the autoloading process. - //'module_map_cache_enabled' => $booleanValue, - - // The key used to create the class map cache file name. - //'module_map_cache_key' => $stringKey, - - // The path in which to cache merged configuration. - //'cache_dir' => $stringPath, - - // Whether or not to enable modules dependency checking. - // Enabled by default, prevents usage of modules that depend on other modules - // that weren't loaded. - // 'check_dependencies' => true, - ), - - // Used to create an own service manager. May contain one or more child arrays. - //'service_listener_options' => array( - // array( - // 'service_manager' => $stringServiceManagerName, - // 'config_key' => $stringConfigKey, - // 'interface' => $stringOptionalInterface, - // 'method' => $stringRequiredMethodName, - // ), - // ) - - // Initial configuration with which to seed the ServiceManager. - // Should be compatible with Zend\ServiceManager\Config. - // 'service_manager' => array(), -); + array( + 'Application', + 'ZfcBase', + 'ZfcUser', + 'DoctrineModule', + 'DoctrineORMModule', + 'ScnSocialAuth', + + // + 'Secret', + ), + + // These are various options for the listeners attached to the ModuleManager + 'module_listener_options' => array( + // This should be an array of paths in which modules reside. + // If a string key is provided, the listener will consider that a module + // namespace, the value of that key the specific path to that module's + // Module class. + 'module_paths' => array( + './module', + './vendor', + ), + + // An array of paths from which to glob configuration files after + // modules are loaded. These effectively override configuration + // provided by modules themselves. Paths may use GLOB_BRACE notation. + 'config_glob_paths' => array( + 'config/autoload/{,*.}{global,local}.php', + ), + + // Whether or not to enable a configuration cache. + // If enabled, the merged configuration will be cached and used in + // subsequent requests. + //'config_cache_enabled' => $booleanValue, + + // The key used to create the configuration cache file name. + //'config_cache_key' => $stringKey, + + // Whether or not to enable a module class map cache. + // If enabled, creates a module class map cache which will be used + // by in future requests, to reduce the autoloading process. + //'module_map_cache_enabled' => $booleanValue, + + // The key used to create the class map cache file name. + //'module_map_cache_key' => $stringKey, + + // The path in which to cache merged configuration. + //'cache_dir' => $stringPath, + + // Whether or not to enable modules dependency checking. + // Enabled by default, prevents usage of modules that depend on other modules + // that weren't loaded. + // 'check_dependencies' => true, + ), + + // Used to create an own service manager. May contain one or more child arrays. + //'service_listener_options' => array( + // array( + // 'service_manager' => $stringServiceManagerName, + // 'config_key' => $stringConfigKey, + // 'interface' => $stringOptionalInterface, + // 'method' => $stringRequiredMethodName, + // ), + // ) + + // Initial configuration with which to seed the ServiceManager. + // Should be compatible with Zend\ServiceManager\Config. + // 'service_manager' => array(), +); diff --git a/module/Application/view/application/index/index.phtml b/module/Application/view/application/index/index.phtml index a7bb528..575206b 100644 --- a/module/Application/view/application/index/index.phtml +++ b/module/Application/view/application/index/index.phtml @@ -1,44 +1,3 @@ -
-

translate('Welcome to %sZend Framework 2%s'), '', '') ?>

-

translate('Congratulations! You have successfully installed the %sZF2 Skeleton Application%s. You are currently running Zend Framework version %s. This skeleton can serve as a simple starting point for you to begin building your application on ZF2.'), '', '', \Zend\Version\Version::VERSION) ?>

-

translate('Fork Zend Framework 2 on GitHub') ?> »

-
- -
- -
-
-
-

translate('Follow Development') ?>

-
-
-

translate('Zend Framework 2 is under active development. If you are interested in following the development of ZF2, there is a special ZF2 portal on the official Zend Framework website which provides links to the ZF2 %swiki%s, %sdev blog%s, %sissue tracker%s, and much more. This is a great resource for staying up to date with the latest developments!'), '', '', '', '', '', '') ?>

-

translate('ZF2 Development Portal') ?> »

-
-
-
- -
-
-
-

translate('Discover Modules') ?>

-
-
-

translate('The community is working on developing a community site to serve as a repository and gallery for ZF2 modules. The project is available %son GitHub%s. The site is currently live and currently contains a list of some of the modules already available for ZF2.'), '', '') ?>

-

translate('Explore ZF2 Modules') ?> »

-
-
-
- -
-
-
-

translate('Help & Support') ?>

-
-
-

translate('If you need any help or support while developing with ZF2, you may reach us via IRC: %s#zftalk on Freenode%s. We\'d love to hear any questions or feedback you may have regarding the beta releases. Alternatively, you may subscribe and post questions to the %smailing lists%s.'), '', '', '', '') ?>

-

translate('Ping us on IRC') ?> »

-
-
-
-
+
+ +
diff --git a/module/Application/view/layout/layout.phtml b/module/Application/view/layout/layout.phtml index a9d04bc..44f9de1 100644 --- a/module/Application/view/layout/layout.phtml +++ b/module/Application/view/layout/layout.phtml @@ -3,7 +3,7 @@ - headTitle('ZF2 '. $this->translate('Skeleton Application'))->setSeparator(' - ')->setAutoEscape(false) ?> + headTitle($this->translate('Lingvoguide'))->setSeparator(' - ')->setAutoEscape(false) ?> headMeta() ->appendName('viewport', 'width=device-width, initial-scale=1.0') @@ -34,22 +34,23 @@ - Zend Framework 2 translate('Skeleton Application') ?> + Zend Framework 2 translate('Lingvoguide') ?>
zfcUserLoginWidget(); ?> - "login")); ?>">Войти content; ?>
inlineScript() ?> diff --git a/module/Secret/src/Secret/Controller/MainController.php b/module/Secret/src/Secret/Controller/MainController.php index 45c1725..ce2c174 100644 --- a/module/Secret/src/Secret/Controller/MainController.php +++ b/module/Secret/src/Secret/Controller/MainController.php @@ -15,10 +15,7 @@ class MainController extends AbstractActionController { public function indexAction() { - if ($this->zfcUserAuthentication()->hasIdentity()) { - return array(); - } - return $this->redirect()->toRoute('application'); + return array(); } public function fooAction() diff --git a/module/Secret/view/secret/main/index.phtml b/module/Secret/view/secret/main/index.phtml index 8799eb9..395d87b 100644 --- a/module/Secret/view/secret/main/index.phtml +++ b/module/Secret/view/secret/main/index.phtml @@ -1,3 +1,9 @@ +zfcUserIdentity()) : ?> Module: Secret » Controller: Main » Action: index + +
+ translate('You must be logged'); ?> +
+ diff --git a/vendor/socalnick/scn-social-auth b/vendor/socalnick/scn-social-auth index 7c07d6b..846110a 160000 --- a/vendor/socalnick/scn-social-auth +++ b/vendor/socalnick/scn-social-auth @@ -1 +1 @@ -Subproject commit 7c07d6bab7008cdd60b7167c2983972bd8b49422 +Subproject commit 846110a39e4d3426a78f7e188d417ed9fdcecd50