Changeset 5742

Show
Ignore:
Timestamp:
04/20/08 12:10:03 (4 years ago)
Author:
p_lindheimer
Message:

Merged revisions 5545,5548-5549,5555,5564,5570,5573-5574,5576-5578,5596,5609-5610,5612,5616-5618,5623-5624,5628,5630-5642,5645-5646,5648-5650,5653-5654,5656-5657,5660,5687-5699,5701-5702,5704-5711,5714-5715,5723-5726,5729-5730,5733-5741 via svnmerge from
http://svn.freepbx.org/modules/branches/2.4

........

r5741 | p_lindheimer | 2008-04-20 09:55:24 -0700 (Sun, 20 Apr 2008) | 1 line


#2759 bypass VmX when temporary greeting is recorded so it acts as std voicemail

........

Applied r5544 to move helper functions to top of script also

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/branches/2.3

    • Property svnmerge-integrated changed from /modules/branches/2.2:1-3588,3615-3635,3637-3638,3640,3674,3680,3686,3692,3702,3706,3710,3716,3758,3760,3762-3765,3767-3785,3787-3789,3801,3810,3828,3831,3839,3860,3866,3875,3877,3887,3899,3911,3913,3943,3982-3983,3990,3998,4007,4022-4023,4089,4092,4098,4265,4285 /modules/branches/2.4:1-5079,5090,5093,5097-5118,5120-5170,5172,5174,5176-5182,5184-5199,5202-5203,5205-5211,5239,5271-5272,5312,5383,5516,5544,5572,5606-5608,5615,5644,5651,5712-5713,5727 to /modules/branches/2.2:1-3588,3615-3635,3637-3638,3640,3674,3680,3686,3692,3702,3706,3710,3716,3758,3760,3762-3765,3767-3785,3787-3789,3801,3810,3828,3831,3839,3860,3866,3875,3877,3887,3899,3911,3913,3943,3982-3983,3990,3998,4007,4022-4023,4089,4092,4098,4265,4285 /modules/branches/2.4:1-5079,5090,5093,5097-5118,5120-5170,5172,5174,5176-5182,5184-5199,5202-5203,5205-5211,5239,5271-5272,5312,5383,5516,5544-5545,5548-5549,5555,5564,5570,5572-5574,5576-5578,5596,5606-5610,5612,5615-5618,5623-5624,5628,5630-5642,5644-5646,5648-5651,5653-5654,5656-5657,5660,5687-5699,5701-5702,5704-5715,5723-5727,5729-5730,5733-5741

  • modules/branches/2.3/core/etc/extensions.conf

    r5336 r5742  
    299299exten => vmx,n,Macro(get-vmcontext,${ARG1}) 
    300300;exten => vmx,n,TrySystem(/bin/ls ${ASTSPOOLDIR}/voicemail/${VMCONTEXT}/${ARG1}/${MODE}.[wW][aA][vV]) 
     301exten => vmx,n,AGI(checksound.agi,${ASTSPOOLDIR}/voicemail/${VMCONTEXT}/${ARG1}/temp) 
     302exten => vmx,n,GotoIf($["${SYSTEMSTATUS}" = "SUCCESS"]?tmpgreet) 
    301303exten => vmx,n,AGI(checksound.agi,${ASTSPOOLDIR}/voicemail/${VMCONTEXT}/${ARG1}/${MODE}) 
    302304exten => vmx,n,GotoIf($["${SYSTEMSTATUS}" != "SUCCESS"]?nofile) 
    …… 
    386388; 
    387389exten => vmx,n(nofile),Noop(File for mode: ${MODE} does not exist, SYSTEMSTATUS: ${SYSTEMSTATUS}, going to normal voicemail) 
     390exten => vmx,n,Goto(s-${ARG2},1) 
     391exten => vmx,n(tmpgreet),Noop(Temporary Greeting Detected, going to normal voicemail) 
    388392exten => vmx,n,Goto(s-${ARG2},1) 
    389393 

  • modules/branches/2.3/framework/install.php

    r5545 r5742  
    11<?php 
     2 
     3// HELPER FUNCTIONS: 
     4 
     5function framework_print_errors($src, $dst, $errors) { 
     6  echo "error copying framework files:<br />'cp -rf' from src: '$src' to dst: '$dst'...details follow<br />"; 
     7  foreach ($errors as $error) { 
     8    echo "$error<br />"; 
     9  } 
     10} 
     11 
     12if (! function_exists('out')) { 
     13  function out($text) { 
     14    echo $text."<br>"; 
     15  } 
     16} 
     17 
     18if (! function_exists('outn')) { 
     19  function outn($text) { 
     20    echo $text; 
     21  } 
     22} 
     23 
     24if (! function_exists('error')) { 
     25  function error($text) { 
     26    echo "[ERROR] ".$text."<br>"; 
     27  } 
     28} 
     29 
     30if (! function_exists('fatal')) { 
     31  function fatal($text) { 
     32    echo "[FATAL] ".$text."<br>"; 
     33    exit(1); 
     34  } 
     35} 
     36 
     37if (! function_exists('debug')) { 
     38  function debug($text) { 
     39    global $debug; 
     40     
     41    if ($debug) echo "[DEBUG-preDB] ".$text."<br>"; 
     42  } 
     43} 
    244 
    345include dirname(__FILE__)."/libfreepbx.install.php"; 
    …… 
    77119  } 
    78120 
    79  
    80 // HELPER FUNCTIONS: 
    81  
    82 function framework_print_errors($src, $dst, $errors) { 
    83   echo "error copying framework files:<br />'cp -rf' from src: '$src' to dst: '$dst'...details follow<br />"; 
    84   foreach ($errors as $error) { 
    85     echo "$error<br />"; 
    86   } 
    87 } 
    88  
    89 if (! function_exists("out")) { 
    90   function out($text) { 
    91     echo $text."<br>"; 
    92   } 
    93 } 
    94  
    95 if (! function_exists("outn")) { 
    96   function outn($text) { 
    97     echo $text; 
    98   } 
    99 } 
    100  
    101 if (! function_exists("error")) { 
    102   function error($text) { 
    103     echo "[ERROR] ".$text."<br>"; 
    104   } 
    105 } 
    106  
    107 if (! function_exists("fatal")) { 
    108   function fatal($text) { 
    109     echo "[FATAL] ".$text."<br>"; 
    110     exit(1); 
    111   } 
    112 } 
    113  
    114 if (! function_exists("debug")) { 
    115   function debug($text) { 
    116     global $debug; 
    117      
    118     if ($debug) echo "[DEBUG-preDB] ".$text."<br>"; 
    119   } 
    120 } 
    121121?>