Skip to content

Commit

Permalink
users
Browse files Browse the repository at this point in the history
  • Loading branch information
@conejoninja
conejoninja committed Aug 30, 2011
1 parent af932f0 commit 66cad5c
Show file tree
Hide file tree
Showing 4 changed files with 72 additions and 52 deletions.
5 changes: 5 additions & 0 deletions login.php
View file
Expand Up @@ -32,6 +32,11 @@ function __construct() {
function doModel() {
switch( $this->action ) {
case('login_post'): //post execution for the login
if(!osc_users_enabled()) {
osc_add_flash_error_message(_m('Users are not enabled'));
$this->redirectTo(osc_base_url());
}

require_once LIB_PATH . 'osclass/UserActions.php' ;
$user = User::newInstance()->findByEmail( Params::getParam('email') ) ;

Expand Down
57 changes: 31 additions & 26 deletions oc-content/themes/modern/header.php
View file
Expand Up @@ -23,32 +23,37 @@
<a id="logo" href="<?php echo osc_base_url() ; ?>"><strong><?php echo osc_page_title() ; ?></strong></a>
<div id="user_menu">
<ul>
<?php if( osc_is_web_user_logged_in() ) { ?>
<li class="first logged">
<?php echo sprintf(__('Hi %s', 'modern'), osc_logged_user_name() . '!'); ?> &middot;
<strong><a href="<?php echo osc_user_dashboard_url() ; ?>"><?php _e('My account', 'modern') ; ?></a></strong> &middot;
<a href="<?php echo osc_user_logout_url() ; ?>"><?php _e('Logout', 'modern') ; ?></a>
</li>
<?php } else { ?>
<li class="first">
<a id="login_open" href="<?php echo osc_user_login_url(); ?>"><?php _e('Login', 'modern') ; ?></a> &middot;
<a href="<?php echo osc_register_account_url() ; ?>"><?php _e('Register for a free account', 'modern'); ?></a>
<form id="login" action="<?php echo osc_base_url(true) ; ?>" method="post">
<fieldset>
<input type="hidden" name="page" value="login" />
<input type="hidden" name="action" value="login_post" />
<label for="email"><?php _e('E-mail', 'modern') ; ?></label>
<?php UserForm::email_login_text() ; ?>
<label for="password"><?php _e('Password', 'modern') ; ?></label>
<?php UserForm::password_login_text() ; ?>
<p class="checkbox"><?php UserForm::rememberme_login_checkbox();?> <label for="rememberMe"><?php _e('Remember me', 'modern') ; ?></label></p>
<button type="submit"><?php _e('Log in', 'modern') ; ?></button>
<div class="forgot">
<a href="<?php echo osc_recover_user_password_url() ; ?>"><?php _e("Forgot password?", 'modern');?></a>
</div>
</fieldset>
</form>
</li>
<?php if(osc_users_enabled()) { ?>
<?php if( osc_is_web_user_logged_in() ) { ?>
<li class="first logged">
<?php echo sprintf(__('Hi %s', 'modern'), osc_logged_user_name() . '!'); ?> &middot;
<strong><a href="<?php echo osc_user_dashboard_url() ; ?>"><?php _e('My account', 'modern') ; ?></a></strong> &middot;
<a href="<?php echo osc_user_logout_url() ; ?>"><?php _e('Logout', 'modern') ; ?></a>
</li>
<?php } else { ?>
<li class="first">
<a id="login_open" href="<?php echo osc_user_login_url(); ?>"><?php _e('Login', 'modern') ; ?></a>
<?php if(osc_user_registration_enabled()) { ?>
&middot;
<a href="<?php echo osc_register_account_url() ; ?>"><?php _e('Register for a free account', 'modern'); ?></a>
<?php }; ?>
<form id="login" action="<?php echo osc_base_url(true) ; ?>" method="post">
<fieldset>
<input type="hidden" name="page" value="login" />
<input type="hidden" name="action" value="login_post" />
<label for="email"><?php _e('E-mail', 'modern') ; ?></label>
<?php UserForm::email_login_text() ; ?>
<label for="password"><?php _e('Password', 'modern') ; ?></label>
<?php UserForm::password_login_text() ; ?>
<p class="checkbox"><?php UserForm::rememberme_login_checkbox();?> <label for="rememberMe"><?php _e('Remember me', 'modern') ; ?></label></p>
<button type="submit"><?php _e('Log in', 'modern') ; ?></button>
<div class="forgot">
<a href="<?php echo osc_recover_user_password_url() ; ?>"><?php _e("Forgot password?", 'modern');?></a>
</div>
</fieldset>
</form>
</li>
<?php } ?>
<?php } ?>
<?php if ( osc_count_web_enabled_locales() > 1) { ?>
<?php osc_goto_first_locale() ; ?>
Expand Down
57 changes: 31 additions & 26 deletions oc-includes/osclass/gui/header.php
View file
Expand Up @@ -23,32 +23,37 @@
<a id="logo" href="<?php echo osc_base_url() ; ?>"><strong><?php echo osc_page_title() ; ?></strong></a>
<div id="user_menu">
<ul>
<?php if( osc_is_web_user_logged_in() ) { ?>
<li class="first logged">
<?php echo sprintf(__('Hi %s', 'modern'), osc_logged_user_name() . '!'); ?> &middot;
<strong><a href="<?php echo osc_user_dashboard_url() ; ?>"><?php _e('My account', 'modern') ; ?></a></strong> &middot;
<a href="<?php echo osc_user_logout_url() ; ?>"><?php _e('Logout', 'modern') ; ?></a>
</li>
<?php } else { ?>
<li class="first">
<a id="login_open" href="<?php echo osc_user_login_url(); ?>"><?php _e('Login', 'modern') ; ?></a> &middot;
<a href="<?php echo osc_register_account_url() ; ?>"><?php _e('Register for a free account', 'modern'); ?></a>
<form id="login" action="<?php echo osc_base_url(true) ; ?>" method="post">
<fieldset>
<input type="hidden" name="page" value="login" />
<input type="hidden" name="action" value="login_post" />
<label for="email"><?php _e('E-mail', 'modern') ; ?></label>
<?php UserForm::email_login_text() ; ?>
<label for="password"><?php _e('Password', 'modern') ; ?></label>
<?php UserForm::password_login_text() ; ?>
<p class="checkbox"><?php UserForm::rememberme_login_checkbox();?> <label for="rememberMe"><?php _e('Remember me', 'modern') ; ?></label></p>
<button type="submit"><?php _e('Log in', 'modern') ; ?></button>
<div class="forgot">
<a href="<?php echo osc_recover_user_password_url() ; ?>"><?php _e("Forgot password?", 'modern');?></a>
</div>
</fieldset>
</form>
</li>
<?php if(osc_users_enabled()) { ?>
<?php if( osc_is_web_user_logged_in() ) { ?>
<li class="first logged">
<?php echo sprintf(__('Hi %s', 'modern'), osc_logged_user_name() . '!'); ?> &middot;
<strong><a href="<?php echo osc_user_dashboard_url() ; ?>"><?php _e('My account', 'modern') ; ?></a></strong> &middot;
<a href="<?php echo osc_user_logout_url() ; ?>"><?php _e('Logout', 'modern') ; ?></a>
</li>
<?php } else { ?>
<li class="first">
<a id="login_open" href="<?php echo osc_user_login_url(); ?>"><?php _e('Login', 'modern') ; ?></a>
<?php if(osc_user_registration_enabled()) { ?>
&middot;
<a href="<?php echo osc_register_account_url() ; ?>"><?php _e('Register for a free account', 'modern'); ?></a>
<?php }; ?>
<form id="login" action="<?php echo osc_base_url(true) ; ?>" method="post">
<fieldset>
<input type="hidden" name="page" value="login" />
<input type="hidden" name="action" value="login_post" />
<label for="email"><?php _e('E-mail', 'modern') ; ?></label>
<?php UserForm::email_login_text() ; ?>
<label for="password"><?php _e('Password', 'modern') ; ?></label>
<?php UserForm::password_login_text() ; ?>
<p class="checkbox"><?php UserForm::rememberme_login_checkbox();?> <label for="rememberMe"><?php _e('Remember me', 'modern') ; ?></label></p>
<button type="submit"><?php _e('Log in', 'modern') ; ?></button>
<div class="forgot">
<a href="<?php echo osc_recover_user_password_url() ; ?>"><?php _e("Forgot password?", 'modern');?></a>
</div>
</fieldset>
</form>
</li>
<?php } ?>
<?php } ?>
<?php if ( osc_count_web_enabled_locales() > 1) { ?>
<?php osc_goto_first_locale() ; ?>
Expand Down
5 changes: 5 additions & 0 deletions register.php
View file
Expand Up @@ -40,6 +40,11 @@ function doModel() {
$this->doView('user-register.php') ;
break;
case('register_post'): //register user
if(!osc_users_enabled()) {
osc_add_flash_error_message(_m('Users are not enabled'));
$this->redirectTo(osc_base_url());
}

require_once LIB_PATH . 'osclass/UserActions.php' ;
$userActions = new UserActions(false) ;
$success = $userActions->add() ;
Expand Down

0 comments on commit 66cad5c

Please sign in to comment.