Changeset 5754
- Timestamp:
- 05/14/08 13:13:05 (3 months ago)
- Files:
-
- modules/branches/2.3 (modified) (1 prop)
- modules/branches/2.3/timeconditions/functions.inc.php (modified) (3 diffs)
- modules/branches/2.3/timeconditions/module.xml (modified) (2 diffs)
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-5545,5548-5549,5555,5564,5570,5572-5574,5576-5578,5596,5606-5610,5612,5615-5618,5623-5624,5628,5630-5642,5644-5646,5648-5651,5653-5654,5656-5657,5660,5687-5699,5701-5702,5704-5715,5723-5727,5729-5730,5733-5741 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-5545,5548-5549,5555,5564,5570,5572-5574,5576-5578,5596,5606-5610,5612,5615-5618,5623-5624,5628,5630-5642,5644-5646,5648-5651,5653-5654,5656-5657,5660,5687-5699,5701-5702,5704-5715,5723-5727,5729-5730,5733-5741,5752-5753
modules/branches/2.3/timeconditions/functions.inc.php
r2453 r5754 4 4 function timeconditions_destinations() { 5 5 //get the list of meetmes 6 $results = timeconditions_list( );6 $results = timeconditions_list(true); 7 7 8 8 // return an associative array with destination and description … … 26 26 switch($engine) { 27 27 case "asterisk": 28 $timelist = timeconditions_list( );28 $timelist = timeconditions_list(true); 29 29 if(is_array($timelist)) { 30 30 foreach($timelist as $item) { … … 40 40 41 41 //get the existing meetme extensions 42 function timeconditions_list( ) {42 function timeconditions_list($getall=false) { 43 43 $results = sql("SELECT * FROM timeconditions","getAll",DB_FETCHMODE_ASSOC); 44 44 if(is_array($results)){ 45 45 foreach($results as $result){ 46 46 // check to see if we have a dept match for the current AMP User. 47 if ( checkDept($result['deptname'])){47 if ($getall || checkDept($result['deptname'])){ 48 48 // return this item's dialplan destination, and the description 49 49 $allowed[] = $result; modules/branches/2.3/timeconditions/module.xml
r4836 r5754 2 2 <rawname>timeconditions</rawname> 3 3 <name>Time Conditions</name> 4 <version>2.4.3. 1</version>4 <version>2.4.3.2</version> 5 5 <type>setup</type> 6 6 <category>Inbound Call Control</category> … … 9 9 </description> 10 10 <changelog> 11 *2.4.3.2* generate all timeconditions when using database mode authorization and deptarments 11 12 *2.4.3.1* bump for rc1 12 13 *2.4.3* Added SQLite3 support, fixed ticket http://freepbx.org/trac/ticket/1774
