Changeset 2710 for branches/omega-1.0.5

Timestamp:

03/21/10 13:48:36 (2 years ago)

Author:

nuxwin

Message:

• [MERGE] r2709: Unable to delete database properly

Location:

branches/omega-1.0.5

Files:

• . (modified) (1 prop)
• gui/include/client-functions.php (modified) (5 diffs)

branches/omega-1.0.5/gui/include/client-functions.php

@@ -30 +30 @@
 
 function get_domain_default_props(&$sql, $domain_admin_id, $returnWKeys = false) {
-        
+
         // /!\ Note to dev:
         // Please, when you adds new field here, you must
@@ -546 +546 @@
 
         $rs = exec_query($sql, $query, array($_SESSION['user_created_by']));
-  
+
         if (!Config::get('ISPCP_SUPPORT_SYSTEM') || $rs->fields['support_system'] == 'no') {
                 $tpl->assign('ISACTIVE_SUPPORT', '');
@@ -672 +672 @@
 
         $rs = exec_query($sql, $query, array($_SESSION['user_created_by']));
-  
+
         if (!Config::get('ISPCP_SUPPORT_SYSTEM') || $rs->fields['support_system'] == 'no') {
                 $tpl->assign('SUPPORT_SYSTEM', '');
@@ -876 +876 @@
                 $rs = exec_query($sql, $query, array());
         } else {
-                $new_db_name = str_replace("_", "\\_", $db_name);
                 $query = <<<SQL_QUERY
-                        REVOKE ALL ON $new_db_name.* FROM ?@'%'
-SQL_QUERY;
+                        REVOKE ALL ON $db_name.* FROM ?@'%'
+SQL_QUERY;
+
                 $rs = exec_query($sql, $query, array($db_user_name));
 
                 $query = <<<SQL_QUERY
-                        REVOKE ALL ON $new_db_name.* FROM ?@localhost
+                        REVOKE ALL ON $db_name.* FROM ?@localhost
 SQL_QUERY;
                 $rs = exec_query($sql, $query, array($db_user_name));
@@ -1063 +1063 @@
 /**
  * Checks the User rights to add Domain Aliases
- * 
+ *
  * @param int User ID
  * @return boolean Client Domain Alias Permissions