Changeset 2572

Timestamp:

02/02/10 03:33:35 (2 years ago)

Author:

nuxwin

Message:

• Synchronization with trunk

Location:

branches/2188

Files:

• . (modified) (1 prop)
• CHANGELOG (modified) (1 diff)
• engine/ispcp-als-mngr (modified) (1 diff)
• engine/ispcp-alssub-mngr (modified) (1 diff)
• engine/ispcp-dmn-mngr (modified) (1 diff)
• engine/ispcp-rqst-mngr (modified) (4 diffs)
• engine/ispcp-sub-mngr (modified) (1 diff)
• gui/client/dns_edit.php (modified) (2 diffs)
• gui/include/input-checks.php (modified) (2 diffs)
• gui/include/ispcp-lib.php (modified) (1 diff)
• gui/themes/omega_original/css/jquery.js (added)
• gui/themes/omega_original/reseller/users.tpl (modified) (1 diff)

branches/2188/CHANGELOG

@@ -1 +1 @@
 ispCP ω 1.0.4 Changelog
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+2010-01-31 Benedikt Heintel
+        - ENGINE:
+                * Fixed #2086: DNS not working properly
+        - GUI:
+                * Fixed #718: little design error
+                * Fixed #2191: TLD .me not accepted
 
 2010-01-31 Sascha Bay

branches/2188/engine/ispcp-als-mngr

@@ -3912 +3912 @@
                 ($rs, $rdata) = doSQL($sql);
                 return $rs if ($rs != 0);
-
+        } elsif ($als_status eq 'dnschange'){
+                        # changing DNS
+                        $rs = als_change_named_data($entry);
+                        $timestamp = time();
+                        if ($rs == 0) {
+                                $sql = "update domain_aliasses set alias_status='ok' where alias_id = $als_id;";
+                        } else {
+                                my ($sub_name, $msg) = split(/$main::el_sep/, pop_el(\@main::el));
+                                $msg =~ s/\'/\\\'/g;
+                                $sql = "update domain_aliasses set alias_status='$sub_name | $msg' where alias_id = $als_id;";
+                        }
+                        ($rs, $rdata) = doSQL($sql);
+                        return $rs if ($rs != 0);
         } elsif ($als_status eq 'delete') {
                 # Removing domains;

branches/2188/engine/ispcp-alssub-mngr

@@ -2804 +2804 @@
                 ($rs, $rdata) = doSQL($sql);
                 return $rs if ($rs != 0);
-
+        } elsif ($sub_status eq 'dnschange') {    
+                $rs = alssub_change_named_data($entry);
+                $timestamp = time();
+                if ($rs == 0) {
+                        $sql = "update subdomain_alias set subdomain_alias_status='ok' where subdomain_alias_id = $sub_id;";
+                } else {
+                        my ($sub_name, $msg) = split(/$main::el_sep/, pop_el(\@main::el));
+                        $msg =~ s/\'/\\\'/g;
+                        $sql = "update subdomain_alias set subdomain_alias_status='$sub_name | $msg' where subdomain_alias_id = $sub_id;";
+                }
+                ($rs, $rdata) = doSQL($sql);
+                return $rs if ($rs != 0);
         } elsif ($sub_status eq 'delete') {
 

branches/2188/engine/ispcp-dmn-mngr

@@ -4863 +4863 @@
                 ($rs, $rdata) = doSQL($sql);
                 return $rs if ($rs != 0);
+        } elsif ($dmn_status eq 'dnschange'){
+                #modifiying DNS entry           
+                $rs = dmn_change_named_data($entry);
+                $timestamp = time();
+                if ($rs == 0) {
+                        $sql = "update domain set domain_status='ok' where domain_id = $dmn_id;";
+                } else {
+                        ($sub_name, $msg) = split(/$main::el_sep/, pop_el(\@main::el));
+                        $msg =~ s/\'/\\\'/g;
+                        $sql = "update domain set domain_status='$sub_name | $msg' where domain_id = $dmn_id;";
+                }
+                ($rs, $rdata) = doSQL($sql);
+                return $rs if ($rs != 0);
         } elsif ($dmn_status eq 'delete') {
                 # Removing domains;

branches/2188/engine/ispcp-rqst-mngr

@@ -120 +120 @@
                                 $dmn_status eq "restore" ||
                                 $dmn_status eq "toenable" ||
-                                $dmn_status eq "todisable"
+                                $dmn_status eq "todisable" ||
+                                $dmn_status eq "dnschange"
                            ) {
 
@@ -176 +177 @@
         }
 
-        $sql = "select mail_id, mail_acc, status from mail_users where status != 'ok' and status != 'ordered' order by mail_id";
+        $sql = "select mail_id, mail_acc, status from mail_users where status != 'ok' and status != 'disabled' and status != 'ordered' order by mail_id";
 
         ($rs, $rdata) = doSQL($sql);
@@ -300 +301 @@
         }
 
-        $sql = "select alias_id, alias_name, alias_status from domain_aliasses where alias_status in ('toadd', 'change') order by alias_id";
+        $sql = "select alias_id, alias_name, alias_status from domain_aliasses where alias_status in ('toadd', 'change','dnschange') order by alias_id";
 
         ($rs, $rdata) = doSQL($sql);
@@ -371 +372 @@
                         my ($sub_id, $sub_name, $sub_status) = (@$row[0], @$row[1], @$row[2]);
 
