Changeset 1930

Show
Ignore:
Timestamp:
09/09/07 22:01:34 (1 year ago)
Author:
benjamin
Message:

Fixing dns/nodns issue (a bug in update_domains) Fixes #772

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • alternc/trunk/bureau/admin/dom_edit.php

    r1564 r1930  
    147147        <td width="65%" valign="top"> 
    148148        <p> 
    149 <?php printf(_("help_dns_mx %s %s"),$L_MX,$L_HOSTING); ?> 
     149<?php printf(_("help_dns_mx %s %s"),$L_MX,$L_HOSTING);  
     150 if (!$r["mx"] && !$r["dns"]) $r["mx"]=$L_MX; 
     151?> 
    150152        </p> 
    151153        <label for="mx"><?php __("MX Field"); ?> : </label><input type="text" class="int" name="mx" id="mx" value="<?php echo $r["mx"] ?>" <?php if (!$r["dns"]) echo "disabled=\"disabled\""; ?> /> 

  • alternc/trunk/debian/changelog

    r1906 r1930  
    1 alternc (0.9.6.5) testing; urgency=low 
    2  
     1alternc (0.9.6.5-12) testing; urgency=low 
     2 
     3  * Fixing dns / nodns issue (#772) 
     4  * using apache-modconf again ... 
    35  * Choose english as default language, (#1047) 
    46  * parameter checking in subdomain creation (#1037) 

  • alternc/trunk/src/functions.sh

    r1922 r1930  
    266266        # That's for one-line template 
    267267        grep -v "^zone \"$escaped_domain\"" \ 
    268             < "$NAMED_CONF_FILE" > "$NAMED_CONF_FILE.$$" 
     268            < "$NAMED_CONF_FILE" > "$NAMED_CONF_FILE.$$" || true 
    269269        mv -f "$NAMED_CONF_FILE.$$" "$NAMED_CONF_FILE" 
    270270        add_to_named_reload "all" 

  • alternc/trunk/src/update_domains.sh

    r1921 r1930  
    131131SELECT membres.login, 
    132132       domaines_standby.domaine, 
    133        domaines_standby.mx, 
     133       if (domaines_standby.mx = '', '@', domaines_standby.mx), 
    134134       domaines_standby.gesdns, 
    135135       domaines_standby.gesmx,