Bläddra i källkod

Use the database::new method

FusionPBX 9 månader sedan
förälder
incheckning
a784816525
4 ändrade filer med 12 tillägg och 17 borttagningar
  1. 0 1
      app_defaults.php
  2. 6 12
      provider_edit.php
  3. 3 1
      provider_setup.php
  4. 3 3
      providers.php

+ 0 - 1
app_defaults.php

@@ -5,7 +5,6 @@ if ($domains_processed == 1) {
 	//set provider_setting_type to text if it is null
 	//set provider_setting_type to text if it is null
 	$sql = "select * from v_provider_settings ";
 	$sql = "select * from v_provider_settings ";
 	$sql .= "where provider_setting_type is null ";
 	$sql .= "where provider_setting_type is null ";
-	$database = new database;
 	$provider_settings = $database->select($sql, null, 'all');
 	$provider_settings = $database->select($sql, null, 'all');
 	if (is_array($provider_settings) && @sizeof($provider_settings) != 0) {
 	if (is_array($provider_settings) && @sizeof($provider_settings) != 0) {
 		foreach($provider_settings as $row) {
 		foreach($provider_settings as $row) {

+ 6 - 12
provider_edit.php

@@ -41,6 +41,9 @@
 	$language = new text;
 	$language = new text;
 	$text = $language->get();
 	$text = $language->get();
 
 
+//connect to the database
+	$database = database::new();
+
 //action add or update
 //action add or update
 	if (!empty($_REQUEST["id"]) && is_uuid($_REQUEST["id"])) {
 	if (!empty($_REQUEST["id"]) && is_uuid($_REQUEST["id"])) {
 		$action = "update";
 		$action = "update";
@@ -103,20 +106,17 @@
 				switch ($_POST['action']) {
 				switch ($_POST['action']) {
 					case 'copy':
 					case 'copy':
 						if (permission_exists('provider_add')) {
 						if (permission_exists('provider_add')) {
-							$obj = new database;
-							$obj->copy($array);
+							$database->copy($array);
 						}
 						}
 						break;
 						break;
 					case 'delete':
 					case 'delete':
 						if (permission_exists('provider_delete')) {
 						if (permission_exists('provider_delete')) {
-							$obj = new database;
-							$obj->delete($array);
+							$database->delete($array);
 						}
 						}
 						break;
 						break;
 					case 'toggle':
 					case 'toggle':
 						if (permission_exists('provider_update')) {
 						if (permission_exists('provider_update')) {
-							$obj = new database;
-							$obj->toggle($array);
+							$database->toggle($array);
 						}
 						}
 						break;
 						break;
 				}
 				}
@@ -190,7 +190,6 @@
 			}
 			}
 
 
 		//save the data
 		//save the data
-			$database = new database;
 			$database->app_name = 'providers';
 			$database->app_name = 'providers';
 			$database->app_uuid = '35187839-237e-4271-b8a1-9b9c45dc8833';
 			$database->app_uuid = '35187839-237e-4271-b8a1-9b9c45dc8833';
 			$database->save($array);
 			$database->save($array);
@@ -224,7 +223,6 @@
 		//$sql .= "and domain_uuid = :domain_uuid ";
 		//$sql .= "and domain_uuid = :domain_uuid ";
 		//$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 		//$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 		$parameters['provider_uuid'] = $provider_uuid;
 		$parameters['provider_uuid'] = $provider_uuid;
-		$database = new database;
 		$row = $database->select($sql, $parameters, 'row');
 		$row = $database->select($sql, $parameters, 'row');
 		if (is_array($row) && @sizeof($row) != 0) {
 		if (is_array($row) && @sizeof($row) != 0) {
 			$provider_name = $row["provider_name"];
 			$provider_name = $row["provider_name"];
@@ -250,7 +248,6 @@
 		//$sql .= "and domain_uuid = '".$domain_uuid."' ";
 		//$sql .= "and domain_uuid = '".$domain_uuid."' ";
 		//$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 		//$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 		$parameters['provider_uuid'] = $provider_uuid;
 		$parameters['provider_uuid'] = $provider_uuid;
-		$database = new database;
 		$provider_addresses = $database->select($sql, $parameters, 'all');
 		$provider_addresses = $database->select($sql, $parameters, 'all');
 		unset ($sql, $parameters);
 		unset ($sql, $parameters);
 	}
 	}
@@ -286,9 +283,6 @@
 		$sql .= "where provider_uuid = :provider_uuid ";
 		$sql .= "where provider_uuid = :provider_uuid ";
 		$sql .= "order by provider_setting_category, provider_setting_subcategory, provider_setting_name asc ";
 		$sql .= "order by provider_setting_category, provider_setting_subcategory, provider_setting_name asc ";
 		$parameters['provider_uuid'] = $provider_uuid;
 		$parameters['provider_uuid'] = $provider_uuid;
-		//echo $sql;
-		//view_array($parameters);
-		$database = new database;
 		$provider_settings = $database->select($sql, $parameters, 'all');
 		$provider_settings = $database->select($sql, $parameters, 'all');
 		unset ($sql, $parameters);
 		unset ($sql, $parameters);
 	}
 	}

+ 3 - 1
provider_setup.php

@@ -41,6 +41,9 @@
 	$language = new text;
 	$language = new text;
 	$text = $language->get();
 	$text = $language->get();
 
 
+//connect to the database
+	$database = database::new();
+
 //get the provider
 //get the provider
 	if (isset($_GET['id'])) {
 	if (isset($_GET['id'])) {
 
 
@@ -68,7 +71,6 @@
 
 
 //installed providers
 //installed providers
 	$sql = "select provider_uuid from v_providers ";
 	$sql = "select provider_uuid from v_providers ";
-	$database = new database;
 	$database_providers = $database->select($sql, null, 'all');
 	$database_providers = $database->select($sql, null, 'all');
 
 
 //loop through installed providers
 //loop through installed providers

+ 3 - 3
providers.php

@@ -42,6 +42,9 @@
 	$language = new text;
 	$language = new text;
 	$text = $language->get();
 	$text = $language->get();
 
 
+//connect to the database
+	$database = database::new();
+
 //get the http post data
 //get the http post data
 	if (!empty($_POST) && is_array($_POST['providers'])) {
 	if (!empty($_POST) && is_array($_POST['providers'])) {
 		$action = $_POST['action'];
 		$action = $_POST['action'];
@@ -78,7 +81,6 @@
 		}
 		}
 
 
 		//prepare the database object
 		//prepare the database object
-		$database = new database;
 		$database->app_name = 'providers';
 		$database->app_name = 'providers';
 		$database->app_uuid = '35187839-237e-4271-b8a1-9b9c45dc8833';
 		$database->app_uuid = '35187839-237e-4271-b8a1-9b9c45dc8833';
 
 
@@ -129,7 +131,6 @@
 		$parameters['search'] = '%'.$search.'%';
 		$parameters['search'] = '%'.$search.'%';
 	}
 	}
 	$parameters['domain_uuid'] = $domain_uuid;
 	$parameters['domain_uuid'] = $domain_uuid;
-	$database = new database;
 	$num_rows = $database->select($sql, $parameters, 'column');
 	$num_rows = $database->select($sql, $parameters, 'column');
 	unset($sql, $parameters);
 	unset($sql, $parameters);
 
 
@@ -164,7 +165,6 @@
 	}
 	}
 	$sql .= limit_offset($rows_per_page, $offset);
 	$sql .= limit_offset($rows_per_page, $offset);
 	$parameters['domain_uuid'] = $domain_uuid;
 	$parameters['domain_uuid'] = $domain_uuid;
-	$database = new database;
 	$providers = $database->select($sql, $parameters, 'all');
 	$providers = $database->select($sql, $parameters, 'all');
 	unset($sql, $parameters);
 	unset($sql, $parameters);