From 5e0d82c06ddf7aa9eaa6bac71f758084c4a1836a Mon Sep 17 00:00:00 2001 From: Mark Crane Date: Wed, 23 Jul 2014 22:00:03 +0000 Subject: [PATCH] Unset the prepared statements used in the app_defaults.php files. --- app/dialplan/app_defaults.php | 2 + app/provision/app_defaults.php | 3 +- app/settings/app_defaults.php | 1 + app/sip_profiles/app_defaults.php | 1 + app/vars/app_defaults.php | 5 +- app/xml_cdr/app_defaults.php | 1 + core/databases/app_defaults.php | 3 ++ core/default_settings/app_defaults.php | 2 + core/menu/app_defaults.php | 1 + core/notifications/app_defaults.php | 1 + core/upgrade/app_defaults.php | 4 +- core/users/app_defaults.php | 65 +++++++++++++------------- 12 files changed, 54 insertions(+), 35 deletions(-) diff --git a/app/dialplan/app_defaults.php b/app/dialplan/app_defaults.php index 311cec1373..64e3370434 100644 --- a/app/dialplan/app_defaults.php +++ b/app/dialplan/app_defaults.php @@ -125,6 +125,7 @@ $db->query($sql); unset($sql); } + unset($prep_statement); } } @@ -153,6 +154,7 @@ $db->query($sql); unset($sql); } + unset($prep_statement); } } diff --git a/app/provision/app_defaults.php b/app/provision/app_defaults.php index 18ba7e53c6..d1dc749a2f 100644 --- a/app/provision/app_defaults.php +++ b/app/provision/app_defaults.php @@ -45,8 +45,8 @@ $db->exec(check_sql($sql)); unset($sql); } + unset($prep_statement, $result); } - unset($prep_statement, $result); //move the dynamic provision variables that from v_vars table to v_default_settings if (count($_SESSION['provision']) == 0 && $domains_processed == 1) { @@ -86,6 +86,7 @@ $db->exec(check_sql($sql)); unset($sql); } + unset($prep_statement); //delete the provision variables from system -> variables //$sql = "delete from v_vars "; //$sql .= "where var_cat = 'Provision' "; diff --git a/app/settings/app_defaults.php b/app/settings/app_defaults.php index e730e22469..112f45e699 100644 --- a/app/settings/app_defaults.php +++ b/app/settings/app_defaults.php @@ -31,6 +31,7 @@ if (count($_SESSION['email']) == 0 && $domains_processed == 1) { $prep_statement = $db->prepare(check_sql($sql)); $prep_statement->execute(); $row = $prep_statement->fetch(PDO::FETCH_NAMED); + unset($prep_statement); //set the variable $smtp[]['smtp_host'] = check_str($row['smtp_host']); $smtp[]['smtp_secure'] = check_str($row['smtp_secure']); diff --git a/app/sip_profiles/app_defaults.php b/app/sip_profiles/app_defaults.php index 63c5885f4c..e0f1237f4f 100644 --- a/app/sip_profiles/app_defaults.php +++ b/app/sip_profiles/app_defaults.php @@ -112,6 +112,7 @@ } } } + unset($prep_statement); } } diff --git a/app/vars/app_defaults.php b/app/vars/app_defaults.php index 7d3c4be9a6..675d317cee 100644 --- a/app/vars/app_defaults.php +++ b/app/vars/app_defaults.php @@ -108,8 +108,8 @@ EOD; $x++; } } + unset($prep_statement, $result); } - unset($prep_statement, $result); } //adjust the variables required variables @@ -145,6 +145,7 @@ EOD; $db->exec(check_sql($sql)); unset($sql); } + unset($prep_statement, $row); } //set the transfer_ringback @@ -178,6 +179,7 @@ EOD; $db->exec(check_sql($sql)); unset($sql); } + unset($prep_statement, $row); } //set variables that depend on the number of domains @@ -221,6 +223,7 @@ EOD; $db->exec(check_sql($sql)); unset($sql); } + unset($prep_statement, $row); } } diff --git a/app/xml_cdr/app_defaults.php b/app/xml_cdr/app_defaults.php index 39fd52da21..4959a04115 100644 --- a/app/xml_cdr/app_defaults.php +++ b/app/xml_cdr/app_defaults.php @@ -81,6 +81,7 @@ $message = $orm->message; //print_r($message); } + unset($row); } } diff --git a/core/databases/app_defaults.php b/core/databases/app_defaults.php index ca2ac224af..1a3a4b7b5b 100644 --- a/core/databases/app_defaults.php +++ b/core/databases/app_defaults.php @@ -49,6 +49,7 @@ if ($domains_processed == 1) { $db->exec(check_sql($sql)); unset($sql); } + unset($prep_statement, $result); //replace the backslash with a forward slash $db_path = str_replace("\\", "/", $db_path); @@ -62,6 +63,7 @@ if ($domains_processed == 1) { if ($prep_statement) { $prep_statement->execute(); $row = $prep_statement->fetch(PDO::FETCH_ASSOC); + unset($prep_statement); if ($row['num_rows'] > 0) { $odbc_num_rows = $row['num_rows']; @@ -95,6 +97,7 @@ if ($domains_processed == 1) { foreach ($result as &$row) { $recordings_dir = $row["default_setting_value"]; } + unset($prep_statement, $result); } //config.lua diff --git a/core/default_settings/app_defaults.php b/core/default_settings/app_defaults.php index a2261da03f..bee07f30a6 100644 --- a/core/default_settings/app_defaults.php +++ b/core/default_settings/app_defaults.php @@ -60,6 +60,7 @@ if ($domains_processed == 1) { $db->exec(check_sql($sql)); unset($sql); } + unset($prep_statement, $row); } //ensure that the default password length and strength are set @@ -109,6 +110,7 @@ if ($domains_processed == 1) { $db->exec(check_sql($sql)); unset($sql); } + unset($prep_statement, $row); } //set the sip_profiles directory for older installs diff --git a/core/menu/app_defaults.php b/core/menu/app_defaults.php index cac39aaf32..0925e0d595 100644 --- a/core/menu/app_defaults.php +++ b/core/menu/app_defaults.php @@ -116,6 +116,7 @@ } } } + unset($prep_statement); } ?> \ No newline at end of file diff --git a/core/notifications/app_defaults.php b/core/notifications/app_defaults.php index f2b41f198c..4042b0630c 100644 --- a/core/notifications/app_defaults.php +++ b/core/notifications/app_defaults.php @@ -47,6 +47,7 @@ if (strlen($_SESSION['switch']['scripts']['dir']) > 0) { $db->exec(check_sql($sql)); unset($sql); } + unset($prep_statement, $row); } } } diff --git a/core/upgrade/app_defaults.php b/core/upgrade/app_defaults.php index a963764937..255f99b5f9 100644 --- a/core/upgrade/app_defaults.php +++ b/core/upgrade/app_defaults.php @@ -73,6 +73,7 @@ if (strlen($_SESSION['switch']['scripts']['dir']) > 0) { $db->exec(check_sql($sql)); unset($sql); } + unset($prep_statement, $row); } //ensure the login message is set, if new message exists @@ -84,6 +85,7 @@ if (strlen($_SESSION['switch']['scripts']['dir']) > 0) { if ($prep_statement) { $prep_statement->execute(); $row = $prep_statement->fetch(PDO::FETCH_ASSOC); + unset($prep_statement); if ($row['num_rows'] == 0) { // insert message @@ -141,8 +143,8 @@ if (strlen($_SESSION['switch']['scripts']['dir']) > 0) { unset($sql); } } + unset($prep_statement, $result); } - unset($sql, $result); } } diff --git a/core/users/app_defaults.php b/core/users/app_defaults.php index df93a7006d..c9a0e162f3 100644 --- a/core/users/app_defaults.php +++ b/core/users/app_defaults.php @@ -76,8 +76,8 @@ } } } + unset($prep_statement, $sub_result); } - unset($prep_statement, $sub_result); //if there are no permissions listed in v_group_permissions then set the default permissions $sql = "select count(*) as count from v_group_permissions "; @@ -129,13 +129,38 @@ $sql .= "and user_uuid is null; "; $prep_statement = $db->prepare(check_sql($sql)); if ($prep_statement) { - $prep_statement->execute(); - $result = $prep_statement->fetchAll(PDO::FETCH_NAMED); - foreach($result as $row) { - if (strlen($row['username']) > 0) { + $prep_statement->execute(); + $result = $prep_statement->fetchAll(PDO::FETCH_NAMED); + foreach($result as $row) { + if (strlen($row['username']) > 0) { + //get the user_uuid + $sql = "select user_uuid from v_users "; + $sql .= "where username = '".$row['username']."' "; + $sql .= "and user_enabled = 'true' "; + $prep_statement_sub = $db->prepare($sql); + $prep_statement_sub->execute(); + $sub_result = $prep_statement_sub->fetch(PDO::FETCH_ASSOC); + unset ($prep_statement_sub); + $user_uuid = $sub_result['user_uuid']; + //set the user uuid + $sql = "update v_group_users set "; + $sql .= "user_uuid = '".$user_uuid."' "; + $sql .= "where username = '".$row['username']."'; "; + $db->exec($sql); + unset($sql); + } + else { + //get the number of users + $sql = "select count(*) as num_rows from v_users "; + $sql .= "where user_enabled = 'true' "; + $prep_statement_sub = $db->prepare($sql); + $prep_statement_sub->execute(); + $sub_result = $prep_statement_sub->fetch(PDO::FETCH_ASSOC); + unset ($prep_statement_sub); + $num_rows = $sub_result['num_rows']; + if ($num_rows == 1) { //get the user_uuid $sql = "select user_uuid from v_users "; - $sql .= "where username = '".$row['username']."' "; $sql .= "and user_enabled = 'true' "; $prep_statement_sub = $db->prepare($sql); $prep_statement_sub->execute(); @@ -145,36 +170,12 @@ //set the user uuid $sql = "update v_group_users set "; $sql .= "user_uuid = '".$user_uuid."' "; - $sql .= "where username = '".$row['username']."'; "; $db->exec($sql); unset($sql); } - else { - //get the number of users - $sql = "select count(*) as num_rows from v_users "; - $sql .= "where user_enabled = 'true' "; - $prep_statement_sub = $db->prepare($sql); - $prep_statement_sub->execute(); - $sub_result = $prep_statement_sub->fetch(PDO::FETCH_ASSOC); - unset ($prep_statement_sub); - $num_rows = $sub_result['num_rows']; - if ($num_rows == 1) { - //get the user_uuid - $sql = "select user_uuid from v_users "; - $sql .= "and user_enabled = 'true' "; - $prep_statement_sub = $db->prepare($sql); - $prep_statement_sub->execute(); - $sub_result = $prep_statement_sub->fetch(PDO::FETCH_ASSOC); - unset ($prep_statement_sub); - $user_uuid = $sub_result['user_uuid']; - //set the user uuid - $sql = "update v_group_users set "; - $sql .= "user_uuid = '".$user_uuid."' "; - $db->exec($sql); - unset($sql); - } - } } + } + unset ($prep_statement); } //if there are no permissions listed in v_group_permissions then set the default permissions