Changeset 223

Show
Ignore:
Timestamp:
11/29/07 00:13:42 (13 months ago)
Author:
jonas
Message:
 
Location:
trunk
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • trunk/includes/sites/domain_forward.php

    r221 r223  
    3030                        $db->escapeSimple($_GET['did'])); 
    3131                $result2=&$db->query($sql); 
     32                $sql=sprintf("SELECT id FROM domains_forward WHERE to_domain='%s'", 
     33                        $db->escapeSimple($_GET['did'])); 
     34                $result3=$db->query($sql); 
    3235                if($result->numRows()!=1) { 
    3336                        $smarty->assign('error_msg','y'); 
     
    3740                        $smarty->assign('error_msg','y'); 
    3841                        $smarty->assign('if_error_domain_forwarded_already','y'); 
     42                } 
     43                elseif ($result3->numRows()!=0) { 
     44                        $smarty->assign('error_msg','y'); 
     45                        $smarty->assign('if_error_other_domains_points_to_me','y'); 
    3946                } 
    4047                else { 
  • trunk/templates/error_messages.tpl

    r221 r223  
    9999{t}move known spam and forward known spam is active!{/t}<br/> 
    100100{t}You could either use move or forward option!{/t} 
     101{elseif $if_error_other_domains_points_to_me == 'y'} 
     102{t 1=$dnsname}Other domains points to %1.{/t}<br/> 
     103{t}It's not possible to create an forward that forwards again!{/t} 
    101104{/if}