Ticket #1868: moh_wav.patch

File moh_wav.patch, 2.8 kB (added by pbrufal, 3 years ago)

patch for version 1.5 of MOH module

  • page.music.php

    old new  
    162162       } 
    163163} 
    164164 
    165 function process_mohfile($mohfile) 
     165function process_mohfile($mohfile,$onlywav) 
    166166{ 
    167167       global $path_to_dir; 
    168168       $output = 0; 
    169169       $returncode = 0; 
     170       if($onlywav!="") $onlywav=TRUE; 
    170171       $origmohfile=$path_to_dir."/orig_".$mohfile; 
    171172       $newname = strtr($mohfile,"&", "_"); 
    172        $newmohfile=$path_to_dir."/". ((strpos($newname,'.mp3') === false) ? $newname.".mp3" : $newname); 
    173        $lamecmd="lame --cbr -m m -t -F \"".$origmohfile."\" \"".$newmohfile."\" 2>&1 "; 
    174        if (strpos($newmohfile,'.mp3') !== false)  
    175                exec($lamecmd, $output, $returncode); 
     173       if(strstr($newname,".mp3")) $onlywav = FALSE; 
     174       if($onlywav==FALSE) { 
     175               $newmohfile=$path_to_dir."/". ((strpos($newname,'.mp3') === false) ? $newname.".mp3" : $newname); 
     176               $lamecmd="lame --cbr -m m -t -F \"".$origmohfile."\" \"".$newmohfile."\" 2>&1 "; 
     177               if (strpos($newmohfile,'.mp3') !== false)  
     178                       exec($lamecmd, $output, $returncode); 
     179       } else { 
     180               $newmohfile = $path_to_dir."/wav_".$newname; 
     181               $soxcmd = "sox \"".$origmohfile."\" -r 8000 -c 1 \"".$newmohfile."\" resample -ql 2>&1 "; 
     182               exec($soxcmd, $output, $returncode); 
     183       } 
    176184       if ($returncode != 0) { 
    177185               return join("<br>\n", $output); 
    178186       } 
    …… 
    247255               <input type="hidden" name="action" value="addedfile"> 
    248256               <input type="file" name="mohfile"/> 
    249257               <input type="button" value="<?php echo _("Upload")?>" onclick="document.upload.submit(upload);alert('<?php echo addslashes(_("Please wait until the page loads. Your file is being processed."))?>');"/> 
     258               <br /><br /> 
     259               <input type="checkbox" name="onlywav" checked="checked"> Do not encode to MP3 
    250260       </form> 
    251261       <br /> 
    252262       <form name="randomon" action="<?php $_SERVER['PHP_SELF'] ?>" method="post"> 
    …… 
    272282       if (isset($_FILES['mohfile']['tmp_name']) && is_uploaded_file($_FILES['mohfile']['tmp_name'])) { 
    273283               //echo $_FILES['mohfile']['name']." uploaded OK"; 
    274284               move_uploaded_file($_FILES['mohfile']['tmp_name'], $path_to_dir."/orig_".$_FILES['mohfile']['name']); 
    275                $process_err = process_mohfile($_FILES['mohfile']['name']); 
     285               $process_err = process_mohfile($_FILES['mohfile']['name'],$_REQUEST['onlywav']); 
    276286               if (isset($process_err)) { 
    277287                       echo "<h5>"._("Error Processing").": \"$process_err\" for ".$_FILES['mohfile']['name']."!</h5>\n"; 
    278288                       echo "<h5>"._("This is not a fatal error, your Music on Hold may still work.")."</h5>\n";