nsinnovations/fusionpbx
2
0
Fork 0
mirror of https://github.com/fusionpbx/fusionpbx.git synced 2025-12-30 00:53:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Little more cleanup on conference center after removing v_meeting_pins.

Browse Source
This commit is contained in:
Mark Crane
2013-04-22 23:05:08 +00:00
parent 4c98adca36
commit 7320be9462
2 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/conference_centers/conference_rooms.php
View File

@@ -173,22 +173,19 @@ else {
$conference_center = new conference_center;
$conference_center->db = $db;
$conference_center->domain_uuid = $_SESSION['domain_uuid'];
$conference_center->voicemail_uuid = $voicemail_uuid;
$conference_center->voicemail_id = $voicemail_id;
if (strlen($meeting_uuid) > 0) {
$conference_center->meeting_uuid = $meeting_uuid;
}
if (strlen($search) > 0) {
$conference_center->search = $search;
}
$row_count = $conference_center->room_count() * 2;
$row_count = $conference_center->room_count();
//prepare to page the results
$rows_per_page = 150;
$param = "";
$page = check_str($_GET['page']);
if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; }
$rows_per_page = $rows_per_page * 2;
list($paging_controls, $rows_per_page, $var3) = paging($row_count, $param, $rows_per_page);
$offset = $rows_per_page * $page;

10
app/conference_centers/resources/classes/conference_center.php
View File

@@ -24,7 +24,7 @@
Mark J Crane <markjcrane@fusionpbx.com>
*/
//define the voicemail class
//define the conference center class
class conference_center {
public $db;
public $domain_uuid;
@@ -39,17 +39,13 @@
public function room_count() {
//get the room count
$sql = "select count(*) as num_rows from v_conference_rooms as r, v_meeting_users as u, v_meeting_pins as p ";
$sql = "select count(*) as num_rows from v_conference_rooms as r, v_meeting_users as u, v_meetings as p ";
$sql .= "where r.domain_uuid = '".$this->domain_uuid."' ";
$sql .= "and r.meeting_uuid = u.meeting_uuid ";
$sql .= "and r.meeting_uuid = p.meeting_uuid ";
$sql .= "and p.member_type = 'moderator' ";
if (!if_group("admin") && !if_group("superadmin")) {
$sql .= "and u.user_uuid = '".$_SESSION["user_uuid"]."' ";
}
//if (is_numeric($this->search)) {
// $sql .= "and p.member_pin = '".$this->search."' ";
//}
if (isset($this->search)) {
$sql .= "and r.meeting_uuid = '".$this->meeting_uuid."' ";
}
@@ -137,8 +133,6 @@
$conference_center = new conference_center;
$conference_center->db = $db;
$conference_center->domain_uuid = $_SESSION['domain_uuid'];
$conference_center->voicemail_uuid = $voicemail_uuid;
$conference_center->voicemail_id = $voicemail_id;
$conference_center->rows_per_page = 150;
$conference_center->offset = 0;
$conference_center->order_by = $order_by;