Changeset 3631
- Timestamp:
- 01/24/07 19:24:26 (2 years ago)
- Files:
-
- freepbx/branches/2.2 (modified) (1 prop)
- freepbx/branches/2.2/amp_conf/htdocs/admin/modules/core/page.trunks.php (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
freepbx/branches/2.2
- Property svnmerge-integrated changed from /freepbx/trunk:1-3224,3231,3245-3246,3291-3295,3297,3299-3332,3336,3338-3365,3367-3373,3375-3388,3390-3391,3393-3395,3419,3567 to /freepbx/trunk:1-3224,3231,3245-3246,3291-3295,3297,3299-3332,3336,3338-3365,3367-3373,3375-3388,3390-3391,3393-3395,3419,3567,3624
freepbx/branches/2.2/amp_conf/htdocs/admin/modules/core/page.trunks.php
r3516 r3631 688 688 var msgInvalidChannelName = "<?php echo _('Invalid Custom Dial String entered'); ?>"; 689 689 var msgInvalidTrunkAndUserSame = "<?php echo _('Trunk Name and User Context cannot be set to the same value'); ?>"; 690 var msgConfirmBlankContext = "<?php echo _('User Context was left blank and User Details will not be saved!'); ?>"; 690 691 691 692 defaultEmptyOK = true; … … 716 717 return warnInvalid(theForm.usercontext, msgInvalidTrunkAndUserSame); 717 718 <?php } ?> 718 719 720 <?php if ($tech == "sip" || $tech = "iax2") { ?> 721 if ((isEmpty(theForm.usercontext.value) || isWhitespace(theForm.usercontext.value)) && 722 (!isEmpty(theForm.userconfig.value) && !isWhitespace(theForm.userconfig.value)) && 723 (theForm.userconfig.value != "secret=***password***\ntype=user\ncontext=from-trunk")) { 724 if (confirm(msgConfirmBlankContext) == false) 725 return false; 726 } 727 <?php } ?> 728 719 729 theForm.action.value = act; 720 730 return true;
