Changeset 8843

Show
Ignore:
Timestamp:
02/17/10 11:17:43 (2 years ago)
Author:
p_lindheimer
Message:

change mohmp3 to moh, put moh as default in template, use mohmp3 as fallback default when not specified for compatibility re #4051

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • freepbx/branches/2.7/amp_conf/htdocs/admin/functions.inc.php

    r8648 r8843  
    726726  'AMPWEBROOT'     => array('dir' , '/var/www/html'), 
    727727  'FOPWEBROOT'     => array('dir' , '/var/www/html/panel'), 
     728  'MOHDIR'         => array('dir' , '/mohmp3'), 
    728729 
    729730  'USECATEGORIES'  => array('bool' , true), 

  • freepbx/branches/2.7/amportal.conf

    r8751 r8843  
    270270# http://code.google.com/speed/public-dns/faq.html#privacy 
    271271 
     272# MOHDIR=subdirectory_name 
     273# This is the subdirectory for the MoH files/directories which is located in ASTVARLIBDIR 
     274# if not specified it will default to mohmp3 for backward compatibility. 
     275MOHDIR=moh 

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

    r7598 r8843  
    222222  global $make_links; 
    223223 
     224  $moh_subdir = isset($amp_conf['MOHDIR']) ? trim(trim($amp_conf['MOHDIR']),'/') : 'mohmp3'; 
     225 
    224226  // total # files, # actually copied 
    225227  $num_files = $num_copied = 0; 
    …… 
    240242      $destination =  $dirdest.$dirsource."/".$file; 
    241243       
    242       if ($dirsource == "" && $file == "mohmp3" && !$install_moh) { 
     244      if ($dirsource == "" && $file == "moh" && !$install_moh) { 
    243245        // skip to the next dir 
    244246        continue; 
    …… 
    259261      // the following are configurable in asterisk.conf 
    260262      $destination=str_replace("/astetc",trim($asterisk_conf["astetcdir"]),$destination); 
    261       $destination=str_replace("/mohmp3",trim($asterisk_conf["astvarlibdir"])."/mohmp3",$destination); 
     263      $destination=str_replace("/moh",trim($asterisk_conf["astvarlibdir"])."/$moh_subdir",$destination); 
    262264      $destination=str_replace("/astvarlib",trim($asterisk_conf["astvarlibdir"]),$destination); 
    263265      if(strpos($dirsource, 'modules') === false) $destination=str_replace("/agi-bin",trim($asterisk_conf["astagidir"]),$destination);