karsten/scattport-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of disposed.de:scattport

Browse Source
This commit is contained in:
Karsten Heiken
2011-04-22 03:24:27 +02:00
parent 79a2b3bafb 8892918a7a
commit cf00dcf39b
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
application/models/user.php
View File

@@ -211,7 +211,7 @@ class User extends CI_Model {
* @return boolean * @return boolean
*/ */
public function register($username, $password, $email, $additionalData = false, $groupName = false) { public function register($username, $password, $email, $additionalData = false, $groupName = false) {
if ($this->username_check($username)) { if ($this->checkUsername($username)) {
$this->access->setError('account_creation_duplicate_username'); $this->access->setError('account_creation_duplicate_username');
return false; return false;
} }
@@ -401,7 +401,7 @@ class User extends CI_Model {
$this->db->trans_begin(); $this->db->trans_begin();
if (array_key_exists('username', $data) && $this->username_check($data['username']) && $user->username !== $data['username']) { if (array_key_exists('username', $data) && $this->checkUsername($data['username']) && $user->username !== $data['username']) {
$this->db->trans_rollback(); $this->db->trans_rollback();
$this->access->setError('account_creation_duplicate_username'); $this->access->setError('account_creation_duplicate_username');
return false; return false;
@@ -459,7 +459,7 @@ class User extends CI_Model {
* @return boolean * @return boolean
*/ */
public function loginRememberedUser() { public function loginRememberedUser() {
if (!get_cookie('username') || !get_cookie('remember_code') || !$this->username_check(get_cookie('username'))) { if (!get_cookie('username') || !get_cookie('remember_code') || !$this->checkUsername(get_cookie('username'))) {
return false; return false;
} }

2
application/views/header.php
View File

@@ -25,5 +25,5 @@
<?=anchor('auth/settings', "Einstellungen", array('style' => 'padding: 5px;'));?> | <?=anchor('auth/settings', "Einstellungen", array('style' => 'padding: 5px;'));?> |
<?=anchor('auth/logout', "Logout", array('style' => 'padding: 5px;'));?> <?=anchor('auth/logout', "Logout", array('style' => 'padding: 5px;'));?>
</div> </div>
<?=img(array('src' => 'assets/images/lang_de.png', 'style' => 'float: right; margin-top: 18px; margin-right: 5px;'));?> <?=img(array('src' => 'assets/images/lang_' . $this->config->item('lang_selected') . '.png', 'style' => 'float: right; margin-top: 18px; margin-right: 5px;'));?>
</div> </div>

0
assets/images/lang_us.png → assets/images/lang_en.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 609 B

After

Width:  |  Height:  |  Size: 609 B