Changeset 8840 for modules/branches/2.7/ringgroups
- Timestamp:
- 02/17/10 00:46:46 (3 years ago)
- Files:
-
- modules/branches/2.7/ringgroups/functions.inc.php (modified) (6 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
modules/branches/2.7/ringgroups/functions.inc.php
r8839 r8840 245 245 function ringgroups_add($grpnum,$strategy,$grptime,$grplist,$postdest,$desc,$grppre='',$annmsg_id='',$alertinfo,$needsconf,$remotealert_id,$toolate_id,$ringing,$cwignore,$cfignore,$changecid='default',$fixedcid='') { 246 246 global $db; 247 global $astman; 247 248 248 249 $extens = ringgroups_list(); … … 267 268 $astman->database_put("RINGGROUP",$grpnum."/fixedcid",$fixedcid); 268 269 } 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"]); 270 271 } 271 272 return true; … … 274 275 function ringgroups_del($grpnum) { 275 276 global $db; 277 global $astman; 276 278 277 279 $results = sql("DELETE FROM ringgroups WHERE grpnum = '".$db->escapeSimple($grpnum)."'","query"); … … 279 281 $astman->database_deltree("RINGGROUP/".$grpnum); 280 282 } 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"]); 282 284 } 283 285 } … … 351 353 function ringgroups_get($grpnum) { 352 354 global $db; 355 global $astman; 353 356 354 357 $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); … … 369 372 $results['fixedcid'] = preg_replace("/[^0-9\+]/" ,"", trim($fixedcid)); 370 373 } 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"]); 372 375 } 373 376 return $results;
