Changeset 8109

Show
Ignore:
Timestamp:
08/23/09 20:13:27 (2 years ago)
Author:
p_lindheimer
Message:

fixes #3642 hardcoded paths

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • freepbx/branches/2.6/amp_conf/htdocs/admin/common/php-asmanager.php

    r5912 r8109  
    2727* 
    2828*/ 
    29   define('AST_CONFIG_DIR', '/etc/asterisk/'); 
    30   define('AST_SPOOL_DIR', '/var/spool/asterisk/'); 
     29  if(!defined("AMP_CONF")) { define("AMP_CONF", "/etc/amportal.conf"); } 
     30  if(!isset($amp_conf)) 
     31    $amp_conf = parse_amportal_conf(AMP_CONF); 
     32  if(!isset($asterisk_conf)) 
     33    $asterisk_conf = parse_asterisk_conf($amp_conf['ASTETCDIR']); 
     34 
     35  define('AST_CONFIG_DIR', $amp_conf['ASTETCDIR']); 
     36  define('AST_SPOOL_DIR', $asterisk_conf['astspooldir']); 
    3137  define('AST_TMP_DIR', AST_SPOOL_DIR . '/tmp/'); 
    3238  define('DEFAULT_PHPAGI_CONFIG', AST_CONFIG_DIR . '/phpagi.conf'); 
    33  
    34   if(!defined("AMP_CONF")) { define("AMP_CONF", "/etc/amportal.conf"); } 
    3539 
    3640  define('AST_DIGIT_ANY', '0123456789#*');