Ticket #2064: login.patch

gui/index.php

@@ -37 +37 @@
 
         check_input(trim($_POST['uname']));
         check_input(trim($_POST['upass']));
+        
+        $uname = check_username($uname);
 
         if (register_user($uname, $_POST['upass'])) {
                 redirect_to_level_page();

gui/include/client-functions.php

@@ -25 +25 @@
                         `domain_name`,
                         `domain_gid`,
                         `domain_uid`,
+                        `domain_admin_id`,
                         `domain_created_id`,
                         `domain_created`,
                         `domain_last_modified`,
@@ -49 +50 @@
 SQL_QUERY;
 
         $rs = exec_query($sql, $query, array($domain_admin_id));
-
+        
         if (!$returnWKeys) {
                 return array(
                         $rs->fields['domain_id'],
                         $rs->fields['domain_name'],
                         $rs->fields['domain_gid'],
                         $rs->fields['domain_uid'],
+                        $rs->fields['domain_admin_id'],
                         $rs->fields['domain_created_id'],
                         $rs->fields['domain_created'],
                         $rs->fields['domain_last_modified'],

gui/client/index.php

@@ -278 +278 @@
         $dmn_name,
         $dmn_gid,
         $dmn_uid,
+        $dmn_admin_id,
         $dmn_created_id,
         $dmn_created,
         $dmn_last_modified,
@@ -294 +295 @@
         $dmn_disk_usage,
         $dmn_php,
         $dmn_cgi) = get_domain_default_props($sql, $_SESSION['user_id']);
-
+        
 list($sub_cnt,
         $als_cnt,
         $mail_acc_cnt,
@@ -317 +318 @@
 
 check_user_permissions($tpl, $dmn_sqld_limit, $dmn_sqlu_limit, $dmn_php, $dmn_cgi, $dmn_subd_limit, $dmn_als_limit, $dmn_mailacc_limit);
 
-$account_name = decode_idna($_SESSION['user_logged']);
+//$account_name = decode_idna($_SESSION['user_logged']);
+
+$query = 'SELECT * FROM `config` WHERE `name` = "USERNAME_PREFIX"';
+$res = exec_query($sql, $query);
+$rs = $res->FetchRow();
+
+$account_name = $rs['value'].$dmn_admin_id.' / '.$dmn_name;
 
 $tpl->assign(
         array(

gui/include/login-functions.php

@@ -19 +19 @@
  */
 
 /**
+ * Checks if username is prefDOMAIN_ID
+ * 
+ * @param  String                               $username       Username to be checked
+ * @return String                               $username       If pref_DOMAIN_ID it will convert
+ */
+ 
+function check_username($username) {
+        $sql = Database::getInstance();
+        
+        // Selecting Prefix
+        $query = 'SELECT * FROM `config` WHERE `name` = "USERNAME_PREFIX"';
+        $res = exec_query($sql, $query);
+        $rs = $res->FetchRow();
+        
+        if(substr($username, 0, strlen($rs['value'])) == $rs['value']) {
+                $admin_id = substr($username, strlen($rs['value']));
+                
+                $query = 'SELECT * FROM `admin` WHERE `admin_id` = ?';
+                $res = exec_query($sql, $query, array($admin_id));
+                $rs = $res->FetchRow();
+                
+                return $rs['admin_name'];
+        } else {
+                return $username;
+        }
+} 
+