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

change strlen($key) to isset($_REQUEST["key"] to fix login problem affecting one system

Browse Source
This commit is contained in:
Mark Crane
2014-04-18 01:22:37 +00:00
parent fba528e39a
commit 4db614ee8c
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/call_block/app_config.php
+1
View File
@@ -71,6 +71,7 @@
$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = "foreign"; $apps[$x]['db'][$y]['fields'][$z]['key']['type'] = "foreign";
$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['table'] = "v_domains"; $apps[$x]['db'][$y]['fields'][$z]['key']['reference']['table'] = "v_domains";
$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = "domain_uuid"; $apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = "domain_uuid";
$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
$z++; $z++;
$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "call_block_uuid"; $apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "call_block_uuid";
$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "blocked_caller_uuid"; $apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "blocked_caller_uuid";
resources/check_auth.php
+4 -4
View File
@@ -187,7 +187,7 @@ require_once "resources/require.php";
if ($_SESSION["user"]["unique"]["text"] == "global") { if ($_SESSION["user"]["unique"]["text"] == "global") {
//globally unique users //globally unique users
$sql = "select * from v_users "; $sql = "select * from v_users ";
if (strlen($key) > 0) { if (isset($_REQUEST["key"])) {
$sql .= "where api_key=:key "; $sql .= "where api_key=:key ";
//$sql .= "where api_key='".$key."' "; //$sql .= "where api_key='".$key."' ";
} }
@@ -201,7 +201,7 @@ require_once "resources/require.php";
else { else {
//unique per domain //unique per domain
$sql = "select * from v_users "; $sql = "select * from v_users ";
if (strlen($key) > 0) { if (isset($_REQUEST["key"])) {
$sql .= "where api_key=:key "; $sql .= "where api_key=:key ";
//$sql .= "and api_key='".$key."' "; //$sql .= "and api_key='".$key."' ";
} }
@@ -215,7 +215,7 @@ require_once "resources/require.php";
$prep_statement = $db->prepare(check_sql($sql)); $prep_statement = $db->prepare(check_sql($sql));
$prep_statement->bindParam(':domain_uuid', $domain_uuid); $prep_statement->bindParam(':domain_uuid', $domain_uuid);
} }
if (strlen($key) > 0) { if (isset($_REQUEST["key"])) {
$prep_statement->bindParam(':key', $key); $prep_statement->bindParam(':key', $key);
} }
else { else {
@@ -227,7 +227,7 @@ require_once "resources/require.php";
$auth_failed = true; $auth_failed = true;
} }
else { else {
if (strlen($key) > 0) { if (isset($_REQUEST["key"])) {
$auth_failed = false; $auth_failed = false;
} }
else { else {