Skip to content

Commit

Permalink
Update EdpUser and ZendFramework submodules
Browse files Browse the repository at this point in the history
Also updated view helper usage in layout.
  • Loading branch information
EvanDotPro committed Jan 6, 2012
1 parent dd47ab0 commit f20496f
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
10 changes: 5 additions & 5 deletions module/Application/views/layouts/layout.phtml
Original file line number Diff line number Diff line change
Expand Up @@ -46,16 +46,16 @@
<li><a href="<?php echo $this->url('mwopguestbook') ?>">Guestbook</a></li>
<li><a href="<?php echo $this->url('edpuser/login') ?>">User</a></li>
</ul>
<?php if ($this->edpUser()): ?>
<?php if ($this->edpUserIdentity()): ?>
<ul class="nav secondary-nav">
<li><?php echo $this->gravatar($this->edpUser()->getEmail(), array('img_size' => 25), array('style' => 'padding-top: 8px;')) ?></li>
<li><a href="<?php echo $this->url('edpuser') ?>"><?php echo $this->edpUser()->getDisplayName() ?></a></li>
<li><?php echo $this->gravatar($this->edpUserIdentity()->getEmail(), array('img_size' => 25), array('style' => 'padding-top: 8px;')) ?></li>
<li><a href="<?php echo $this->url('edpuser') ?>"><?php echo $this->edpUserIdentity()->getDisplayName() ?></a></li>
<li><a href="<?php echo $this->url('edpuser/logout') ?>">Sign Out</a></li>
</ul>
<?php else: ?>
<form action="<?php echo $this->url('edpuser/login') ?>" method="post" class="pull-right">
<input name="email" class="input-small" type="text" placeholder="Username">
<input name="password" class="input-small" type="password" placeholder="Password">
<input name="identity" class="input-small" type="text" placeholder="Username">
<input name="credential" class="input-small" type="password" placeholder="Password">
<?php echo $this->formCsrf('csrf') ?>
<button class="btn" type="submit">Sign in</button>
</form>
Expand Down
2 changes: 1 addition & 1 deletion vendor/EdpUser
Submodule EdpUser updated 36 files
+31 −18 autoload_classmap.php
+100 −24 config/module.config.php
+20 −11 config/module.edpuser.config.php.dist
+3 −3 config/xml/EdpUser.Entity.UserMappedSuperClass.dcm.xml
+11 −0 config/xml/EdpUser.Entity.UserMeta.dcm.xml
+18 −0 config/xml/EdpUser.Entity.UserMetaMappedSuperClass.dcm.xml
+0 −22 config/xml/EdpUser.ModelBase.UserBase.mongodb.xml
+22 −18 data/schema.sql
+23 −0 data/schema.sqlite.sql
+66 −0 src/EdpUser/Authentication/Adapter/AbstractAdapter.php
+104 −0 src/EdpUser/Authentication/Adapter/AdapterChain.php
+103 −0 src/EdpUser/Authentication/Adapter/AdapterChainEvent.php
+8 −0 src/EdpUser/Authentication/Adapter/ChainableAdapter.php
+109 −0 src/EdpUser/Authentication/Adapter/Db.php
+137 −0 src/EdpUser/Authentication/Storage/Db.php
+88 −0 src/EdpUser/Controller/Plugin/EdpUserAuthentication.php
+115 −72 src/EdpUser/Controller/UserController.php
+6 −0 src/EdpUser/Entity/UserMeta.php
+8 −0 src/EdpUser/Entity/UserMetaMappedSuperClass.php
+8 −11 src/EdpUser/Form/Login.php
+6 −16 src/EdpUser/Mapper/UserDoctrine.php
+1 −1 src/EdpUser/Mapper/UserInterface.php
+58 −0 src/EdpUser/Mapper/UserMetaDoctrine.php
+14 −0 src/EdpUser/Mapper/UserMetaInterface.php
+55 −0 src/EdpUser/Mapper/UserMetaZendDb.php
+11 −28 src/EdpUser/Mapper/UserZendDb.php
+1 −1 src/EdpUser/Model/User.php
+16 −0 src/EdpUser/Model/UserInterface.php
+104 −0 src/EdpUser/Model/UserMeta.php
+58 −0 src/EdpUser/Model/UserMetaInterface.php
+44 −147 src/EdpUser/Service/User.php
+29 −3 src/EdpUser/Util/Password.php
+0 −55 src/EdpUser/View/Helper/EdpUser.php
+50 −0 src/EdpUser/View/Helper/EdpUserIdentity.php
+0 −50 src/EdpUser/View/Helper/EdpUserService.php
+2 −2 views/edpuser/index.phtml
2 changes: 1 addition & 1 deletion vendor/ZendFramework
Submodule ZendFramework updated from 2c0a9a to 844f21

0 comments on commit f20496f

Please sign in to comment.