Skip to content

1030 - Changes done for fixing page issue #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Sangoma-Heera wants to merge 1 commit into
base: release/17.0
Choose a base branch
from
Open

1030 - Changes done for fixing page issue #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Paging.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,6 +498,9 @@ public function getPageGroupById($group){
$stmt = $this->Database->prepare($sql);
$stmt->execute([':group' => $group]);
$results = $stmt->fetch(PDO::FETCH_ASSOC);
if (!$results) {
return false;
}
$results['default_group'] = $this->getDefaultGroup();
return $results;
}
Expand Down
1 change: 1 addition & 0 deletions functions.inc.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -927,6 +927,7 @@ function paging_check_extensions($exten=true) {
function paging_get_devs($grp) {
global $db;

$tmparray = [];
$grp = $db->escapeSimple($grp);

$sql = "SELECT ext FROM paging_groups where page_number='$grp'";
Expand Down
16 changes: 15 additions & 1 deletion views/form.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,21 @@
$thisGRP = paging_get_pagingconfig($extdisplay);
$devices = paging_get_devs($extdisplay);
$devices = is_array($devices)?$devices:array();
extract($thisGRP);
if(is_array($thisGRP)){
extract($thisGRP);
} else {
$thisGRP = [];
$description = '';
$volume = '0';
$force_page = "0";
$devices = array();
$ext = '';
$pagenbr = '';
$pagegrp = '';
$delURL = '';
$duplex = '0';
}

$pagenbr = $extdisplay;
$pagegrp = $extdisplay;
$delURL = '?display=paging&action=delete&extdisplay='.urlencode($extdisplay);
Expand Down