Changeset 1291

Timestamp:

08/03/08 20:56:25 (4 months ago)

Author:

scitech

Message:

Fixed #1079: Error adding user when opening new tab/window

Files:

• trunk/CHANGELOG (modified) (1 diff)
• trunk/gui/include/ispcp-functions.php (modified) (4 diffs)
• trunk/gui/reseller/user_add1.php (modified) (2 diffs)
• trunk/gui/reseller/user_add2.php (modified) (5 diffs)
• trunk/gui/reseller/user_add3.php (modified) (7 diffs)
• trunk/gui/reseller/user_add4.php (modified) (5 diffs)

trunk/CHANGELOG

@@ -1 +1 @@
-ispCP ω 1.0.0 Changelog
-~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+2008-08-03 Daniel Andreca
+        - GUI:
+                * Fixed #1079: Error adding user when opening new tab/window
-
-2008-08-02 Benedikt Heintel

trunk/gui/include/ispcp-functions.php

@@ -356 +356 @@
-        $glToUnset[] = 'step_two_data';
-        $glToUnset[] = 'ch_hpprops';
-rau
+user_add
-        $glToUnset[] = 'user_has_domain';
-        $glToUnset[] = 'local_data';
@@ -378 +378 @@
-
-        foreach ($glToUnset as $toUnset) {
-isset($GLOBALS[$toUnset]
+array_key_exists($toUnset,$GLOBALS
-                        unset($GLOBALS[$toUnset]);
-        }
@@ -385 +385 @@
-        $sessToUnset[] = 'reseller_added';
-        $sessToUnset[] = 'dmn_name';
-
+
+
+
+
+
+
-        $sessToUnset[] = 'user_has_domain';
-        $sessToUnset[] = 'user_added';
@@ -404 +409 @@
-
-        foreach ($sessToUnset as $toUnset) {
-isset($_SESSION[$toUnset]
+array_key_exists($toUnset,$_SESSION
-                        unset($_SESSION[$toUnset]);
-        }

trunk/gui/reseller/user_add1.php

@@ -98 +98 @@
-
-        if (isset($_POST['dmn_name'])) {
-$_POST['dmn_name']
+trim($_POST['dmn_name'])
-                $dmn_name = encode_idna($dmn_name);
-        }
@@ -163 +163 @@
-                        )
-                );
-
-        $tpl->assign('MESSAGE', '');
-} //End of get_empty_au1_page()

trunk/gui/reseller/user_add2.php

@@ -78 +78 @@
-        );
-
-
-
-
+
+
+
+
+
+
+
+
-        if (check_user_data($tpl)) {
-                $_SESSION["step_two_data"] = "$dmn_name;0;";
@@ -91 +96 @@
-        }
-} else {
-_data
+
-        global $dmn_chp;
-        get_hp_data($dmn_chp, $_SESSION['user_id']);
@@ -115 +120 @@
-        global $dmn_pt;
-
-
+{
-                $dmn_name = $_SESSION['dmn_name'];
-
-
+
+
+
+
+
-                $dmn_chp = $_SESSION['dmn_tpl'];
-
-
+
+
+
+
+
-                $dmn_pt = $_SESSION['chtpl'];
+        } else {
+                return false;
+        }
+        
+        return true;
-} // End of get_pageone_param()
-
@@ -274 +290 @@
-                set_page_message(tr('Incorrect FTP accounts limit!'));
-        }
-user
+db
-                set_page_message(tr('Incorrect SQL databases limit!'));
-        }
@@ -280 +296 @@
-                set_page_message(tr('SQL users limit is <i>disabled</i>!'));
-        }
-db
+user
-                set_page_message(tr('Incorrect SQL users limit!'));
-        }
-db == -1 && $hp_sql_user 
-
+user == -1 &&  $hp_sql_db
+not 
-        }
-        if (!ispcp_limit_check($hp_traff, null)) {

trunk/gui/reseller/user_add3.php

@@ -83 +83 @@
-        );
-
-
+
+
+
+
+
+
+
-// Process the action ...
-if (isset($_POST['uaction']) && ("user_add3_nxt" === $_POST['uaction']) && !isset($_SESSION['step_two_data'])) {
@@ -132 +138 @@
-        // $dmn_user_name = preg_replace("/\./", "_", $dmn_name);
-        $dmn_user_name = $dmn_name;
+        if(!chk_dname($dmn_name) || ($hpid==''))return false;
+        return true;
-} // End of init_in_values()
-
@@ -218 +226 @@
-        } else {
-                if (Config::exists('HOSTING_PLANS_LEVEL') && strtolower(Config::get('HOSTING_PLANS_LEVEL')) == 'admin') {
-select props from hosting_plans where id
+SELECT `props` FROM `hosting_plans` WHERE `id`
-                        $res = exec_query($sql, $query, array($hpid));
-                } else {
-select props from hosting_plans where reseller_id = ? and id
+SELECT `props` FROM `hosting_plans` WHERE `reseller_id` = ? AND `id`
-                        $res = exec_query($sql, $query, array($reseller_id, $hpid));
-                }
@@ -254 +262 @@
-
-        check_for_lock_file();
+        /*Daniel Andreca: If this check is disabled why execute query?
-        // check again if a user like that exits
-<<<OMEGA_SQL_QUERY
-select
-count
-
-admin
-where
-admin_name
-limit
-OMEGA_SQL_QUERY
+"
+       SELECT
+       COUNT
+
+       `admin`
+       WHERE
+       `admin_name`
+       LIMIT
+       "
-
-        $res = exec_query($sql, $query, $dmn_user_name);
-
+*/
-
-        /*
@@ -274 +283 @@
-        }*/
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        $res = exec_query($sql, $query, array(
@@ -302 +309 @@
-        $record_id = $sql->Insert_ID();
-
-<<<ISPCP_SQL_QUERY
-            insert into domain
-                        domain_name, domain_admin_id
-                        domain_created_id, domain_created
-                        domain_mailacc_limit, domain_ftpacc_limit
-                        domain_traffic_limit, domain_sqld_limit
-                        domain_sqlu_limit, domain_status
-                        domain_subd_limit, domain_alias_limit
-                        domain_ip_id, domain_disk_limit
-
-                       
-                values
-                        
-                        
-                        
-                        
-                        
-                        
-                        
-                        
-                       
-ISPCP_SQL_QUERY
+"
+               INSERT INTO `domain`
+                       `domain_name`, `domain_admin_id`
+                       `domain_created_id`, `domain_created`
+                       `domain_mailacc_limit`, `domain_ftpacc_limit`
+                       `domain_traffic_limit`, `domain_sqld_limit`
+                       `domain_sqlu_limit`, `domain_status`
+                       `domain_subd_limit`, `domain_alias_limit`
+                       `domain_ip_id`, `domain_disk_limit`
+
+               
+               VALUES
+                       
+                       
+                       
+                       
+                       
+                       
+                       
+                       
+               
+       "
-
-        $res = exec_query($sql, $query, array(
@@ -353 +360 @@
-        $user_theme_color = $_SESSION['user_theme'];
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-        $res = exec_query($sql, $query, array($record_id,

trunk/gui/reseller/user_add4.php

@@ -50 +50 @@
-        $domain_id = $_SESSION['dmn_id'];
-
-<<<SQL_QUERY
-
-
-
-
-
-          domain_id
-
-          domain_created_id
-SQL_QUERY
+ "
+
+
+
+
+
+                       `domain_id`
+
+                       `domain_created_id`
+       "
-
-        $rs = exec_query($sql, $query, array($domain_id, $reseller_id));
@@ -72 +72 @@
-        $add_status = Config::get('ITEM_ADD_STATUS');
-
-<<<SQL_QUERY
-
-
-
-
-
-            domain_id
-
-            (domain_status = ? or domain_status
-SQL_QUERY
+ "
+
+
+
+
+
+                       `domain_id`
+
+                       (`domain_status` = ? or `domain_status`
+       "
-
-        $rs = exec_query($sql, $query, array($domain_id, $ok_status, $add_status));
@@ -160 +160 @@
-        $dmn_id = $_SESSION['dmn_id'];
-
-<<<SQL_QUERY
-
-            alias_id
-            alias_name
-
-
-
-
-            domain_id
-SQL_QUERY
+"
+
+                       `alias_id`
+                       `alias_name`
+
+
+
+
+                       `domain_id`
+       "
-
-        $rs = exec_query($sql, $query, array($dmn_id));
@@ -227 +227 @@
-            }
-        } else {
-
-
+
+
+
+
-                if ($res->RowCount() > 0 or $res2->RowCount() > 0) {
-                        // we already have domain with this name
-                        $err_al = tr("Domain with this name already exist");
-                }
-
+
+
-                $subdomres = exec_query($sql,
-"select count(subdomain_id) as cnt from subdomain where domain_id=? and subdomain_mount=?"
+$query
-                        array($cr_user_id, $mount_point));
-                $subdomdata = $subdomres->FetchRow();
@@ -250 +253 @@
-        check_for_lock_file();
-        $status = Config::get('ITEM_ADD_STATUS');
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-        send_request();
-        $admin_login = $_SESSION['user_logged'];