Changeset 12969
- Timestamp:
- 11/21/11 13:39:31 (1 year ago)
- Files:
-
- modules/branches/2.10/backup/page.backup.php (modified) (1 diff)
- modules/branches/2.10/core/functions.inc.php (modified) (1 diff)
- modules/branches/2.10/iaxsettings/functions.inc.php (modified) (2 diffs)
- modules/branches/2.10/ivr/functions.inc.php (modified) (2 diffs)
- modules/branches/2.10/paging/functions.inc.php (modified) (2 diffs)
- modules/branches/2.10/queues/functions.inc.php (modified) (2 diffs)
- modules/branches/2.10/timeconditions/functions.inc.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
modules/branches/2.10/backup/page.backup.php
r12956 r12969 62 62 } 63 63 64 ob_start( );64 ob_start($amp_conf['buffering_callback']); 65 65 header('Content-Type: text/event-stream'); 66 66 header('Cache-Control: no-cache'); modules/branches/2.10/core/functions.inc.php
r12967 r12969 769 769 } else { 770 770 $display = 'trunks'; 771 return array('description' => sprintf(_('Trunk: %s (%s)'),$thisexten['name'],$thisexten['tech']), 771 $name = isset($thisexten['name']) && $thisexten['name'] ? $thisexten['name'] : ''; 772 return array('description' => sprintf(_('Trunk: %s (%s)'),$name,$thisexten['tech']), 772 773 'edit_url' => "config.php?type=setup&display=$display&extdisplay=OUT_".urlencode($exten), 773 774 ); modules/branches/2.10/iaxsettings/functions.inc.php
r12698 r12969 153 153 unset($codecs); 154 154 155 if ( $interim_settings['videosupport'] == 'yes') {155 if (isset($interim_settings['videosupport']) && $interim_settings['videosupport'] == 'yes') { 156 156 asort($video_codecs); 157 157 foreach ($video_codecs as $codec => $enabled) { … … 165 165 /* next figure out what we need to write out (deal with things like nat combos, etc. */ 166 166 167 $jitterbuffer = $interim_settings['jitterbuffer']; 168 if (is_array($interim_settings)) foreach ($interim_settings as $key => $value) { 169 switch ($key) { 170 case 'videosupport': 171 break; 172 173 case 'maxjitterbuffer': 174 case 'maxjitterinterps': 175 case 'resyncthreshold': 176 case 'forcejitterbuffer': 177 if ($jitterbuffer == 'yes' && $value != '') { 178 $iax_settings[] = array($key, $value); 179 } 180 break; 181 182 case 'bandwidth': 183 if ($value != 'unset') { 184 $iax_settings[] = array($key, $value); 185 } 186 break; 187 188 case 'iax_language': 189 if ($value != '') { 190 $iax_settings[] = array('language', $value); 191 } 192 break; 193 194 default: 195 $iax_settings[] = array($key, $value); 196 } 197 } 198 unset($interim_settings); 199 if (is_array($iax_settings)) foreach ($iax_settings as $entry) { 167 $jitterbuffer = isset($interim_settings['jitterbuffer']) && $interim_settings['jitterbuffer'] 168 ? $interim_settings['jitterbuffer'] : ''; 169 if (isset($interim_settings) && is_array($interim_settings)){ 170 foreach ($interim_settings as $key => $value) { 171 switch ($key) { 172 case 'videosupport': 173 break; 174 175 case 'maxjitterbuffer': 176 case 'maxjitterinterps': 177 case 'resyncthreshold': 178 case 'forcejitterbuffer': 179 if ($jitterbuffer == 'yes' && $value != '') { 180 $iax_settings[] = array($key, $value); 181 } 182 break; 183 184 case 'bandwidth': 185 if ($value != 'unset') { 186 $iax_settings[] = array($key, $value); 187 } 188 break; 189 190 case 'iax_language': 191 if ($value != '') { 192 $iax_settings[] = array('language', $value); 193 } 194 break; 195 196 default: 197 $iax_settings[] = array($key, $value); 198 } 199 } 200 } 201 unset($interim_settings); 202 if (isset($iax_settings) && is_array($iax_settings)){ 203 foreach ($iax_settings as $entry) { 200 204 if ($entry[1] != '') { 201 205 $core_conf->addIaxGeneral($entry[0],$entry[1]); 202 206 } 203 207 } 208 } 204 209 } 205 210 break; modules/branches/2.10/ivr/functions.inc.php
r12535 r12969 39 39 //draw a list of ivrs included by any queues 40 40 $queues = queues_list(true); 41 $qivr = array(); 41 42 foreach ($queues as $q) { 42 43 $thisq = queues_get($q[0]); … … 637 638 } else { 638 639 //$type = isset($active_modules['ivr']['type'])?$active_modules['ivr']['type']:'setup'; 639 return array('description' => sprintf(_("IVR: %s"), ($ result['name'] ? $result['name'] : $result['id'])),640 return array('description' => sprintf(_("IVR: %s"), ($thisexten['name'] ? $thisexten['name'] : $thisexten['id'])), 640 641 'edit_url' => 'config.php?display=ivr&action=edit&id='.urlencode($exten), 641 642 ); modules/branches/2.10/paging/functions.inc.php
r12965 r12969 11 11 12 12 function paging_get_config($engine) { 13 global $db; 14 global $ext; 15 global $chan_dahdi; 16 global $version; 13 global $db, $ext, $chan_dahdi, $version, $amp_conf; 17 14 switch($engine) { 18 15 case "asterisk": … … 38 35 $callinfo = 'Call-Info: <uri>\;answer-after=0'; 39 36 $sipuri = 'intercom=true'; 40 //$doptions ='A(beep)';37 $doptions = '';//'A(beep)'; 41 38 $vxml_url = ''; 42 39 $dtime = '5'; modules/branches/2.10/queues/functions.inc.php
r12515 r12969 434 434 $options = 't'; 435 435 if ($ast_ge_18) { 436 if ( $q['answered_elsewhere'] == '1'){436 if (isset($q['answered_elsewhere']) && $q['answered_elsewhere'] == '1'){ 437 437 $options .= 'C'; 438 438 } … … 562 562 // Add routing vector to direct which context call should go 563 563 // 564 $agent_context = $q['use_queue_context']? $queue_context : 'from-internal';564 $agent_context = isset($q['use_queue_context']) && $q['use_queue_context'] && isset($queue_context) ? $queue_context : 'from-internal'; 565 565 switch ($q['use_queue_context']) { 566 566 case 1: modules/branches/2.10/timeconditions/functions.inc.php
r12543 r12969 666 666 //these are the users time selections for the current timegroup 667 667 function timeconditions_timegroups_get_times($timegroup, $convert=false) { 668 global $db ;669 global $version;670 668 global $db, $version; 669 $tmparray = array(); 670 671 671 if ($convert && (!isset($version) || $version == '')) { 672 672 $engineinfo = engine_getinfo();
