Show
Ignore:
Timestamp:
08/24/10 18:08:16 (1 year ago)
Author:
p_lindheimer
Message:

fixes #4509 and re #4134 use proper path for call monitor

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • freepbx/branches/2.8/amp_conf/htdocs/recordings/includes/common.php

    r9663 r10226  
    110110  global $ASTERISKCDR_DBNAME; 
    111111 
    112   global $ASTERISK_CALLMONITOR_PATH; 
    113   global $ast_spool_dir; 
    114  
    115112  global $ARI_DISABLED_MODULES; 
    116113   
    …… 
    168165      $amp_dbhost = isset($amp_conf["AMPDBHOST"]) ? $amp_conf["AMPDBHOST"] : $LEGACY_AMP_DBHOST; 
    169166      $amp_dbname = isset($amp_conf["AMPDBNAME"]) ? $amp_conf["AMPDBNAME"] : $LEGACY_AMP_DBNAME; 
    170  
    171       $ast_spool_dir = isset($amp_conf["ASTSPOOLDIR"]) ? $amp_conf["ASTSPOOLDIR"] : $ASTERISK_CALLMONITOR_PATH; 
    172167 
    173168      $asteriskcdr_dbengine = $ASTERISKCDR_DBENGINE; 

  • freepbx/branches/2.8/amp_conf/htdocs/recordings/modules/callmonitor.module

    r10037 r10226  
    103103  function display($args) { 
    104104 
    105     global $ast_spool_dir; 
     105    global $ASTERISK_CALLMONITOR_PATH; 
    106106    global $CALLMONITOR_ALLOW_DELETE; 
    107107    global $AJAX_PAGE_REFRESH_ENABLE; 
    108108 
    109109    $display = new DisplaySearch(); 
     110 
    110111    // get the search string 
    111112    $m = getArgument($args,'m'); 
    …… 
    131132 
    132133    // get the call monitor recording files 
    133     $paths = explode(';',$ast_spool_dir); 
     134    $paths = split(';',$ASTERISK_CALLMONITOR_PATH); 
    134135    foreach($paths as $key => $path) { 
    135136      if (!is_dir($path)) { 
    …… 
    137138      } 
    138139    } 
    139     $recordings = $this->getRecordings($ast_spool_dir,$data); 
     140    $recordings = $this->getRecordings($ASTERISK_CALLMONITOR_PATH,$data); 
    140141 
    141142    // build controls