1
0
mirror of https://github.com/monstra-cms/monstra.git synced 2025-08-06 05:07:49 +02:00

Monstra Library: basic core improvments

This commit is contained in:
Awilum
2013-01-04 21:08:04 +02:00
parent 7437cc6abb
commit ef12b7492e
289 changed files with 16265 additions and 17155 deletions

View File

@@ -8,4 +8,4 @@
<plugin_version>1.0.0</plugin_version>
<plugin_author>Awilum</plugin_author>
<plugin_author_uri>http://monstra.org/</plugin_author_uri>
</root>
</root>

View File

@@ -1,67 +1,67 @@
<?php
return array(
'users' => array(
'Users' => 'Benutzer',
'Login' => 'Login',
'Username' => 'Benutzername',
'Password' => 'Passwort',
'Registered' => 'Registriert',
'Email' => 'Email',
'Role' => 'Rolle',
'Roles' => 'Rollen',
'Edit' => 'Bearbeiten',
'Actions' => 'Aktionen',
'Delete' => 'Löschen',
'Enter' => 'Eintragen',
'Logout' => 'Ausloggen',
'Register new user' => 'Registriere neuen Benutzer',
'New User Registration' => 'Neuen Benutzer registrieren',
'Delete user: :user' => 'Lösche Benutzer: :user',
'User <i>:user</i> have been deleted.' => 'Benutzer <i>:user</i> wurde gelöscht.',
'This field should not be empty' => 'Dieses Feld darf nicht leer sein',
'This user alredy exist' => 'Dieser Benutzer existiert bereits',
'Changes saved' => 'Änderungen gespeichert',
'Wrong old password' => 'Altes Passwort falsch',
'Admin' => 'Admin',
'User' => 'Benutzer',
'Editor' => 'Redakteur',
'Register' => 'Registrieren',
'Edit profile' => 'Profil bearbeiten',
'Save' => 'Speichern',
'Firstname' => 'Vorname',
'Lastname' => 'Nachname',
'Old password' => 'Altes Passwort',
'New password' => 'Neues Passwort',
'Welcome' => 'Willkommen',
'Wrong <b>username</b> or <b>password</b>' => 'Falscher <b>Benutzername</b> oder <b>Passwort</b>',
'Your changes have been saved.' => 'Deine Änderungen wurden gespeichert.',
'New user have been registered.' => 'Neuer Benutzer wurde registriert.',
'Captcha' => 'Captcha',
'Registration' => 'Registrierung',
'Username' => 'Benutzername',
'User email is invalid' => 'Benutzer Email ist nicht gültig',
'Reset Password' => 'Passwort zurücksetzen',
'Send New Password' => 'Neues Passwort zusenden',
'This user doesnt alredy exist' => 'Dieser Benutzer ist nocht nicht vorhanden',
'Users - Profile' => 'Benutzer - Profil',
'Users - Edit Profile' => 'Benutzer - Profil Bearbeiten',
'Users - Login' => 'Benutzer - Login',
'Users - Registration' => 'Benutzer - Registration',
'Users - Password Recover' => 'Benutzer - Passwort wiederherstellen',
'New Password' => 'Neues Passwort',
'Forgot your password?' => 'Passwort vergessen?',
'New password has been sent' => 'Neues Passwort wurde versendet',
'Monstra says: This is not your profile...' => 'Monstra sagt: Das ist nicht dein Profil...',
'User registration is closed.' => 'Benutzer Registration ist geschloßen.',
'Allow user registration' => 'Erlaube Benutzer Registration',
'Required field' => 'Pflichtfeld',
'This user doesnt exist' => 'Dieser Benutzer existiert nicht',
'Captcha code is wrong' => 'Captcha Code ist falsch',
'Your login details for :site_name has been sent' => 'Deine Login-Daten für :site_name wurden versendet',
'Your new password for :site_name' => 'Dein neues Passwort für :site_name',
'Your login details for :site_name' => 'Deine Login-Daten für :site_name',
'About Me' => 'Über Mich',
'Profile' => 'Profil',
)
);
<?php
return array(
'users' => array(
'Users' => 'Benutzer',
'Login' => 'Login',
'Username' => 'Benutzername',
'Password' => 'Passwort',
'Registered' => 'Registriert',
'Email' => 'Email',
'Role' => 'Rolle',
'Roles' => 'Rollen',
'Edit' => 'Bearbeiten',
'Actions' => 'Aktionen',
'Delete' => 'Löschen',
'Enter' => 'Eintragen',
'Logout' => 'Ausloggen',
'Register new user' => 'Registriere neuen Benutzer',
'New User Registration' => 'Neuen Benutzer registrieren',
'Delete user: :user' => 'Lösche Benutzer: :user',
'User <i>:user</i> have been deleted.' => 'Benutzer <i>:user</i> wurde gelöscht.',
'This field should not be empty' => 'Dieses Feld darf nicht leer sein',
'This user alredy exist' => 'Dieser Benutzer existiert bereits',
'Changes saved' => 'Änderungen gespeichert',
'Wrong old password' => 'Altes Passwort falsch',
'Admin' => 'Admin',
'User' => 'Benutzer',
'Editor' => 'Redakteur',
'Register' => 'Registrieren',
'Edit profile' => 'Profil bearbeiten',
'Save' => 'Speichern',
'Firstname' => 'Vorname',
'Lastname' => 'Nachname',
'Old password' => 'Altes Passwort',
'New password' => 'Neues Passwort',
'Welcome' => 'Willkommen',
'Wrong <b>username</b> or <b>password</b>' => 'Falscher <b>Benutzername</b> oder <b>Passwort</b>',
'Your changes have been saved.' => 'Deine Änderungen wurden gespeichert.',
'New user have been registered.' => 'Neuer Benutzer wurde registriert.',
'Captcha' => 'Captcha',
'Registration' => 'Registrierung',
'Username' => 'Benutzername',
'User email is invalid' => 'Benutzer Email ist nicht gültig',
'Reset Password' => 'Passwort zurücksetzen',
'Send New Password' => 'Neues Passwort zusenden',
'This user doesnt alredy exist' => 'Dieser Benutzer ist nocht nicht vorhanden',
'Users - Profile' => 'Benutzer - Profil',
'Users - Edit Profile' => 'Benutzer - Profil Bearbeiten',
'Users - Login' => 'Benutzer - Login',
'Users - Registration' => 'Benutzer - Registration',
'Users - Password Recover' => 'Benutzer - Passwort wiederherstellen',
'New Password' => 'Neues Passwort',
'Forgot your password?' => 'Passwort vergessen?',
'New password has been sent' => 'Neues Passwort wurde versendet',
'Monstra says: This is not your profile...' => 'Monstra sagt: Das ist nicht dein Profil...',
'User registration is closed.' => 'Benutzer Registration ist geschloßen.',
'Allow user registration' => 'Erlaube Benutzer Registration',
'Required field' => 'Pflichtfeld',
'This user doesnt exist' => 'Dieser Benutzer existiert nicht',
'Captcha code is wrong' => 'Captcha Code ist falsch',
'Your login details for :site_name has been sent' => 'Deine Login-Daten für :site_name wurden versendet',
'Your new password for :site_name' => 'Dein neues Passwort für :site_name',
'Your login details for :site_name' => 'Deine Login-Daten für :site_name',
'About Me' => 'Über Mich',
'Profile' => 'Profil',
)
);

