cgi/manage.cgi
--------------
1. $RENEWALS and $AUTO_RENEWAL_MESSAGE options should be brought into
   OpenSRS.conf, akin to notice_days.  I didn't include this in the patch
   below but would be willing to do it if you are willing to make the
   change.
2. There is an assumption in the comments and headers that notice_days is
   always 60.  Fix included in patch below.
3. Any $CANT_SUPPORT{} TLD match always shows .ca in the message returned
   to the user instead of $tld.  Fix included in patch below.
4. 'view_waiting_history' listed twice in %actions.  Fix included in patch
   below.
5. $HTML{CGI} not defined even though the expire_domains_result.html
   template uses it.  Fix included in patch below.

templates/manage/base2.html
---------------------------
1. The "Waiting Request" text isn't a link to action view_waiting_history
   like it is in base.html.  Fix included in patch below.

templates/reg_system/{avail,main_menu,taken}.html
-------------------------------------------------
1. The {{MLDNSType}} tag is missing from some of the domain name queries.
   Fix included in patch below.

Here is the patch:

--- cgi/manage.cgi      2001/01/07 21:24:15     1.3
+++ cgi/manage.cgi      2001/01/08 04:31:31
@@ -86,7 +86,7 @@
 $last_ip = undef;
 $waiting_request = "";
 
-$T_EXPIRING = 1; # there are domains to expire in 60 days
+$T_EXPIRING = 1; # there are domains to expire in $notice_days days
 $T_EXPIRED  = 2; # there are expired domains
 $t_mode = undef; # can be 0, $T_EXPIRING, $T_EXPIRED or ($T_EXPIRING | $T_EXPIRED)
 $notice_days  = $MANAGE{ notice_days } ? $MANAGE{ notice_days } : 60;
@@ -143,7 +143,6 @@
            do_change_password => undef,
            change_ownership => undef,
            do_change_ownership => undef,
-           view_waiting_history => undef,
            
            view_waiting_history => undef,
             get_expire_domains => undef,
