dbxe
/
fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update pdo.php 

Prevent php warnings.
This commit is contained in:
FusionPBX 2017-01-04 20:40:36 -07:00 committed by GitHub
parent a01218c749
commit 5744d4b673
1 changed files with 32 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
resources/pdo.php
View File

@ -17,15 +17,17 @@
The Initial Developer of the Original Code is The Initial Developer of the Original Code is
Mark J Crane <markjcrane@fusionpbx.com> Mark J Crane <markjcrane@fusionpbx.com>
Portions created by the Initial Developer are Copyright (C) 2008-2015 Portions created by the Initial Developer are Copyright (C) 2008-2016
the Initial Developer. All Rights Reserved. the Initial Developer. All Rights Reserved.
Contributor(s): Contributor(s):
Mark J Crane <markjcrane@fusionpbx.com> Mark J Crane <markjcrane@fusionpbx.com>
Raymond Chandler <intralanman@gmail.com> Raymond Chandler <intralanman@gmail.com>
*/ */
include "root.php";
require_once "resources/functions.php"; //includes
include "root.php";
require_once "resources/functions.php";
//set defaults //set defaults
if (isset($dbtype)) { if (isset($dbtype)) {
@ -267,8 +269,12 @@ if ($db_type == "pgsql") {
unset($prep_statement); unset($prep_statement);
//put the domains in natural order //put the domains in natural order
if (is_array($domain_names)) {
natsort($domain_names); natsort($domain_names);
}
//build the domains array in the correct order //build the domains array in the correct order
if (is_array($domain_names)) {
foreach ($domain_names as $dn) { foreach ($domain_names as $dn) {
foreach ($result as $row) { foreach ($result as $row) {
if ($row['domain_name'] == $dn) { if ($row['domain_name'] == $dn) {
@ -277,7 +283,9 @@ if ($db_type == "pgsql") {
} }
} }
unset($result); unset($result);
}
if (is_array($domains)) {
foreach($domains as $row) { foreach($domains as $row) {
if (count($domains) == 1) { if (count($domains) == 1) {
$_SESSION["domain_uuid"] = $row["domain_uuid"]; $_SESSION["domain_uuid"] = $row["domain_uuid"];
@ -293,6 +301,7 @@ if ($db_type == "pgsql") {
} }
unset($domains, $prep_statement); unset($domains, $prep_statement);
} }
}
//get the software name //get the software name
if (!isset($_SESSION["software_name"])) { if (!isset($_SESSION["software_name"])) {