Changeset 10967

Show
Ignore:
Timestamp:
01/15/11 23:36:37 (2 years ago)
Author:
p_lindheimer
Message:

removing php_error_settings, it's a bit inconvenient as you would have to know the error levels as integers when putting in the gui

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • freepbx/trunk/amp_conf/htdocs/admin/bootstrap.php

    r10953 r10967  
    6868$bootstrap_settings['amportal_conf_initialized'] = true; 
    6969 
    70 //set error reporting level if set 
    71 if (isset($amp_conf['php_error_reporting'])) { 
    72   error_reporting($amp_conf['php_error_reporting']); 
    73 } 
    74  
    7570if (!$bootstrap_settings['skip_astman']) { 
    7671  require_once(dirname(__FILE__) . '/libraries/php-asmanager.php'); 
    7772  $astman = new AGI_AsteriskManager($bootstrap_settings['astman_config'], $bootstrap_settings['astman_options']); 
    7873  // attempt to connect to asterisk manager proxy 
    79   if (!isset($amp_conf["ASTMANAGERPROXYPORT"]) || !$res = $astman->connect($amp_conf["ASTMANAGERHOST"] . ":" . $amp_conf["ASTMANAGERPROXYPORT"], $amp_conf["AMPMGRUSER"] , $amp_conf["AMPMGRPASS"], $bootstrap_settings['astman_events'])) { 
     74  if (!$amp_conf["ASTMANAGERPROXYPORT"] || !$res = $astman->connect($amp_conf["ASTMANAGERHOST"] . ":" . $amp_conf["ASTMANAGERPROXYPORT"], $amp_conf["AMPMGRUSER"] , $amp_conf["AMPMGRPASS"], $bootstrap_settings['astman_events'])) { 
    8075    // attempt to connect directly to asterisk, if no proxy or if proxy failed 
    8176    if (!$res = $astman->connect($amp_conf["ASTMANAGERHOST"] . ":" . $amp_conf["ASTMANAGERPORT"], $amp_conf["AMPMGRUSER"] , $amp_conf["AMPMGRPASS"], $bootstrap_settings['astman_events'])) {