mirror of
https://github.com/monstra-cms/monstra.git
synced 2025-08-05 04:37:51 +02:00
Monstra Library: basic core improvments
This commit is contained in:
@@ -6,13 +6,13 @@
|
||||
|
||||
<form method="post">
|
||||
<?php
|
||||
echo (
|
||||
echo (
|
||||
Form::hidden('csrf', Security::token()).
|
||||
Form::hidden('user_id', $user['id'])
|
||||
);
|
||||
?>
|
||||
|
||||
<?php if (isset($_SESSION['user_role']) && in_array($_SESSION['user_role'], array('admin'))) { ?>
|
||||
<?php if (isset($_SESSION['user_role']) && in_array($_SESSION['user_role'], array('admin'))) { ?>
|
||||
<label><?php echo __('Username', 'users'); ?></label><input class="input-xlarge" type="text" value="<?php echo $user['login']; ?>" name="login">
|
||||
<?php } else { echo Form::hidden('login', $user['login']); } ?>
|
||||
<label><?php echo __('Firstname', 'users'); ?></label><input class="input-xlarge" type="text" value="<?php echo $user['firstname']; ?>" name="firstname">
|
||||
@@ -23,4 +23,4 @@
|
||||
<label><?php echo __('About Me', 'users'); ?></label><textarea class="input-xlarge" name="about_me"><?php echo $user['about_me']; ?></textarea>
|
||||
<label><?php echo __('New Password', 'users'); ?></label><input class="input-xlarge" type="text" name="new_password">
|
||||
<br/><input type="submit" class="btn" value="<?php echo __('Save', 'users'); ?>" name="edit_profile">
|
||||
</form>
|
||||
</form>
|
||||
|
@@ -2,13 +2,13 @@
|
||||
<hr>
|
||||
<table>
|
||||
<tr>
|
||||
<td></td>
|
||||
</tr>
|
||||
<td></td>
|
||||
</tr>
|
||||
<?php foreach ($users as $user) { ?>
|
||||
<tr>
|
||||
<td>
|
||||
<a href="<?php echo Site::url(); ?>users/<?php echo $user['id']; ?>"><?php echo $user['login']; ?></a>
|
||||
</td>
|
||||
<a href="<?php echo Site::url(); ?>users/<?php echo $user['id']; ?>"><?php echo $user['login']; ?></a>
|
||||
</td>
|
||||
</tr>
|
||||
<?php } ?>
|
||||
</table>
|
||||
</table>
|
||||
|
@@ -7,4 +7,3 @@
|
||||
<label><?php echo __('Password', 'users'); ?></label><input name="password" type="password" class="input-large" />
|
||||
<br /><input name="login_submit" class="btn" type="submit" value="<?php echo __('Enter', 'users'); ?>" /> <a class="small-grey-text reset-password-btn" href="<?php echo Option::get('siteurl').'users/password-reset'; ?>"><?php echo __('Forgot your password?', 'users');?></a></td></tr>
|
||||
</form>
|
||||
|
||||
|
@@ -6,9 +6,7 @@ Username: <?php echo $user_login; ?>
|
||||
|
||||
Password: <?php echo $new_password; ?>
|
||||
|
||||
|
||||
To change your password, please visit this page: <?php echo $site_url; ?>users/<?php echo $user_id; ?>
|
||||
|
||||
|
||||
All the best,
|
||||
<?php echo $site_name; ?>
|
||||
<?php echo $site_name; ?>
|
||||
|
@@ -10,7 +10,7 @@
|
||||
?>
|
||||
|
||||
<label><?php echo __('Username', 'users'); ?></label><input type="text" value="<?php echo $user_login; ?>" name="login" class="input-large">
|
||||
<?php
|
||||
<?php
|
||||
if (isset($errors['users_user_doesnt_exists'])) echo Html::nbsp(3).'<span class="error">'.$errors['users_user_doesnt_exists'].'</span>';
|
||||
if (isset($errors['users_empty_field'])) echo Html::nbsp(3).'<span class="error">'.$errors['users_empty_field'].'</span>';
|
||||
?>
|
||||
@@ -22,4 +22,4 @@
|
||||
<?php } ?>
|
||||
|
||||
<br /><input type="submit" class="btn" value="<?php echo __('Send New Password', 'users'); ?>" name="reset_password_submit">
|
||||
</form>
|
||||
</form>
|
||||
|
@@ -3,18 +3,18 @@
|
||||
<?php if ($user) { ?>
|
||||
<table>
|
||||
<tr><td><b><?php echo __('Username', 'users'); ?></b>:</td><td><?php echo $user['login']; ?></td></tr>
|
||||
<?php if($user['firstname'] !== '') { ?><tr><td><b><?php echo __('Firstname', 'users'); ?></b>:</td><td><?php echo Html::toText($user['firstname']); ?></td></tr><?php } ?>
|
||||
<?php if($user['lastname'] !== '') { ?><tr><td><b><?php echo __('Lastname', 'users'); ?></b>:</td><td><?php echo Html::toText($user['lastname']); ?></td></tr><?php } ?>
|
||||
<?php if($user['email'] !== '') { ?><tr><td><b><?php echo __('Email', 'users'); ?></b>:</td><td><?php echo Html::toText($user['email']); ?></td></tr><?php } ?>
|
||||
<?php if($user['date_registered'] !== '') { ?><tr><td><b><?php echo __('Registered', 'users'); ?></b>:</td><td><?php echo Date::format($user['date_registered']); ?></td></tr><?php } ?>
|
||||
<?php if($user['skype'] !== '') { ?><tr><td><b><?php echo __('Skype', 'users'); ?></b>:</td><td><?php echo Html::toText($user['skype']); ?></td></tr><?php } ?>
|
||||
<?php if($user['twitter'] !== '') { ?><tr><td><b><?php echo __('Twitter', 'users'); ?></b>:</td><td><?php echo Html::toText($user['twitter']); ?></td></tr><?php } ?>
|
||||
<?php if($user['about_me'] !== '') { ?><tr><td><b><?php echo __('About Me', 'users'); ?></b>:</td><td><?php echo Filter::apply('content', Html::toText($user['about_me'])); ?></td></tr><?php } ?>
|
||||
<?php if ($user['firstname'] !== '') { ?><tr><td><b><?php echo __('Firstname', 'users'); ?></b>:</td><td><?php echo Html::toText($user['firstname']); ?></td></tr><?php } ?>
|
||||
<?php if ($user['lastname'] !== '') { ?><tr><td><b><?php echo __('Lastname', 'users'); ?></b>:</td><td><?php echo Html::toText($user['lastname']); ?></td></tr><?php } ?>
|
||||
<?php if ($user['email'] !== '') { ?><tr><td><b><?php echo __('Email', 'users'); ?></b>:</td><td><?php echo Html::toText($user['email']); ?></td></tr><?php } ?>
|
||||
<?php if ($user['date_registered'] !== '') { ?><tr><td><b><?php echo __('Registered', 'users'); ?></b>:</td><td><?php echo Date::format($user['date_registered']); ?></td></tr><?php } ?>
|
||||
<?php if ($user['skype'] !== '') { ?><tr><td><b><?php echo __('Skype', 'users'); ?></b>:</td><td><?php echo Html::toText($user['skype']); ?></td></tr><?php } ?>
|
||||
<?php if ($user['twitter'] !== '') { ?><tr><td><b><?php echo __('Twitter', 'users'); ?></b>:</td><td><?php echo Html::toText($user['twitter']); ?></td></tr><?php } ?>
|
||||
<?php if ($user['about_me'] !== '') { ?><tr><td><b><?php echo __('About Me', 'users'); ?></b>:</td><td><?php echo Filter::apply('content', Html::toText($user['about_me'])); ?></td></tr><?php } ?>
|
||||
</table>
|
||||
<br />
|
||||
<?php if (Users::isLoged()) { ?>
|
||||
<a href="<?php echo Site::url(); ?>users/<?php echo $user['id']; ?>/edit"><?php echo __('Edit profile', 'users'); ?></a> /
|
||||
<?php if(in_array(Session::get('user_role'), array('admin', 'editor'))) { ?> <a href="<?php echo Site::url(); ?>admin"><?php echo __('Administration', 'system'); ?></a> / <?php } ?>
|
||||
<?php if (in_array(Session::get('user_role'), array('admin', 'editor'))) { ?> <a href="<?php echo Site::url(); ?>admin"><?php echo __('Administration', 'system'); ?></a> / <?php } ?>
|
||||
<a href="<?php echo Site::url(); ?>users/logout"><?php echo __('Logout', 'users'); ?></a>
|
||||
<?php } ?>
|
||||
<?php } else { echo __('This users doesnt exists', 'users'); } ?>
|
||||
<?php } else { echo __('This users doesnt exists', 'users'); } ?>
|
||||
|
@@ -6,7 +6,7 @@
|
||||
?>
|
||||
|
||||
<label><?php echo __('Username', 'users'); ?></label><input type="text" value="<?php echo $user_login; ?>" name="login" class="input-large">
|
||||
<?php
|
||||
<?php
|
||||
if (isset($errors['users_this_user_alredy_exists'])) echo Html::nbsp(3).'<span class="error">'.$errors['users_this_user_alredy_exists'].'</span>';
|
||||
if (isset($errors['users_empty_login'])) echo Html::nbsp(3).'<span class="error">'.$errors['users_empty_login'].'</span>';
|
||||
?>
|
||||
@@ -15,10 +15,10 @@
|
||||
if (isset($errors['users_empty_password'])) echo Html::nbsp(3).'<span class="error">'.$errors['users_empty_password'].'</span>';
|
||||
?>
|
||||
<label><?php echo __('Email', 'users'); ?></label><input type="text" value="<?php echo $user_email; ?>" name="email" class="input-large">
|
||||
<?php
|
||||
<?php
|
||||
if (isset($errors['users_this_email_alredy_exists'])) echo Html::nbsp(3).'<span class="error">'.$errors['users_this_email_alredy_exists'].'</span>';
|
||||
if (isset($errors['users_empty_email'])) echo Html::nbsp(3).'<span class="error">'.$errors['users_empty_email'].'</span>';
|
||||
if (isset($errors['users_invalid_email'])) echo Html::nbsp(3).'<span class="error">'.$errors['users_invalid_email'].'</span>';
|
||||
if (isset($errors['users_invalid_email'])) echo Html::nbsp(3).'<span class="error">'.$errors['users_invalid_email'].'</span>';
|
||||
?>
|
||||
<?php if (Option::get('captcha_installed') == 'true') { ?>
|
||||
<label><?php echo __('Captcha'); ?><label>
|
||||
@@ -27,4 +27,4 @@
|
||||
<?php } ?>
|
||||
|
||||
<br /><input type="submit" class="btn" value="<?php echo __('Register', 'users'); ?>" name="register">
|
||||
</form>
|
||||
</form>
|
||||
|
@@ -5,4 +5,4 @@ Dear <?php echo $user_login; ?>,
|
||||
Thanks for registering at <?php echo $site_name; ?>! We are glad you have chosen to be a part of our community and we hope you enjoy your stay.
|
||||
|
||||
All the best,
|
||||
<?php echo $site_name; ?>
|
||||
<?php echo $site_name; ?>
|
||||
|
@@ -10,10 +10,8 @@ When you visit that page, your password will be reset, and the new password will
|
||||
|
||||
Your username is: <?php echo $user_login; ?>
|
||||
|
||||
|
||||
To edit your profile, go to this page:
|
||||
<?php echo $site_url ?>users/<?php echo $user_id; ?>
|
||||
|
||||
|
||||
All the best,
|
||||
<?php echo $site_name; ?>
|
||||
<?php echo $site_name; ?>
|
||||
|
@@ -1,8 +1,8 @@
|
||||
<div style="float:right">
|
||||
<?php if (Session::get('user_id')) { ?>
|
||||
<?php if (Session::get('user_id')) { ?>
|
||||
<?php echo __('Welcome', 'users'); ?>,
|
||||
<a href="<?php echo Site::url(); ?>users/<?php echo Session::get('user_id'); ?>"><?php echo Session::get('user_login'); ?></a> /
|
||||
<?php if(in_array(Session::get('user_role'), array('admin', 'editor'))) { ?>
|
||||
<a href="<?php echo Site::url(); ?>users/<?php echo Session::get('user_id'); ?>"><?php echo Session::get('user_login'); ?></a> /
|
||||
<?php if (in_array(Session::get('user_role'), array('admin', 'editor'))) { ?>
|
||||
<a href="<?php echo Site::url(); ?>admin"><?php echo __('Administration', 'system'); ?></a> /
|
||||
<?php } ?>
|
||||
<a href="<?php echo Site::url(); ?>users/logout"><?php echo __('Logout', 'users'); ?></a>
|
||||
@@ -10,4 +10,4 @@
|
||||
<a href="<?php echo Site::url(); ?>users/login"><?php echo __('Login', 'users'); ?></a> /
|
||||
<a href="<?php echo Site::url(); ?>users/registration"><?php echo __('Registration', 'users'); ?></a>
|
||||
<?php } ?>
|
||||
</div>
|
||||
</div>
|
||||
|
Reference in New Issue
Block a user