Changeset 12988

Show
Ignore:
Timestamp:
12/04/11 17:19:13 (1 year ago)
Author:
p_lindheimer
Message:

buffering_callback has been removed from FreePBX, these should not be re-introduced

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • freepbx/branches/2.10/amp_conf/htdocs/admin/libraries/view.functions.php

    r12941 r12988  
    108108            } 
    109109            header("Content-type: ".$mimetype); 
    110             ob_start($amp_conf['buffering_callback']); 
     110            ob_start(); 
    111111            include($fullpath); 
    112112            ob_end_flush(); 

  • freepbx/branches/2.10/libfreepbx.install.php

    r12976 r12988  
    14521452  $freepbx_conf->define_conf_setting('MODULEADMIN_SKIP_CACHE',$set); 
    14531453 
    1454   // buffering_callback 
    1455   $set['value'] = 'sprintf'; 
    1456   $set['options'] = ''; 
    1457   $set['name'] = 'ob_start callback'; 
    1458   $set['description'] = 'This is the callback that will be passed to ob_start. In its default state, ob_gzhandler will be passed which will case all data passed directly by the system to be compressed set this to be blank or something else if this creates issues.'; 
    1459   $set['emptyok'] = 0; 
    1460   $set['readonly'] = 0; 
    1461   $set['hidden'] = 1; 
    1462   $set['type'] = CONF_TYPE_TEXT; 
    1463   $freepbx_conf->define_conf_setting('buffering_callback',$set); 
    1464   $set['hidden'] = 0; 
    1465  
    1466  
    14671454  // 
    14681455  // CATEGORY: Flash Operator Panel 
    …… 
    22092196  // ASTCONFAPP 
    22102197  $set['value'] = 'app_meetme'; 
    2211   $set['options'] = 'app_meetme, app_confbridge'; 
     2198  $set['options'] = array('app_meetme', 'app_confbridge'); 
    22122199  $set['defaultval'] =& $set['value']; 
    22132200  $set['readonly'] = 0; 
    …… 
    22162203  $set['module'] = ''; 
    22172204  $set['category'] = 'Dialplan and Operational'; 
    2218   $set['emptyok'] = 1; 
     2205  $set['emptyok'] = 0; 
    22192206  $set['name'] = 'Conference Room App'; 
    2220   $set['description'] = 'The asterisk application to use for conferencing.'; 
     2207  $set['description'] = 'The asterisk application to use for conferencing. If only one is compiled into asterisk, FreePBX will auto detect and change this value if set wrong.'; 
    22212208  $set['type'] = CONF_TYPE_SELECT; 
    22222209  $freepbx_conf->define_conf_setting('ASTCONFAPP', $set); 

  • modules/branches/2.10/backup/page.backup.php

    r12969 r12988  
    6262    } 
    6363 
    64     ob_start($amp_conf['buffering_callback']); 
     64    ob_start(); 
    6565    header('Content-Type: text/event-stream'); 
    6666    header('Cache-Control: no-cache');