View File

@@ -64,4 +64,4 @@
'About Me' => 'About Me',
'Profile' => 'Profile',
)
);
);

View File

@@ -62,4 +62,4 @@
'About Me' => 'Su di me',
'Profile' => 'Profilo',
)
);
);

View File

@@ -63,4 +63,4 @@
'About Me' => 'Apie mane',
'Profile' => 'Profilis',
)
);
);

View File

@@ -64,4 +64,4 @@
'About Me' => 'Sobre mim',
'Profile' => 'Perfil',
)
);
);

View File

@@ -62,4 +62,4 @@
'About Me' => 'Обо мне',
'Profile' => 'Профиль',
)
);
);

View File

@@ -62,4 +62,4 @@
'About Me' => 'Про мене',
'Profile' => 'Профіль',
)
);
);

View File

@@ -1,222 +1,220 @@
<?php
// Check if is user is logged in then set variables for welcome button
if (Session::exists('user_id')) {
$user_id = Session::get('user_id');
$user_login = Session::get('user_login');
} else {
$user_id = '';
$user_login = '';
}
// Check if is user is logged in then set variables for welcome button
if (Session::exists('user_id')) {
$user_id = Session::get('user_id');
$user_login = Session::get('user_login');
} else {
$user_id = '';
$user_login = '';
}
// Add plugin navigation link
Navigation::add(__('Users', 'users'), 'system', 'users', 2);
// Add plugin navigation link
Navigation::add(__('Users', 'users'), 'system', 'users', 2);
/**
* Users Admin Class
*/
class UsersAdmin extends Backend
{
/**
* Users Admin Class
*/
class UsersAdmin extends Backend {
* Users admin
*/
public static function main()
{
// Users roles
$roles = array('admin' => __('Admin', 'users'),
'editor' => __('Editor', 'users'),
'user' => __('User', 'users'));
/**
* Users admin
*/
public static function main() {
// Get uses table
$users = new Table('users');
// Users roles
$roles = array('admin' => __('Admin', 'users'),
'editor' => __('Editor', 'users'),
'user' => __('User', 'users'));
if (Option::get('users_frontend_registration') == 'true') {
$users_frontend_registration = true;
} else {
$users_frontend_registration = false;
}
// Get uses table
$users = new Table('users');
if (Request::post('users_frontend_submit')) {
if (Option::get('users_frontend_registration') == 'true') {
$users_frontend_registration = true;
} else {
$users_frontend_registration = false;
}
if (Security::check(Request::post('csrf'))) {
if (Request::post('users_frontend_submit')) {
if (Request::post('users_frontend_registration')) $users_frontend_registration = 'true'; else $users_frontend_registration = 'false';
Option::update('users_frontend_registration', $users_frontend_registration);
Request::redirect('index.php?id=users');
if (Security::check(Request::post('csrf'))) {
} else { die('csrf detected!'); }
}
if (Request::post('users_frontend_registration')) $users_frontend_registration = 'true'; else $users_frontend_registration = 'false';
Option::update('users_frontend_registration', $users_frontend_registration);
Request::redirect('index.php?id=users');
// Check for get actions
// ---------------------------------------------
if (Request::get('action')) {
} else { die('csrf detected!'); }
}
// Switch actions
// -----------------------------------------
switch (Request::get('action')) {
// Check for get actions
// ---------------------------------------------
if (Request::get('action')) {
// Add
// -------------------------------------
case "add":
// Switch actions
// -----------------------------------------
switch (Request::get('action')) {
if (Session::exists('user_role') && in_array(Session::get('user_role'), array('admin'))) {
// Add
// -------------------------------------
case "add":
// Errors
$errors = array();
if (Session::exists('user_role') && in_array(Session::get('user_role'), array('admin'))) {
if (Request::post('register')) {
// Errors
$errors = array();
if (Security::check(Request::post('csrf'))) {
if (Request::post('register')) {
$user_login = trim(Request::post('login'));
$user_password = trim(Request::post('password'));
$user_email = trim(Request::post('email'));
if ($user_login == '') $errors['users_empty_login'] = __('Required field', 'users');
if ($user_password == '') $errors['users_empty_password'] = __('Required field', 'users');
if ($user_email == '') $errors['users_empty_email'] = __('Required field', 'users');
if ($users->select("[login='".$user_login."']")) $errors['users_this_user_already_exists'] = __('This user already exists', 'users');
if ($users->select("[email='".$user_email."']")) $errors['users_this_email_already_exists'] = __('This email already exists', 'users');
if (count($errors) == 0) {
$users->insert(array('login' => Security::safeName($user_login),
'password' => Security::encryptPassword(Request::post('password')),
'email' => Request::post('email'),
'hash' => Text::random('alnum', 12),
'date_registered' => time(),
'role' => Request::post('role')));
Notification::set('success', __('New user have been registered.', 'users'));
Request::redirect('index.php?id=users');
}
} else { die('csrf detected!'); }
}
// Display view
View::factory('box/users/views/backend/add')
->assign('roles', $roles)
->assign('errors', $errors)
->display();
} else {
Request::redirect('index.php?id=users&action=edit&user_id='.Session::get('user_id'));
}
break;
// Edit
// -------------------------------------
case "edit":
// Get current user record
$user = $users->select("[id='".(int) Request::get('user_id')."']", null);
if (isset($user['firstname'])) $user_firstname = $user['firstname']; else $user_firstname = '';
if (isset($user['lastname'])) $user_lastname = $user['lastname']; else $user_lastname = '';
if (isset($user['email'])) $user_email = $user['email']; else $user_email = '';
if (isset($user['twitter'])) $user_twitter = $user['twitter']; else $user_twitter = '';
if (isset($user['skype'])) $user_skype = $user['skype']; else $user_skype = '';
if (isset($user['about_me'])) $user_about_me = $user['about_me']; else $user_about_me = '';
if (Session::exists('user_role') && in_array(Session::get('user_role'), array('admin', 'editor'))) {
if ((Request::post('edit_profile')) and
(((int) Session::get('user_id') == (int) Request::get('user_id')) or
(in_array(Session::get('user_role'), array('admin'))))){
if (Security::check(Request::post('csrf'))) {
$user_login = trim(Request::post('login'));
$user_password = trim(Request::post('password'));
$user_email = trim(Request::post('email'));
if (Security::safeName(Request::post('login')) != '') {
if ($users->update(Request::post('user_id'), array('login' => Security::safeName(Request::post('login')),
'firstname' => Request::post('firstname'),
'lastname' => Request::post('lastname'),
'email' => Request::post('email'),
'skype' => Request::post('skype'),
'twitter' => Request::post('twitter'),
'about_me' => Request::post('about_me'),
'role' => Request::post('role')))) {
if ($user_login == '') $errors['users_empty_login'] = __('Required field', 'users');
if ($user_password == '') $errors['users_empty_password'] = __('Required field', 'users');
if ($user_email == '') $errors['users_empty_email'] = __('Required field', 'users');
if ($users->select("[login='".$user_login."']")) $errors['users_this_user_already_exists'] = __('This user already exists', 'users');
if ($users->select("[email='".$user_email."']")) $errors['users_this_email_already_exists'] = __('This email already exists', 'users');
if (count($errors) == 0) {
$users->insert(array('login' => Security::safeName($user_login),
'password' => Security::encryptPassword(Request::post('password')),
'email' => Request::post('email'),
'hash' => Text::random('alnum', 12),
'date_registered' => time(),
'role' => Request::post('role')));
Notification::set('success', __('New user have been registered.', 'users'));
Request::redirect('index.php?id=users');
}
Notification::set('success', __('Your changes have been saved.', 'users'));
Request::redirect('index.php?id=users&action=edit&user_id='.Request::post('user_id'));
}
} else { }
} else { die('csrf detected!'); }
}
}
if (Request::post('edit_profile_password')) {
if (Security::check(Request::post('csrf'))) {
if (trim(Request::post('new_password')) != '') {
$users->update(Request::post('user_id'), array('password' => Security::encryptPassword(trim(Request::post('new_password')))));
Notification::set('success', __('Your changes have been saved.', 'users'));
Request::redirect('index.php?id=users&action=edit&user_id='.Request::post('user_id'));
}
} else { die('csrf detected!'); }
}
if ( ((int) Session::get('user_id') == (int) Request::get('user_id')) or (in_array(Session::get('user_role'), array('admin')) && count($user) != 0) ) {
// Display view
View::factory('box/users/views/backend/add')
View::factory('box/users/views/backend/edit')
->assign('user', $user)
->assign('user_firstname', $user_firstname)
->assign('user_lastname', $user_lastname)
->assign('user_email', $user_email)
->assign('user_twitter', $user_twitter)
->assign('user_skype', $user_skype)
->assign('user_about_me', $user_about_me)
->assign('roles', $roles)
->assign('errors', $errors)
->display();
} else {
Request::redirect('index.php?id=users&action=edit&user_id='.Session::get('user_id'));
echo __('Monstra says: This is not your profile...', 'users');
}
break;
}
// Edit
// -------------------------------------
case "edit":
break;
// Get current user record
$user = $users->select("[id='".(int)Request::get('user_id')."']", null);
if (isset($user['firstname'])) $user_firstname = $user['firstname']; else $user_firstname = '';
if (isset($user['lastname'])) $user_lastname = $user['lastname']; else $user_lastname = '';
if (isset($user['email'])) $user_email = $user['email']; else $user_email = '';
if (isset($user['twitter'])) $user_twitter = $user['twitter']; else $user_twitter = '';
if (isset($user['skype'])) $user_skype = $user['skype']; else $user_skype = '';
if (isset($user['about_me'])) $user_about_me = $user['about_me']; else $user_about_me = '';
// Delete
// -------------------------------------
case "delete":
if (Session::exists('user_role') && in_array(Session::get('user_role'), array('admin', 'editor'))) {
if (Session::exists('user_role') && in_array(Session::get('user_role'), array('admin'))) {
if ((Request::post('edit_profile')) and
(((int)Session::get('user_id') == (int)Request::get('user_id')) or
(in_array(Session::get('user_role'), array('admin'))))){
if (Security::check(Request::get('token'))) {
if (Security::check(Request::post('csrf'))) {
$user = $users->select('[id="'.Request::get('user_id').'"]', null);
$users->delete(Request::get('user_id'));
Notification::set('success', __('User <i>:user</i> have been deleted.', 'users', array(':user' => $user['login'])));
Request::redirect('index.php?id=users');
if (Security::safeName(Request::post('login')) != '') {
if ($users->update(Request::post('user_id'), array('login' => Security::safeName(Request::post('login')),
'firstname' => Request::post('firstname'),
'lastname' => Request::post('lastname'),
'email' => Request::post('email'),
'skype' => Request::post('skype'),
'twitter' => Request::post('twitter'),
'about_me' => Request::post('about_me'),
'role' => Request::post('role')))) {
Notification::set('success', __('Your changes have been saved.', 'users'));
Request::redirect('index.php?id=users&action=edit&user_id='.Request::post('user_id'));
}
} else { }
} else { die('csrf detected!'); }
} else { die('csrf detected!'); }
}
}
if (Request::post('edit_profile_password')) {
if (Security::check(Request::post('csrf'))) {
if (trim(Request::post('new_password')) != '') {
$users->update(Request::post('user_id'), array('password' => Security::encryptPassword(trim(Request::post('new_password')))));
Notification::set('success', __('Your changes have been saved.', 'users'));
Request::redirect('index.php?id=users&action=edit&user_id='.Request::post('user_id'));
}
} else { die('csrf detected!'); }
}
if ( ((int)Session::get('user_id') == (int)Request::get('user_id')) or (in_array(Session::get('user_role'), array('admin')) && count($user) != 0) ) {
// Display view
View::factory('box/users/views/backend/edit')
->assign('user', $user)
->assign('user_firstname', $user_firstname)
->assign('user_lastname', $user_lastname)
->assign('user_email', $user_email)
->assign('user_twitter', $user_twitter)
->assign('user_skype', $user_skype)
->assign('user_about_me', $user_about_me)
->assign('roles', $roles)
->display();
} else {
echo __('Monstra says: This is not your profile...', 'users');
}
}
break;
// Delete
// -------------------------------------
case "delete":
if (Session::exists('user_role') && in_array(Session::get('user_role'), array('admin'))) {
if (Security::check(Request::get('token'))) {
$user = $users->select('[id="'.Request::get('user_id').'"]', null);
$users->delete(Request::get('user_id'));
Notification::set('success', __('User <i>:user</i> have been deleted.', 'users', array(':user' => $user['login'])));
Request::redirect('index.php?id=users');
} else { die('csrf detected!'); }
}
break;
}
} else {
if (Session::exists('user_role') && in_array(Session::get('user_role'), array('admin'))) {
// Dislay view
View::factory('box/users/views/backend/index')
->assign('roles', $roles)
->assign('users_list', $users->select())
->assign('users_frontend_registration', $users_frontend_registration)
->display();
} else {
Request::redirect('index.php?id=users&action=edit&user_id='.Session::get('user_id'));
}
break;
}
} else {
if (Session::exists('user_role') && in_array(Session::get('user_role'), array('admin'))) {
// Dislay view
View::factory('box/users/views/backend/index')
->assign('roles', $roles)
->assign('users_list', $users->select())
->assign('users_frontend_registration', $users_frontend_registration)
->display();
} else {
Request::redirect('index.php?id=users&action=edit&user_id='.Session::get('user_id'));
}
}
}
}
}

View File

@@ -1,461 +1,451 @@
<?php
/**
* Users plugin
*
* @package Monstra
* @subpackage Plugins
* @author Romanenko Sergey / Awilum
* @copyright 2012 Romanenko Sergey / Awilum
* @version 1.0.0
*
*/
// Register plugin
Plugin::register( __FILE__,
__('Users', 'users'),
__('Users manager', 'users'),
'1.0.0',
'Awilum',
'http://monstra.org/',
'users',
'box');
// Include Users Admin
Plugin::Admin('users', 'box');
// Add Plugin Javascript
Javascript::add('plugins/box/users/js/users.js', 'backend');
/**
* Users class
*/
class Users extends Frontend
{
/**
* Users plugin
*
* @package Monstra
* @subpackage Plugins
* @author Romanenko Sergey / Awilum
* @copyright 2012 Romanenko Sergey / Awilum
* @version 1.0.0
*
* Users table
*/
// Register plugin
Plugin::register( __FILE__,
__('Users', 'users'),
__('Users manager', 'users'),
'1.0.0',
'Awilum',
'http://monstra.org/',
'users',
'box');
// Include Users Admin
Plugin::Admin('users', 'box');
// Add Plugin Javascript
Javascript::add('plugins/box/users/js/users.js', 'backend');
public static $users = null;
/**
* Users class
* Sandbox main function
*/
class Users extends Frontend {
public static function main()
{
// Get users table
Users::$users = new Table('users');
/**
* Users table
*/
public static $users = null;
// Logout
if (Uri::segment(1) == 'logout') { Users::logout(); }
/**
* Sandbox main function
*/
public static function main(){
}
// Get users table
Users::$users = new Table('users');
/**
* Route
*/
protected static function route()
{
/* /users */
if (Uri::segment(0) == 'users' && !Uri::segment(1)) return 'list';
/* /users/(int) */
if (Uri::segment(1) && (Uri::segment(1) !== 'login' && Uri::segment(1) !== 'registration' && Uri::segment(1) !== 'password-reset' && Uri::segment(2) !== 'edit')) return 'profile';
/* /users/login */
if (Uri::segment(1) == 'login') return 'login';
/* /users/registration */
if (Uri::segment(1) == 'registration') return 'registration';
/* /pusers/password-reset */
if (Uri::segment(1) == 'password-reset') return 'password-reset';
/* /users/(int) /edit */
if ( ( Uri::segment(1) and (Uri::segment(1) !== 'login' && Uri::segment(1) !== 'registration' && Uri::segment(1) !== 'password-reset') ) and Uri::segment(2) == 'edit') return 'edit';
/* /users/logout */
if (Uri::segment(1) == 'logout') return 'logout';
}
// Logout
if (Uri::segment(1) == 'logout') { Users::logout(); }
}
/**
* Get users list
*/
public static function getList()
{
View::factory('box/users/views/frontend/index')
->assign('users', Users::$users->select(null, 'all'))
->display();
}
/**
* Get user profile
*/
public static function getProfile($id)
{
View::factory('box/users/views/frontend/profile')
->assign('user', Users::$users->select("[id=".(int) $id."]", null))
->display();
}
/**
* Route
*/
protected static function route() {
/* /users */
if (Uri::segment(0) == 'users' && !Uri::segment(1)) return 'list';
/* /users/(int) */
if (Uri::segment(1) && (Uri::segment(1) !== 'login' && Uri::segment(1) !== 'registration' && Uri::segment(1) !== 'password-reset' && Uri::segment(2) !== 'edit')) return 'profile';
/* /users/login */
if (Uri::segment(1) == 'login') return 'login';
/* /users/registration */
if (Uri::segment(1) == 'registration') return 'registration';
/* /pusers/password-reset */
if (Uri::segment(1) == 'password-reset') return 'password-reset';
/* /users/(int)/edit */
if ( ( Uri::segment(1) and (Uri::segment(1) !== 'login' && Uri::segment(1) !== 'registration' && Uri::segment(1) !== 'password-reset') ) and Uri::segment(2) == 'edit') return 'edit';
/* /users/logout */
if (Uri::segment(1) == 'logout') return 'logout';
}
/**
* Get users list
*/
public static function getList() {
View::factory('box/users/views/frontend/index')
->assign('users', Users::$users->select(null, 'all'))
->display();
}
/**
* Get user profile
*/
public static function getProfile($id) {
View::factory('box/users/views/frontend/profile')
->assign('user', Users::$users->select("[id=".(int)$id."]", null))
->display();
}
/**
* Get New User Registration
*/
public static function getRegistration() {
if (Option::get('users_frontend_registration') == 'true') {
// Is User Loged in ?
if ( ! Session::get('user_id')) {
$errors = array();
$user_email = Request::post('email');
$user_login = Request::post('login');
$user_password = Request::post('password');
// Register form submit
if (Request::post('register')) {
// Check csrf
if (Security::check(Request::post('csrf'))) {
$user_email = trim($user_email);
$user_login = trim($user_login);
$user_password = trim($user_password);
if (Option::get('captcha_installed') == 'true' && ! CryptCaptcha::check(Request::post('answer'))) $errors['users_captcha_wrong'] = __('Captcha code is wrong', 'captcha');
if ($user_login == '') $errors['users_empty_login'] = __('Required field', 'users');
if ($user_password == '') $errors['users_empty_password'] = __('Required field', 'users');
if ($user_email == '') $errors['users_empty_email'] = __('Required field', 'users');
if ($user_email != '' && ! Valid::email($user_email)) $errors['users_invalid_email'] = __('User email is invalid', 'users');
if (Users::$users->select("[login='".$user_login."']")) $errors['users_this_user_alredy_exists'] = __('This user alredy exist', 'users');
if (Users::$users->select("[email='".$user_email."']")) $errors['users_this_email_alredy_exists'] = __('This email alredy exist', 'users');
if (count($errors) == 0) {
Users::$users->insert(array('login' => Security::safeName($user_login),
'password' => Security::encryptPassword(Request::post('password')),
'email' => Request::post('email'),
'hash' => Text::random('alnum', 12),
'date_registered' => time(),
'role' => 'user'));
// Log in
$user = Users::$users->select("[id='".Users::$users->lastId()."']", null);
Session::set('user_id', (int)$user['id']);
Session::set('user_login', (string)$user['login']);
Session::set('user_role', (string)$user['role']);
// Message
$message = View::factory('box/users/views/frontend/registration_email')
->assign('site_name', Option::get('sitename'))
->assign('user_login', $user['login'])
->render();
// Send
@mail($user['email'], Option::get('sitename'), $message);
// Redirect to user profile
Request::redirect(Option::get('siteurl').'users/'.Users::$users->lastId());
}
} else { die('csrf detected!'); }
}
// Display view
View::factory('box/users/views/frontend/registration')
->assign('errors', $errors)
->assign('user_email', $user_email)
->assign('user_login', $user_login)
->assign('user_password', $user_password)
->display();
} else {
Request::redirect(Site::url().'users/'.Session::get('user_id'));
}
} else {
echo __('User registration is closed.', 'users');
}
}
/**
* Get user panel
*/
public static function getPanel() {
View::factory('box/users/views/frontend/userspanel')->display();
}
/**
* Is User Loged
*/
public static function isLoged() {
if ((Session::get('user_id')) and (((int)Session::get('user_id') == Uri::segment(1)) or (in_array(Session::get('user_role'), array('admin'))))) {
return true;
} else {
return false;
}
}
/**
* Logout
*/
public static function logout() {
Session::destroy();
Request::redirect($_SERVER["HTTP_REFERER"]);
}
/**
* Edit user profile
*/
public static function getProfileEdit($id) {
// Is Current User Loged in ?
if (Users::isLoged()) {
$user = Users::$users->select("[id='".(int)$id."']", null);
// Edit Profile Submit
if (Request::post('edit_profile')) {
// Check csrf
if (Security::check(Request::post('csrf'))) {
if (Security::safeName(Request::post('login')) != '') {
if (Users::$users->update(Request::post('user_id'),
array('login' => Security::safeName(Request::post('login')),
'firstname' => Request::post('firstname'),
'lastname' => Request::post('lastname'),
'email' => Request::post('email'),
'skype' => Request::post('skype'),
'about_me' => Request::post('about_me'),
'twitter' => Request::post('twitter')))) {
// Change password
if (trim(Request::post('new_password')) != '') {
Users::$users->update(Request::post('user_id'), array('password' => Security::encryptPassword(trim(Request::post('new_password')))));
}
Notification::set('success', __('Your changes have been saved.', 'users'));
Request::redirect(Site::url().'users/'.$user['id']);
}
} else { }
} else { die('csrf detected!'); }
}
View::factory('box/users/views/frontend/edit')
->assign('user', $user)
->display();
} else {
Request::redirect(Site::url().'users/login');
}
}
/**
* Get Password Reset
*/
public static function getPasswordReset() {
/**
* Get New User Registration
*/
public static function getRegistration()
{
if (Option::get('users_frontend_registration') == 'true') {
// Is User Loged in ?
if ( ! Session::get('user_id')) {
$errors = array();
$site_url = Option::get('siteurl');
$site_name = Option::get('sitename');
$user_email = Request::post('email');
$user_login = Request::post('login');
$user_password = Request::post('password');
// Reset Password from hash
if (Request::get('hash')) {
// Get user with specific hash
$user = Users::$users->select("[hash='" . Request::get('hash') . "']", null);
// Register form submit
if (Request::post('register')) {
// If user exists
if ((count($user) > 0) && ($user['hash'] == Request::get('hash'))) {
// Check csrf
if (Security::check(Request::post('csrf'))) {
// Generate new password
$new_password = Text::random('alnum', 6);
$user_email = trim($user_email);
$user_login = trim($user_login);
$user_password = trim($user_password);
// Update user profile
// Set new hash and new password
Users::$users->updateWhere("[login='" . $user['login'] . "']", array('hash' => Text::random('alnum', 12), 'password' => Security::encryptPassword($new_password)));
if (Option::get('captcha_installed') == 'true' && ! CryptCaptcha::check(Request::post('answer'))) $errors['users_captcha_wrong'] = __('Captcha code is wrong', 'captcha');
if ($user_login == '') $errors['users_empty_login'] = __('Required field', 'users');
if ($user_password == '') $errors['users_empty_password'] = __('Required field', 'users');
if ($user_email == '') $errors['users_empty_email'] = __('Required field', 'users');
if ($user_email != '' && ! Valid::email($user_email)) $errors['users_invalid_email'] = __('User email is invalid', 'users');
if (Users::$users->select("[login='".$user_login."']")) $errors['users_this_user_alredy_exists'] = __('This user alredy exist', 'users');
if (Users::$users->select("[email='".$user_email."']")) $errors['users_this_email_alredy_exists'] = __('This email alredy exist', 'users');
if (count($errors) == 0) {
Users::$users->insert(array('login' => Security::safeName($user_login),
'password' => Security::encryptPassword(Request::post('password')),
'email' => Request::post('email'),
'hash' => Text::random('alnum', 12),
'date_registered' => time(),
'role' => 'user'));
// Log in
$user = Users::$users->select("[id='".Users::$users->lastId()."']", null);
Session::set('user_id', (int) $user['id']);
Session::set('user_login', (string) $user['login']);
Session::set('user_role', (string) $user['role']);
// Message
$message = View::factory('box/users/views/frontend/registration_email')
->assign('site_name', Option::get('sitename'))
->assign('user_login', $user['login'])
->render();
// Send
@mail($user['email'], Option::get('sitename'), $message);
// Redirect to user profile
Request::redirect(Option::get('siteurl').'users/'.Users::$users->lastId());
}
} else { die('csrf detected!'); }
}
// Display view
View::factory('box/users/views/frontend/registration')
->assign('errors', $errors)
->assign('user_email', $user_email)
->assign('user_login', $user_login)
->assign('user_password', $user_password)
->display();
} else {
Request::redirect(Site::url().'users/'.Session::get('user_id'));
}
} else {
echo __('User registration is closed.', 'users');
}
}
/**
* Get user panel
*/
public static function getPanel()
{
View::factory('box/users/views/frontend/userspanel')->display();
}
/**
* Is User Loged
*/
public static function isLoged()
{
if ((Session::get('user_id')) and (((int) Session::get('user_id') == Uri::segment(1)) or (in_array(Session::get('user_role'), array('admin'))))) {
return true;
} else {
return false;
}
}
/**
* Logout
*/
public static function logout()
{
Session::destroy();
Request::redirect($_SERVER["HTTP_REFERER"]);
}
/**
* Edit user profile
*/
public static function getProfileEdit($id)
{
// Is Current User Loged in ?
if (Users::isLoged()) {
$user = Users::$users->select("[id='".(int) $id."']", null);
// Edit Profile Submit
if (Request::post('edit_profile')) {
// Check csrf
if (Security::check(Request::post('csrf'))) {
if (Security::safeName(Request::post('login')) != '') {
if (Users::$users->update(Request::post('user_id'),
array('login' => Security::safeName(Request::post('login')),
'firstname' => Request::post('firstname'),
'lastname' => Request::post('lastname'),
'email' => Request::post('email'),
'skype' => Request::post('skype'),
'about_me' => Request::post('about_me'),
'twitter' => Request::post('twitter')))) {
// Change password
if (trim(Request::post('new_password')) != '') {
Users::$users->update(Request::post('user_id'), array('password' => Security::encryptPassword(trim(Request::post('new_password')))));
}
Notification::set('success', __('Your changes have been saved.', 'users'));
Request::redirect(Site::url().'users/'.$user['id']);
}
} else { }
} else { die('csrf detected!'); }
}
View::factory('box/users/views/frontend/edit')
->assign('user', $user)
->display();
} else {
Request::redirect(Site::url().'users/login');
}
}
/**
* Get Password Reset
*/
public static function getPasswordReset()
{
// Is User Loged in ?
if ( ! Session::get('user_id')) {
$errors = array();
$site_url = Option::get('siteurl');
$site_name = Option::get('sitename');
// Reset Password from hash
if (Request::get('hash')) {
// Get user with specific hash
$user = Users::$users->select("[hash='" . Request::get('hash') . "']", null);
// If user exists
if ((count($user) > 0) && ($user['hash'] == Request::get('hash'))) {
// Generate new password
$new_password = Text::random('alnum', 6);
// Update user profile
// Set new hash and new password
Users::$users->updateWhere("[login='" . $user['login'] . "']", array('hash' => Text::random('alnum', 12), 'password' => Security::encryptPassword($new_password)));
// Message
$message = View::factory('box/users/views/frontend/new_password_email')
->assign('site_url', $site_url)
->assign('site_name', $site_name)
->assign('user_id', $user['id'])
->assign('user_login', $user['login'])
->assign('new_password', $new_password)
->render();
// Send
@mail($user['email'], __('Your new password for :site_name', 'users', array(':site_name' => $site_name)), $message);
// Set notification
Notification::set('success', __('New password has been sent', 'users'));
// Redirect to password-reset page
Request::redirect(Site::url().'users/password-reset');
}
}
// Reset Password Form Submit
if (Request::post('reset_password_submit')) {
$user_login = trim(Request::post('login'));
// Check csrf
if (Security::check(Request::post('csrf'))) {
if (Option::get('captcha_installed') == 'true' && ! CryptCaptcha::check(Request::post('answer'))) $errors['users_captcha_wrong'] = __('Captcha code is wrong', 'users');
if ($user_login == '') $errors['users_empty_field'] = __('Required field', 'users');
if ($user_login != '' && ! Users::$users->select("[login='".$user_login."']")) $errors['users_user_doesnt_exists'] = __('This user doesnt exist', 'users');
if (count($errors) == 0) {
// Get user
$user = Users::$users->select("[login='" . $user_login . "']", null);
// Generate new hash
$new_hash = Text::random('alnum', 12);
// Update user hash
Users::$users->updateWhere("[login='" . $user_login . "']", array('hash' => $new_hash));
// Message
$message = View::factory('box/users/views/frontend/new_password_email')
$message = View::factory('box/users/views/frontend/reset_password_email')
->assign('site_url', $site_url)
->assign('site_name', $site_name)
->assign('user_id', $user['id'])
->assign('user_login', $user['login'])
->assign('new_password', $new_password)
->assign('new_hash', $new_hash)
->render();
// Send
@mail($user['email'], __('Your new password for :site_name', 'users', array(':site_name' => $site_name)), $message);
@mail($user['email'], __('Your login details for :site_name', 'users', array(':site_name' => $site_name)), $message);
// Set notification
Notification::set('success', __('New password has been sent', 'users'));
Notification::set('success', __('Your login details for :site_name has been sent', 'users', array(':site_name' => $site_name)));
// Redirect to password-reset page
Request::redirect(Site::url().'users/password-reset');
}
}
// Reset Password Form Submit
if (Request::post('reset_password_submit')) {
$user_login = trim(Request::post('login'));
// Check csrf
if (Security::check(Request::post('csrf'))) {
if (Option::get('captcha_installed') == 'true' && ! CryptCaptcha::check(Request::post('answer'))) $errors['users_captcha_wrong'] = __('Captcha code is wrong', 'users');
if ($user_login == '') $errors['users_empty_field'] = __('Required field', 'users');
if ($user_login != '' && ! Users::$users->select("[login='".$user_login."']")) $errors['users_user_doesnt_exists'] = __('This user doesnt exist', 'users');
if (count($errors) == 0) {
// Get user
$user = Users::$users->select("[login='" . $user_login . "']", null);
// Generate new hash
$new_hash = Text::random('alnum', 12);
// Update user hash
Users::$users->updateWhere("[login='" . $user_login . "']", array('hash' => $new_hash));
// Message
$message = View::factory('box/users/views/frontend/reset_password_email')
->assign('site_url', $site_url)
->assign('site_name', $site_name)
->assign('user_id', $user['id'])
->assign('user_login', $user['login'])
->assign('new_hash', $new_hash)
->render();
// Send
@mail($user['email'], __('Your login details for :site_name', 'users', array(':site_name' => $site_name)), $message);
// Set notification
Notification::set('success', __('Your login details for :site_name has been sent', 'users', array(':site_name' => $site_name)));
// Redirect to password-reset page
Request::redirect(Site::url().'users/password-reset');
}
} else { die('csrf detected!'); }
}
View::factory('box/users/views/frontend/password_reset')
->assign('errors', $errors)
->assign('user_login', trim(Request::post('login')))
->display();
} else { die('csrf detected!'); }
}
View::factory('box/users/views/frontend/password_reset')
->assign('errors', $errors)
->assign('user_login', trim(Request::post('login')))
->display();
}
/**
* Get User login
*/
public static function getLogin() {
// Is User Loged in ?
if ( ! Session::get('user_id')) {
// Login Form Submit
if (Request::post('login_submit')) {
// Check csrf
if (Security::check(Request::post('csrf'))) {
$user = Users::$users->select("[login='" . trim(Request::post('username')) . "']", null);
if (count($user) !== 0) {
if ($user['login'] == Request::post('username')) {
if (trim($user['password']) == Security::encryptPassword(Request::post('password'))) {
if ($user['role'] == 'admin' || $user['role'] == 'editor') {
Session::set('admin', true);
}
Session::set('user_id', (int)$user['id']);
Session::set('user_login', (string)$user['login']);
Session::set('user_role', (string)$user['role']);
Request::redirect(Site::url().'users/'.Session::get('user_id'));
} else {
Notification::setNow('error', __('Wrong <b>username</b> or <b>password</b>', 'users'));
}
}
} else {
Notification::setNow('error', __('Wrong <b>username</b> or <b>password</b>', 'users'));
}
} else { die('csrf detected!'); }
}
View::factory('box/users/views/frontend/login')->display();
} else {
Request::redirect(Site::url().'users/'.Session::get('user_id'));
}
}
/**
* Set title
*/
public static function title(){
switch (Users::route()) {
case 'list': return __('Users', 'users'); break;
case 'profile': return __('Users - Profile', 'users'); break;
case 'edit': return __('Users - Edit Profile', 'users'); break;
case 'login': return __('Users - Login', 'users'); break;
case 'registration': return __('Users - Registration', 'users'); break;
case 'password-reset': return __('Users - Password Recover', 'users'); break;
}
}
/**
* Set content
*/
public static function content(){
switch (Users::route()) {
case 'list': Users::getList(); break;
case 'profile': Users::getProfile(Uri::segment(1)); break;
case 'edit': Users::getProfileEdit(Uri::segment(1)); break;
case 'login': Users::getLogin(); break;
case 'registration': Users::getRegistration(); break;
case 'password-reset': Users::getPasswordReset(); break;
}
}
/**
* Set template
*/
public static function template() {
return 'index';
}
/**
* Get Gravatar
*/
public static function getGravatarURL($email, $size) {
return 'http://www.gravatar.com/avatar.php?gravatar_id='.md5($email).'&rating=PG'.'&size='.$size;
}
}
/**
* Get User login
*/
public static function getLogin()
{
// Is User Loged in ?
if ( ! Session::get('user_id')) {
// Login Form Submit
if (Request::post('login_submit')) {
// Check csrf
if (Security::check(Request::post('csrf'))) {
$user = Users::$users->select("[login='" . trim(Request::post('username')) . "']", null);
if (count($user) !== 0) {
if ($user['login'] == Request::post('username')) {
if (trim($user['password']) == Security::encryptPassword(Request::post('password'))) {
if ($user['role'] == 'admin' || $user['role'] == 'editor') {
Session::set('admin', true);
}
Session::set('user_id', (int) $user['id']);
Session::set('user_login', (string) $user['login']);
Session::set('user_role', (string) $user['role']);
Request::redirect(Site::url().'users/'.Session::get('user_id'));
} else {
Notification::setNow('error', __('Wrong <b>username</b> or <b>password</b>', 'users'));
}
}
} else {
Notification::setNow('error', __('Wrong <b>username</b> or <b>password</b>', 'users'));
}
} else { die('csrf detected!'); }
}
View::factory('box/users/views/frontend/login')->display();
} else {
Request::redirect(Site::url().'users/'.Session::get('user_id'));
}
}
/**
* Set title
*/
public static function title()
{
switch (Users::route()) {
case 'list': return __('Users', 'users'); break;
case 'profile': return __('Users - Profile', 'users'); break;
case 'edit': return __('Users - Edit Profile', 'users'); break;
case 'login': return __('Users - Login', 'users'); break;
case 'registration': return __('Users - Registration', 'users'); break;
case 'password-reset': return __('Users - Password Recover', 'users'); break;
}
}
/**
* Set content
*/
public static function content()
{
switch (Users::route()) {
case 'list': Users::getList(); break;
case 'profile': Users::getProfile(Uri::segment(1)); break;
case 'edit': Users::getProfileEdit(Uri::segment(1)); break;
case 'login': Users::getLogin(); break;
case 'registration': Users::getRegistration(); break;
case 'password-reset': Users::getPasswordReset(); break;
}
}
/**
* Set template
*/
public static function template()
{
return 'index';
}
/**
* Get Gravatar
*/
public static function getGravatarURL($email, $size)
{
return 'http://www.gravatar.com/avatar.php?gravatar_id='.md5($email).'&rating=PG'.'&size='.$size;
}
}

View File

@@ -35,4 +35,4 @@
Form::close()
);
?>
<!-- /Users_add -->
<!-- /Users_add -->

View File

@@ -15,7 +15,7 @@
<div>
<div class="span7">
<div class="span7">
<?php
echo (
@@ -24,7 +24,7 @@
Form::hidden('user_id', Request::get('user_id'))
);
if (isset($_SESSION['user_role']) && in_array($_SESSION['user_role'], array('admin'))) {
if (isset($_SESSION['user_role']) && in_array($_SESSION['user_role'], array('admin'))) {
echo Form::label('login', __('Username', 'users'));
echo Form::input('login', $user['login'], array('class' => 'input-xlarge'));
} else {
@@ -33,7 +33,7 @@
echo (
Html::br().
Form::label('firstname', __('Firstname', 'users')).
Form::label('firstname', __('Firstname', 'users')).
Form::input('firstname', $user_firstname, array('class' => 'input-xlarge')).Html::br().
Form::label('lastname', __('Lastname', 'users')).
Form::input('lastname', $user_lastname, array('class' => 'input-xlarge')).Html::br().
@@ -47,20 +47,19 @@
Form::textarea('about_me', $user_about_me, array('class' => 'input-xlarge')).Html::br()
);
if (isset($_SESSION['user_role']) && in_array($_SESSION['user_role'], array('admin'))) {
if (isset($_SESSION['user_role']) && in_array($_SESSION['user_role'], array('admin'))) {
echo Form::label('role', __('Role', 'users'));
echo Form::select('role', array('admin' => __('Admin', 'users'), 'editor' => __('Editor', 'users'), 'user' => __('User', 'users')), $user['role'], array('class' => 'input-xlarge')). Html::br();
} else {
} else {
echo Form::hidden('role', $_SESSION['user_role']);
}
echo (
Html::br().
Form::submit('edit_profile', __('Save', 'users'), array('class' => 'btn')).
Form::close()
);
?>
</div>
@@ -75,7 +74,7 @@
Form::password('new_password', null, array('class' => 'input-xlarge')).Html::br().Html::br().
Form::submit('edit_profile_password', __('Save', 'users'), array('class' => 'btn')).
Form::close()
);
);
?>
</div>
@@ -88,4 +87,4 @@
echo '<div class="message-error">'.__('This user does not exist', 'users').'</div>';
}
?>
<!-- /Users_edit -->
<!-- /Users_edit -->

View File

@@ -28,7 +28,7 @@
</thead>
<tbody>
<?php foreach ($users_list as $user) { ?>
<tr>
<tr>
<td>
<?php echo Html::toText($user['login']); ?>
</td>
@@ -50,8 +50,8 @@
?>
</div>
</td>
</tr>
</tr>
<?php } ?>
</tbody>
</table>
<!-- /Users_list -->
<!-- /Users_list -->

View File

@@ -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>

View File

@@ -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>

View File

@@ -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>

View File

@@ -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; ?>

View File

@@ -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>

View File

@@ -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'); } ?>

View File

@@ -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>

View File

@@ -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; ?>

View File

@@ -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; ?>

View File

@@ -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>