Show
Ignore:
Timestamp:
02/17/10 00:46:46 (3 years ago)
Author:
p_lindheimer
Message:

declare astman global re #4050

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • modules/branches/2.7/ringgroups/functions.inc.php

    r8839 r8840  
    245245function ringgroups_add($grpnum,$strategy,$grptime,$grplist,$postdest,$desc,$grppre='',$annmsg_id='',$alertinfo,$needsconf,$remotealert_id,$toolate_id,$ringing,$cwignore,$cfignore,$changecid='default',$fixedcid='') { 
    246246  global $db; 
     247  global $astman; 
    247248 
    248249  $extens = ringgroups_list(); 
     
    267268    $astman->database_put("RINGGROUP",$grpnum."/fixedcid",$fixedcid); 
    268269  } else { 
    269     fatal("Cannot connect to Asterisk Manager with ".$amp_conf["AMPMGRUSER"]."/".$amp_conf["AMPMGRPASS"]); 
     270    die_freepbx("Cannot connect to Asterisk Manager with ".$amp_conf["AMPMGRUSER"]."/".$amp_conf["AMPMGRPASS"]); 
    270271  } 
    271272  return true; 
     
    274275function ringgroups_del($grpnum) { 
    275276  global $db; 
     277  global $astman; 
    276278 
    277279  $results = sql("DELETE FROM ringgroups WHERE grpnum = '".$db->escapeSimple($grpnum)."'","query"); 
     
    279281    $astman->database_deltree("RINGGROUP/".$grpnum); 
    280282  } else { 
    281     fatal("Cannot connect to Asterisk Manager with ".$amp_conf["AMPMGRUSER"]."/".$amp_conf["AMPMGRPASS"]); 
     283    die_freepbx("Cannot connect to Asterisk Manager with ".$amp_conf["AMPMGRUSER"]."/".$amp_conf["AMPMGRPASS"]); 
    282284  } 
    283285} 
     
    351353function ringgroups_get($grpnum) { 
    352354  global $db; 
     355  global $astman; 
    353356 
    354357  $results = sql("SELECT grpnum, strategy, grptime, grppre, grplist, annmsg_id, postdest, description, alertinfo, needsconf, remotealert_id, toolate_id, ringing, cwignore, cfignore FROM ringgroups WHERE grpnum = '".$db->escapeSimple($grpnum)."'","getRow",DB_FETCHMODE_ASSOC); 
     
    369372    $results['fixedcid'] = preg_replace("/[^0-9\+]/" ,"", trim($fixedcid)); 
    370373  } else { 
    371     fatal("Cannot connect to Asterisk Manager with ".$amp_conf["AMPMGRUSER"]."/".$amp_conf["AMPMGRPASS"]); 
     374    die_freepbx("Cannot connect to Asterisk Manager with ".$amp_conf["AMPMGRUSER"]."/".$amp_conf["AMPMGRPASS"]); 
    372375  } 
    373376  return $results;