-                        if ($sub_status eq "toadd" || $sub_status eq "change" || $sub_status eq "delete") {
+                        if ($sub_status eq "toadd" || $sub_status eq "change" || $sub_status eq "delete" || $sub_status eq "dnschange") {
 
                                 if (defined($main::engine_debug)) {

branches/2188/engine/ispcp-sub-mngr

@@ -2751 +2751 @@
                 ($rs, $rdata) = doSQL($sql);
                 return $rs if ($rs != 0);
-
+                
+        } elsif ($sub_status eq 'dnschange'){
+                $rs = sub_change_named_data($entry);
+                $timestamp = time();
+                if ($rs == 0) {
+                        $sql = "update subdomain set subdomain_status='ok' where subdomain_id = $sub_id;";
+                } else {
+                        my ($sub_name, $msg) = split(/$main::el_sep/, pop_el(\@main::el));
+                        $msg =~ s/\'/\\\'/g;
+                        $sql = "update subdomain set subdomain_status='$sub_name | $msg' where subdomain_id = $sub_id;";
+                }
+                ($rs, $rdata) = doSQL($sql);
+                return $rs if ($rs != 0);
         } elsif ($sub_status eq 'delete') {
 

branches/2188/gui/client/dns_edit.php

@@ -591 +591 @@
                                         `domain`.`domain_id` = ?
                         ";
-                        exec_query($sql, $query, array(Config::get('ITEM_CHANGE_STATUS'), $dmn_id));
+                        exec_query($sql, $query, array(Config::get('ITEM_DNSCHANGE_STATUS'), $dmn_id));
                         $query = "
                                 UPDATE
@@ -600 +600 @@
                                 `subdomain`.`domain_id` = ?
                                 ";
-                        exec_query($sql, $query, array(Config::get('ITEM_CHANGE_STATUS'), $dmn_id));
+                        exec_query($sql, $query, array(Config::get('ITEM_DNSCHANGE_STATUS'), $dmn_id));
                 } else {
                         $query = "

branches/2188/gui/include/input-checks.php

@@ -538 +538 @@
                 $pattern =
                         '@^(?:
-                                (?:a[cdefgilmnoqrstuwxz]|aero|arpa|asia)|
-                                (?:b[abdefghijmnorstvwyz]|biz)|
-                                (?:c[acdfghiklmnorsuvxyz]|cat|com|coop)|
+                                (?:a[cdefgilmnoqrstuwxz]|aero|asia)|
+                                (?:b[abdefghijlmnorstvwyz]|biz)|
+                                (?:c[acdfghiklmnoruvxyz]|cat|com|coop)|
                                 d[ejkmoz]|
                                 (?:e[ceghrstu]|edu)|
@@ -550 +550 @@
                                 k[eghimnprwyz]|
                                 l[abcikrstuvy]|
-                                (?:m[acdghklmnopqrstuvwxyz]|mil|mobi|museum)|
+                                (?:m[acdefghklmnopqrstuvwxyz]|mil|mobi|museum)|
                                 (?:n[acefgilopruz]|name|net)|
                                 (?:om|org)|
                                 (?:p[aefghklmnrstwy]|pro)|
                                 qa|
-                                r[eouw]|
+                                r[eosuw]|
                                 s[abcdeghijklmnortuvyz]|
                                 (?:t[cdfghjklmnoprtvwz]|tel|travel)|

branches/2188/gui/include/ispcp-lib.php

@@ -91 +91 @@
 Config::set('ITEM_TODISABLED_STATUS', 'todisable');
 Config::set('ITEM_ORDERED_STATUS', 'ordered');
+Config::set('ITEM_DNSCHANGE_STATUS', 'dnschange');
 // SQL variables
 Config::set('MAX_SQL_DATABASE_LENGTH', 64);

branches/2188/gui/themes/omega_original/reseller/users.tpl

@@ -27 +27 @@
 
 <body onload="MM_preloadImages('{THEME_COLOR_PATH}/images/icons/database_a.gif','{THEME_COLOR_PATH}/images/icons/hosting_plans_a.gif','{THEME_COLOR_PATH}/images/icons/domains_a.gif','{THEME_COLOR_PATH}/images/icons/general_a.gif' ,'{THEME_COLOR_PATH}/images/icons/manage_users_a.gif','{THEME_COLOR_PATH}/images/icons/webtools_a.gif','{THEME_COLOR_PATH}/images/icons/statistics_a.gif','{THEME_COLOR_PATH}/images/icons/support_a.gif')">
-<!-- BDP: logged_from --><table width="100%" border="0" cellspacing="0" cellpadding="0">
-      <tr>
-        <td height="20" nowrap="nowrap" class="backButton">&nbsp;&nbsp;&nbsp;<a href="change_user_interface.php?action=go_back"><img src="{THEME_COLOR_PATH}/images/icons/close_interface.png" width="16" height="16" border="0" style="vertical-align:middle" alt="" /></a> {YOU_ARE_LOGGED_AS}</td>
-      </tr>
-    </table>
-        <!-- EDP: logged_from -->
 <table width="100%" border="0" cellspacing="0" cellpadding="0" style="height:100%;padding:0;margin:0 auto;">
+<!-- BDP: logged_from -->
+<tr>
+        <td colspan="3" height="20" nowrap="nowrap" class="backButton">&nbsp;&nbsp;&nbsp;<a href="change_user_interface.php?action=go_back"><img src="{THEME_COLOR_PATH}/images/icons/close_interface.png" width="16" height="16" border="0" style="vertical-align:middle" alt="" /></a> {YOU_ARE_LOGGED_AS}</td>
+</tr>
+<!-- EDP: logged_from -->
 <tr>
 <td align="left" valign="top" style="vertical-align: top; width: 195px; height: 56px;"><img src="{THEME_COLOR_PATH}/images/top/top_left.jpg" width="195" height="56" border="0" alt="ispCP Logogram" /></td>