Changeset 9846

Show
Ignore:
Timestamp:
06/16/10 16:08:06 (3 years ago)
Author:
p_lindheimer
Message:

Merged revisions 9845 via svnmerge from
http://svn.freepbx.org/modules/branches/2.8

........

r9845 | p_lindheimer | 2010-06-16 13:04:38 -0700 (Wed, 16 Jun 2010) | 1 line


fixes #4336 delete fax user when extension is deleted, tested and confirmed mbrevda's patch and checking it in, thanks

........

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/branches/2.7

    • Property svnmerge-integrated changed from /modules/branches/2.6:1-8497,8589,8613,8620,8651,8672,9414-9416,9752,9773 /modules/branches/2.8:1-9044,9047,9049-9054,9056-9070,9072-9073,9075,9079-9080,9082-9085,9088-9089,9092-9093,9095-9098,9102,9105,9107-9123,9127-9128,9130-9132,9137,9149-9204,9211-9214,9216,9218-9224,9230-9232,9234,9237-9239,9248-9252,9257-9262,9267-9270,9272-9274,9277-9278,9280,9282,9288-9292,9295,9297,9300-9324,9326-9327,9329-9342,9345-9349,9353-9354,9358,9363-9376,9378-9379,9385,9387-9389,9392-9393,9395-9405,9407-9408,9410,9414-9421,9423-9424,9440,9442,9446-9449,9451-9452,9454-9458,9460-9462,9464-9469,9474-9475,9483-9484,9486,9489,9495,9500-9502,9504,9508,9607 to /modules/branches/2.6:1-8497,8589,8613,8620,8651,8672,9414-9416,9752,9773 /modules/branches/2.8:1-9044,9047,9049-9054,9056-9070,9072-9073,9075,9079-9080,9082-9085,9088-9089,9092-9093,9095-9098,9102,9105,9107-9123,9127-9128,9130-9132,9137,9149-9204,9211-9214,9216,9218-9224,9230-9232,9234,9237-9239,9248-9252,9257-9262,9267-9270,9272-9274,9277-9278,9280,9282,9288-9292,9295,9297,9300-9324,9326-9327,9329-9342,9345-9349,9353-9354,9358,9363-9376,9378-9379,9385,9387-9389,9392-9393,9395-9405,9407-9408,9410,9414-9421,9423-9424,9440,9442,9446-9449,9451-9452,9454-9458,9460-9462,9464-9469,9474-9475,9483-9484,9486,9489,9495,9500-9502,9504,9508,9607,9845

  • modules/branches/2.7/fax/functions.inc.php

    r9638 r9846  
    105105//prosses recived arguments 
    106106function fax_configprocess() { 
    107  $action = isset($_REQUEST['action'])?$_REQUEST['action']:null; 
    108  $ext = isset($_REQUEST['extdisplay'])?$_REQUEST['extdisplay']:$_REQUEST['extension']; 
     107       $action                 = isset($_REQUEST['action']) ?$_REQUEST['action']:null; 
     108       $ext                            = isset($_REQUEST['extdisplay'])?$_REQUEST['extdisplay']:$_REQUEST['extension']; 
    109109  $faxenabled = isset($_REQUEST['faxenabled'])?$_REQUEST['faxenabled']:null; 
    110   $faxemail = isset($_REQUEST['faxemail'])?$_REQUEST['faxemail']:null; 
    111   if ($action == 'edit'){fax_save_user($ext,$faxenabled,$faxemail);} 
     110       $faxemail       = isset($_REQUEST['faxemail'])?$_REQUEST['faxemail']:null; 
     111       switch ($action) { 
     112               case 'edit': 
     113                       fax_save_user($ext,$faxenabled,$faxemail); 
     114                       break; 
     115               case 'del': 
     116                       fax_delete_user($ext); 
     117                       break; 
     118       } 
     119 
    112120} 
    113121 
    …… 
    124132  $opts=explode('/', $extdisplay);$extension=$opts['0'];$cidnum=$opts['1']; //set vars 
    125133  sql("DELETE FROM fax_incoming WHERE cidnum = '".$db->escapeSimple($cidnum)."' and extension = '".$db->escapeSimple($extension)."'"); 
     134} 
     135 
     136function fax_delete_user($faxext) { 
     137       global $db; 
     138       $faxext=$db->escapeSimple($faxext); 
     139       sql('DELETE FROM fax_users where user = "'.$faxext.'"'); 
    126140} 
    127141