Changeset 11373

Show
Ignore:
Timestamp:
02/14/11 00:15:28 (2 years ago)
Author:
p_lindheimer
Message:

Merged revisions 11372 via svnmerge from
http://www.freepbx.org/v2/svn/modules/branches/2.8

........

r11372 | p_lindheimer | 2011-02-13 21:12:31 -0800 (Sun, 13 Feb 2011) | 1 line


rename fatal to cb_fatal, should not be affected since it does not include framework version but just to be safe re #4787

........

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/branches/2.9

    • Property svnmerge-integrated changed from /modules/branches/2.8:1-11347 /modules/branches/bootstrap-2.9:1-10853 to /modules/branches/2.8:1-11347,11372 /modules/branches/bootstrap-2.9:1-10853

  • modules/branches/2.9/callback/bin/callback

    r10565 r11373  
    3434 
    3535if ($args != 8) { 
    36   fatal("Wrong number of arguments, should be:\n".$argv[0]." callback_number callback_destination delay_seconds AMPWEBROOT ASTETCDIR AMPMGRUSER AMPMGRPASS\n"); 
     36  cb_fatal("Wrong number of arguments, should be:\n".$argv[0]." callback_number callback_destination delay_seconds AMPWEBROOT ASTETCDIR AMPMGRUSER AMPMGRPASS\n"); 
    3737} 
    3838echo "args: $argc\n"; 
    …… 
    7676  $astman->Originate($channel, $exten, $context, $priority, $timeout, $callerid, $variable, $account, $application, $data); 
    7777} else { 
    78   fatal("Cannot connect to Asterisk Manager with ".$amp_conf["AMPMGRUSER"]."/".$amp_conf["AMPMGRPASS"]); 
     78  cb_fatal("Cannot connect to Asterisk Manager with ".$amp_conf["AMPMGRUSER"]."/".$amp_conf["AMPMGRPASS"]); 
    7979} 
    8080$astman->disconnect(); 
    8181 
    82 function fatal($text) { 
     82function cb_fatal($text) { 
    8383  echo "[FATAL] ".$text."\n"; 
    8484  exit(1);