Changeset 5653

Show
Ignore:
Timestamp:
02/07/08 14:37:35 (5 years ago)
Author:
p_lindheimer
Message:

Merged revisions 5651 via svnmerge from
http://svn.freepbx.org/modules/branches/2.4

........

r5651 | p_lindheimer | 2008-02-07 11:26:34 -0800 (Thu, 07 Feb 2008) | 1 line


#2645 errors in API - this obviously never worked

........

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/branches/2.3

    • Property svnmerge-integrated changed from /modules/branches/2.2:1-3588,3615-3635,3637-3638,3640,3674,3680,3686,3692,3702,3706,3710,3716,3758,3760,3762-3765,3767-3785,3787-3789,3801,3810,3828,3831,3839,3860,3866,3875,3877,3887,3899,3911,3913,3943,3982-3983,3990,3998,4007,4022-4023,4089,4092,4098,4265,4285 /modules/branches/2.4:1-5079,5090,5093,5097-5118,5120-5170,5172,5174,5176-5182,5184-5199,5202-5203,5205-5211,5239,5271-5272,5312,5383,5516,5544,5572,5606-5608,5615,5644 to /modules/branches/2.2:1-3588,3615-3635,3637-3638,3640,3674,3680,3686,3692,3702,3706,3710,3716,3758,3760,3762-3765,3767-3785,3787-3789,3801,3810,3828,3831,3839,3860,3866,3875,3877,3887,3899,3911,3913,3943,3982-3983,3990,3998,4007,4022-4023,4089,4092,4098,4265,4285 /modules/branches/2.4:1-5079,5090,5093,5097-5118,5120-5170,5172,5174,5176-5182,5184-5199,5202-5203,5205-5211,5239,5271-5272,5312,5383,5516,5544,5572,5606-5608,5615,5644,5651

  • modules/branches/2.3/inventorydb/functions.inc.php

    r2521 r5653  
    3333} 
    3434 
    35 function inventorydb_edit($extdisplay, $empnum, $empname, $floor, $room, $section, $cubicle, $desk, $exten, $phusername, $phpassword, $mac, $serial, $device, $distdate, $ip, $pbxbox, $extrainfo){ 
     35function inventorydb_edit($extdisplay, $empnum, $empname, $building, $floor, $room, $section, $cubicle, $desk, $exten, $phusername, $phpassword, $mac, $serial, $device, $distdate, $ip, $pbxbox, $extrainfo){ 
    3636  $sql="UPDATE inventorydb set empnum='$empnum' where id='$extdisplay'"; 
    3737  sql($sql); 

  • modules/branches/2.3/inventorydb/page.inventorydb.php

    r3829 r5653  
    7575  break; 
    7676  case "edit": 
    77     inventorydb_edit($extdisplay, $empnum, $empname, $building, $floor, $room, $section, $cubicle, $desk, $exten, $phusername, phpassword, $mac, $serial, $device, $distdate, $ip, $pbxbox, $extrainfo); 
     77    inventorydb_edit($extdisplay, $empnum, $empname, $building, $floor, $room, $section, $cubicle, $desk, $exten, $phusername, $phpassword, $mac, $serial, $device, $distdate, $ip, $pbxbox, $extrainfo); 
    7878    //needreload(); 
    7979    redirect_standard('extdisplay');