Changeset 5379
- Timestamp:
- 12/09/07 22:47:38 (1 year ago)
- Files:
-
- modules/branches/2.4/paging/functions.inc.php (modified) (8 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
modules/branches/2.4/paging/functions.inc.php
r5378 r5379 380 380 $results = null; 381 381 } 382 $sql = "SELECT * FROM admin WHERE variable='default_page_gr oup' AND value='$grp'";382 $sql = "SELECT * FROM admin WHERE variable='default_page_grp' AND value='$grp'"; 383 383 $default_group = $db->getRow($sql, DB_FETCHMODE_ASSOC); 384 384 if(DB::IsError($default_group)) { … … 422 422 die_freepbx("Error in paging_del(): "); 423 423 } 424 sql("DELETE FROM `admin` WHERE variable = 'default_page_gr oup' AND value = '$xtn'");424 sql("DELETE FROM `admin` WHERE variable = 'default_page_grp' AND value = '$xtn'"); 425 425 426 426 needreload(); … … 450 450 451 451 if ($default_group) { 452 sql("DELETE FROM `admin` WHERE variable = 'default_page_gr oup'");453 sql("INSERT INTO `admin` (variable, value) VALUES ('default_page_gr oup', '$xtn')");452 sql("DELETE FROM `admin` WHERE variable = 'default_page_grp'"); 453 sql("INSERT INTO `admin` (variable, value) VALUES ('default_page_grp', '$xtn')"); 454 454 } else { 455 sql("DELETE FROM `admin` WHERE variable = 'default_page_gr oup' AND value = '$xtn'");455 sql("DELETE FROM `admin` WHERE variable = 'default_page_grp' AND value = '$xtn'"); 456 456 } 457 457 … … 460 460 461 461 function paging_check_default($extension) { 462 $sql = "SELECT ext FROM paging_groups WHERE ext = '$extension' AND page_number = (SELECT value FROM admin WHERE variable = 'default_page_gr oup' limit 1)";462 $sql = "SELECT ext FROM paging_groups WHERE ext = '$extension' AND page_number = (SELECT value FROM admin WHERE variable = 'default_page_grp' limit 1)"; 463 463 $results = sql($sql,"getAll"); 464 464 return (count($results) ? 1 : 0); … … 466 466 467 467 function paging_set_default($extension, $value) { 468 $default_group = sql("SELECT value FROM `admin` WHERE variable = 'default_page_gr oup' limit 1", "getOne");468 $default_group = sql("SELECT value FROM `admin` WHERE variable = 'default_page_grp' limit 1", "getOne"); 469 469 if ($default_group == '') { 470 470 return false; … … 527 527 if ($action != 'del') { 528 528 529 $default_group = sql("SELECT value FROM `admin` WHERE variable = 'default_page_gr oup'", "getOne");529 $default_group = sql("SELECT value FROM `admin` WHERE variable = 'default_page_grp'", "getOne"); 530 530 $section = _("Default Group Inclusion"); 531 531 if ($default_group != "") { 532 $in_default_page_gr oup = paging_check_default($extdisplay);533 $currentcomponent->addguielem($section, new gui_selectbox('in_default_page_gr oup', $currentcomponent->getoptlist('page_group'), $in_default_page_group, _('Default Page Group'), _('You can include or exclude this extension/device from being part of the default page group when creating or editing.'), false));532 $in_default_page_grp = paging_check_default($extdisplay); 533 $currentcomponent->addguielem($section, new gui_selectbox('in_default_page_grp', $currentcomponent->getoptlist('page_group'), $in_default_page_grp, _('Default Page Group'), _('You can include or exclude this extension/device from being part of the default page group when creating or editing.'), false)); 534 534 } 535 535 } … … 544 544 $ext = isset($_REQUEST['extdisplay'])?$_REQUEST['extdisplay']:null; 545 545 $extn = isset($_REQUEST['extension'])?$_REQUEST['extension']:null; 546 $in_default_page_gr oup = isset($_REQUEST['in_default_page_group'])?$_REQUEST['in_default_page_group']:false;546 $in_default_page_grp = isset($_REQUEST['in_default_page_grp'])?$_REQUEST['in_default_page_grp']:false; 547 547 548 548 if (($_REQUEST['display'] == 'devices') && $action == 'add') { … … 554 554 if ($action == "add" || $action == "edit") { 555 555 if (!isset($GLOBALS['abort']) || $GLOBALS['abort'] !== true) { 556 if ($in_default_page_gr oup !== false) {557 paging_set_default($extdisplay, $in_default_page_gr oup);556 if ($in_default_page_grp !== false) { 557 paging_set_default($extdisplay, $in_default_page_grp); 558 558 } 559 559 }
