Fix some warnings more warnings.

This commit is contained in:
markjcrane 2016-05-11 13:23:53 -06:00
parent d25a904079
commit a4400b2497
3 changed files with 30 additions and 38 deletions

View File

@ -17,7 +17,7 @@
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>
Copyright (C) 2010 - 2014 Copyright (C) 2010 - 2016
All Rights Reserved. All Rights Reserved.
Contributor(s): Contributor(s):
@ -56,15 +56,13 @@ include "root.php";
$prep_statement = $db->prepare(check_sql($sql)); $prep_statement = $db->prepare(check_sql($sql));
$prep_statement->execute(); $prep_statement->execute();
$result = $prep_statement->fetchAll(PDO::FETCH_NAMED); $result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
if (count($result) > 0) { if (is_array($result)) foreach ($result as &$row) {
foreach ($result as &$row) { $this->extension = $row["extension"];
$this->extension = $row["extension"]; $this->number_alias = $row["number_alias"];
$this->number_alias = $row["number_alias"]; $this->accountcode = $row["accountcode"];
$this->accountcode = $row["accountcode"]; $this->toll_allow = $row["toll_allow"];
$this->toll_allow = $row["toll_allow"]; $this->outbound_caller_id_name = $row["outbound_caller_id_name"];
$this->outbound_caller_id_name = $row["outbound_caller_id_name"]; $this->outbound_caller_id_number = $row["outbound_caller_id_number"];
$this->outbound_caller_id_number = $row["outbound_caller_id_number"];
}
} }
unset ($prep_statement); unset ($prep_statement);

View File

@ -17,7 +17,7 @@
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>
Copyright (C) 2010 Copyright (C) 2010 - 2016
All Rights Reserved. All Rights Reserved.
Contributor(s): Contributor(s):
@ -77,18 +77,16 @@ include "root.php";
$prep_statement = $db->prepare(check_sql($sql)); $prep_statement = $db->prepare(check_sql($sql));
$prep_statement->execute(); $prep_statement->execute();
$result = $prep_statement->fetchAll(PDO::FETCH_NAMED); $result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
if (count($result) > 0) { if (is_array($result)) foreach ($result as &$row) {
foreach ($result as &$row) { if (strlen($this->extension_uuid) == 0) {
if (strlen($this->extension_uuid) == 0) { $this->extension_uuid = $row["extension_uuid"];
$this->extension_uuid = $row["extension_uuid"]; }
if (strlen($this->extension) == 0) {
if(strlen($row["number_alias"]) == 0) {
$this->extension = $row["extension"];
} }
if (strlen($this->extension) == 0) { else {
if(strlen($row["number_alias"]) == 0) { $this->extension = $row["number_alias"];
$this->extension = $row["extension"];
}
else {
$this->extension = $row["number_alias"];
}
} }
} }
} }

View File

@ -17,7 +17,7 @@
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>
Copyright (C) 2010 - 2014 Copyright (C) 2010 - 2016
All Rights Reserved. All Rights Reserved.
Contributor(s): Contributor(s):
@ -244,14 +244,12 @@ include "root.php";
$prep_statement = $db->prepare(check_sql($sql)); $prep_statement = $db->prepare(check_sql($sql));
$prep_statement->execute(); $prep_statement->execute();
$result = $prep_statement->fetchAll(PDO::FETCH_NAMED); $result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
if (count($result) > 0) { if (is_array($result)) foreach ($result as &$row) {
foreach ($result as &$row) { $this->extension = $row["extension"];
$this->extension = $row["extension"]; $this->accountcode = $row["accountcode"];
$this->accountcode = $row["accountcode"]; $this->toll_allow = $row["toll_allow"];
$this->toll_allow = $row["toll_allow"]; $this->outbound_caller_id_name = $row["outbound_caller_id_name"];
$this->outbound_caller_id_name = $row["outbound_caller_id_name"]; $this->outbound_caller_id_number = $row["outbound_caller_id_number"];
$this->outbound_caller_id_number = $row["outbound_caller_id_number"];
}
} }
//determine whether to update the dial string //determine whether to update the dial string
@ -261,12 +259,10 @@ include "root.php";
$prep_statement = $db->prepare(check_sql($sql)); $prep_statement = $db->prepare(check_sql($sql));
$prep_statement->execute(); $prep_statement->execute();
$result = $prep_statement->fetchAll(PDO::FETCH_NAMED); $result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
if (count($result) > 0) { if (is_array($result)) foreach ($result as &$row) {
foreach ($result as &$row) { $follow_me_uuid = $row["follow_me_uuid"];
$follow_me_uuid = $row["follow_me_uuid"]; $this->cid_name_prefix = $row["cid_name_prefix"];
$this->cid_name_prefix = $row["cid_name_prefix"]; $this->cid_number_prefix = $row["cid_number_prefix"];
$this->cid_number_prefix = $row["cid_number_prefix"];
}
} }
unset ($prep_statement); unset ($prep_statement);
@ -345,7 +341,7 @@ include "root.php";
$dial_string .= ",toll_allow='".$this->toll_allow."'"; $dial_string .= ",toll_allow='".$this->toll_allow."'";
$dial_string .= "}"; $dial_string .= "}";
$x = 0; $x = 0;
foreach ($result as &$row) { if (is_array($result)) foreach ($result as &$row) {
if ($x > 0) { if ($x > 0) {
$dial_string .= ","; $dial_string .= ",";
} }