Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

LoginController only for login flow #747

Merged
merged 21 commits into from
Nov 29, 2015
Merged

LoginController only for login flow #747

Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
9ef38da
Merge pull request #2 from panique/develop
slaveek Oct 25, 2015
ec0756c
Create UserController
Nov 7, 2015
33865fd
Create RegisterController
Nov 7, 2015
60149a2
Move register and verify view files to view/register
Nov 8, 2015
41f82c2
Remove register and verify view files from view/login directory
Nov 8, 2015
35d1e12
Move register and user action methods to their new controllers
Nov 8, 2015
68e7b00
Rename view/register/register.php to index.php
Nov 8, 2015
8d6c6b3
Changed View->render and Redirect::to()
Nov 8, 2015
3991e31
Move view user action files to view/user directory
Nov 8, 2015
3683f0a
Fixed logout if CSRF not valid
Nov 8, 2015
314e245
Rename showProfile.php to index.php
Nov 8, 2015
17cca66
Fixed showCaptcha
Nov 8, 2015
c084b99
Changed form actions in user views
Nov 8, 2015
94f8473
Change form action in register views
Nov 8, 2015
fa2cc4c
Fixed links in right menu
Nov 8, 2015
8904ac2
Fixed typo
Nov 9, 2015
1c3faf9
Move Auth::checkAuthentication() to constructor
Nov 9, 2015
90d6f2b
Fixed register link
Nov 9, 2015
cdde4ef
Fixed major and minor changes missed
Nov 21, 2015
851d594
Improved logout
Nov 21, 2015
9141b70
Revert "Improved logout"
Nov 21, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fixed links in right menu
  • Loading branch information
slaveek committed Nov 8, 2015
commit fa2cc4cd3a8e624b6ad09da938451259a5a5ef88
28 changes: 14 additions & 14 deletions application/view/_templates/header.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,32 +36,32 @@
<li <?php if (View::checkForActiveControllerAndAction($filename, "login/index")) { echo ' class="active" '; } ?> >
<a href="<?php echo Config::get('URL'); ?>login/index">Login</a>
</li>
<li <?php if (View::checkForActiveControllerAndAction($filename, "login/register")) { echo ' class="active" '; } ?> >
<a href="<?php echo Config::get('URL'); ?>login/register">Register</a>
<li <?php if (View::checkForActiveControllerAndAction($filename, "register/index")) { echo ' class="active" '; } ?> >
<a href="<?php echo Config::get('URL'); ?>register/index">Register</a>
</li>
<?php } ?>
</ul>

<!-- my account -->
<ul class="navigation right">
<?php if (Session::userIsLoggedIn()) : ?>
<li <?php if (View::checkForActiveController($filename, "login")) { echo ' class="active" '; } ?> >
<a href="<?php echo Config::get('URL'); ?>login/showprofile">My Account</a>
<li <?php if (View::checkForActiveController($filename, "user")) { echo ' class="active" '; } ?> >
<a href="<?php echo Config::get('URL'); ?>user/index">My Account</a>
<ul class="navigation-submenu">
<li <?php if (View::checkForActiveController($filename, "login")) { echo ' class="active" '; } ?> >
<a href="<?php echo Config::get('URL'); ?>login/changeUserRole">Change account type</a>
<li <?php if (View::checkForActiveController($filename, "user")) { echo ' class="active" '; } ?> >
<a href="<?php echo Config::get('URL'); ?>user/changeUserRole">Change account type</a>
</li>
<li <?php if (View::checkForActiveController($filename, "login")) { echo ' class="active" '; } ?> >
<a href="<?php echo Config::get('URL'); ?>login/editAvatar">Edit your avatar</a>
<li <?php if (View::checkForActiveController($filename, "user")) { echo ' class="active" '; } ?> >
<a href="<?php echo Config::get('URL'); ?>user/editAvatar">Edit your avatar</a>
</li>
<li <?php if (View::checkForActiveController($filename, "login")) { echo ' class="active" '; } ?> >
<a href="<?php echo Config::get('URL'); ?>login/editusername">Edit my username</a>
<li <?php if (View::checkForActiveController($filename, "user")) { echo ' class="active" '; } ?> >
<a href="<?php echo Config::get('URL'); ?>user/editusername">Edit my username</a>
</li>
<li <?php if (View::checkForActiveController($filename, "login")) { echo ' class="active" '; } ?> >
<a href="<?php echo Config::get('URL'); ?>login/edituseremail">Edit my email</a>
<li <?php if (View::checkForActiveController($filename, "user")) { echo ' class="active" '; } ?> >
<a href="<?php echo Config::get('URL'); ?>user/edituseremail">Edit my email</a>
</li>
<li <?php if (View::checkForActiveController($filename, "login")) { echo ' class="active" '; } ?> >
<a href="<?php echo Config::get('URL'); ?>login/changePassword">Change Password</a>
<li <?php if (View::checkForActiveController($filename, "user")) { echo ' class="active" '; } ?> >
<a href="<?php echo Config::get('URL'); ?>user/changePassword">Change Password</a>
</li>
<li <?php if (View::checkForActiveController($filename, "login")) { echo ' class="active" '; } ?> >
<a href="<?php echo Config::get('URL'); ?>login/logout">Logout</a>
Expand Down