@@ -813,8 +812,8 @@
     if ( exists $CANT_SUPPORT{$tld} )
     {
        my $message = <<EOF;
-You cannot currently make changes to .ca domains through this<BR>
-interface. We will have a .ca enabled Manage Domain interface in place as<BR>
+You cannot currently make changes to $tld domains through this<BR>
+interface. We will have a $tld enabled Manage Domain interface in place as<BR>
 soon as possible.</P>
 If need to make emergency nameserver changes to your domain, please contact
 <a href="mailto:support\@opensrs.org">support\@opensrs.org</a>.
@@ -1643,7 +1642,7 @@
           } 
 
            if (($t_mode == $T_EXPIRING) || ($t_mode == ($T_EXPIRED + $T_EXPIRING))) {
-               $HTML->{EXPIRING} = "<a 
href=\"$cgi?action=get_expire_domains&type=expiring&\">Click here to see the list of 
names expiring within the next 60 days.</a>";      
+               $HTML->{EXPIRING} = "<a 
+href=\"$cgi?action=get_expire_domains&type=expiring&\">Click here to see the list of 
+names expiring within the next $notice_days days.</a>";      
            } 
        } else {
            $template_html = "base.html"; 
@@ -1901,8 +1900,8 @@
     if ( exists $CANT_SUPPORT{$tld} )
     {
        my $message = <<EOF;
-You cannot currently make changes to .ca domains through this<BR>
-interface. We will have a .ca enabled Manage Domain interface in place as<BR>
+You cannot currently make changes to $tld domains through this<BR>
+interface. We will have a $tld enabled Manage Domain interface in place as<BR>
 soon as possible.</P>
 If need to make emergency nameserver changes to your domain, please contact
 <a href="mailto:support\@opensrs.org">support\@opensrs.org</a>.
@@ -2112,18 +2111,18 @@
 
 
 sub get_expire_domains {
-    #get list of expired domains or ones to expire within 60 days
+    #get list of expired domains or ones to expire within $notice_days days
     #/manage?action=get_expire_domains&type={expired/expiring}
 
     my ($error,$sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst);
     my (%HTML,$domain_name,$domain_html,$next_page,$previous_page);
     my @domains = () ;
-    my $title = "List of domains due to expire within next 60 days";
+    my $title = "List of domains due to expire within next $notice_days days";
     my @auto_renew = ();
     my @expiredate = ();
     my @expire_dt = ();  # numeric representation of date/time
     my @expired_index = (); # keep array of expired domain indexes
-    my @expiring_index = (); # array of domain indexes with date whithin 60 days
+    my @expiring_index = (); # array of domain indexes with date whithin $notice_days 
+days
     my $type = $in{type};
     my $xcp_request = undef;
     my $response = undef;
@@ -2296,6 +2295,7 @@
        if ($updated_domain_html) {
           $HTML{DOMAINS} = $updated_domain_html;
           $HTML{TITLE} = "Update Status";     
+          $HTML{CGI} = $cgi;
           print_form("$path_templates/expire_domains_result.html",\%HTML);
           exit;                       
        }
@@ -2482,7 +2482,7 @@
 }
 
 sub do_expiring_domains {
-    # ret: response from rm_server or undef for domains to exp within 60 days
+    # ret: response from rm_server or undef for domains to exp within $notice_days 
+days
     my ($page) = $_[0];
     my ($error);
     my $type = "list";
@@ -2598,8 +2598,8 @@
 
     if ( exists $CANT_SUPPORT{$tld} ) {
         my $message = <<EOF;
-You cannot currently make changes to .ca domains through this<BR>
-interface. We will have a .ca enabled Manage Domain interface in place as<BR>
+You cannot currently make changes to $tld domains through this<BR>
+interface. We will have a $tld enabled Manage Domain interface in place as<BR>
 soon as possible.</P>
 If need to make emergency nameserver changes to your domain, please contact
 <a href="mailto:support\@opensrs.org">support\@opensrs.org</a>.
--- templates/manage/base2.html 2001/01/07 21:03:22     1.1.1.1
+++ templates/manage/base2.html 2001/01/08 04:31:31
@@ -42,8 +42,8 @@
 
 <tr>
 <td ALIGN=CENTER><b><font face="verdana, arial"><font size=-1>Expires:
-{{EXPIREDATE}}&nbsp;</font></font></b>&nbsp;&nbsp; <b><font face="verdana, 
arial"><font size=-1>Waiting
-Request: {{WAITING_REQUEST}}&nbsp;</font></font></b></td>
+{{EXPIREDATE}}&nbsp;</font></font></b>&nbsp;&nbsp; <b><font face="verdana, 
+arial"><font size=-1><a href="{{CGI}}?action=view_waiting_history">Waiting
+Request</a>: {{WAITING_REQUEST}}&nbsp;</font></font></b></td>
 </tr>
 </table>
 </td>
--- templates/reg_system/avail.html     Sun Jan  7 22:18:07 2001
+++ templates/reg_system/avail.html     Sun Jan  7 13:18:34 2001
@@ -48,7 +48,7 @@
                 <TR>
                   <TH>
                     <P ALIGN=Left>
-                    Domain Name<B>:</B>
+                    {{MLDNSType}} Domain Name<B>:</B>
                   </TH>
                   <TH>
                     <P ALIGN=Center>
--- templates/reg_system/main_menu.html Sun Jan  7 22:18:07 2001
+++ templates/reg_system/main_menu.html Sun Jan  7 13:18:34 2001
@@ -18,7 +18,7 @@
                 <TR>
                   <TH>
                     <P ALIGN=Left>
-                    Domain Name<B>:</B>
+                    {{MLDNSType}} Domain Name<B>:</B>
                   </TH>
                   <TH>
                     <P ALIGN=Center>
--- templates/reg_system/taken.html     Sun Jan  7 22:18:07 2001
+++ templates/reg_system/taken.html     Sun Jan  7 13:18:34 2001
@@ -24,7 +24,7 @@
                 <TR>
                   <TH>
                     <P ALIGN=Left>
-                    Domain Name<B>:</B>
+                    {{MLDNSType}} Domain Name<B>:</B>
                   </TH>
                   <TH>
                     <P ALIGN=Center>

Reply via email to