Merge branch 'master' of disposed.de:scattport

application/models/user.php

@@ -211,7 +211,7 @@ class User extends CI_Model {
      * @return boolean
      */
     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');
             return false;
         }
@@ -401,7 +401,7 @@ class User extends CI_Model {
 
         $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->access->setError('account_creation_duplicate_username');
             return false;
@@ -459,7 +459,7 @@ class User extends CI_Model {
      * @return boolean
      */
     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;
         }
 

application/views/header.php

@@ -25,5 +25,5 @@
     <?=anchor('auth/settings', "Einstellungen", array('style' => 'padding: 5px;'));?> |
     <?=anchor('auth/logout', "Logout", array('style' => 'padding: 5px;'));?>
   </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>