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

Move references to php classes in includes/classes to resource/classes.

This commit is contained in:
Mark Crane 2013-07-06 07:13:36 +00:00
parent 60f06a644d
commit 3a58d1e08d
33 changed files with 43 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/call_flows/call_flow_edit.php
View File

@ -223,7 +223,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
dialplan_add($_SESSION['domain_uuid'], $dialplan_uuid, $dialplan_name, $dialplan_order, $dialplan_context, $dialplan_enabled, $dialplan_description, $app_uuid); dialplan_add($_SESSION['domain_uuid'], $dialplan_uuid, $dialplan_name, $dialplan_order, $dialplan_context, $dialplan_enabled, $dialplan_description, $app_uuid);
//dialplan group 1 //dialplan group 1
require_once "includes/classes/switch_dialplan.php"; require_once "resources/classes/dialplan.php";
//<condition destination_number="300" break="on-true"/> //<condition destination_number="300" break="on-true"/>
$dialplan = new dialplan; $dialplan = new dialplan;

2
app/dialplan/app_defaults.php
View File

@ -79,7 +79,7 @@
$dialplan_order = 0; $dialplan_order = 0;
} }
//dialplan class //dialplan class
require_once "includes/classes/switch_dialplan.php"; require_once "resources/classes/dialplan.php";
$dialplan = new dialplan; $dialplan = new dialplan;
$dialplan->domain_uuid = $domain_uuid; $dialplan->domain_uuid = $domain_uuid;
$dialplan->dialplan_order = $dialplan_order; $dialplan->dialplan_order = $dialplan_order;

2
app/dialplan/dialplan_advanced.php
View File

@ -45,7 +45,7 @@ $page["title"] = $text['title-default_dialplan'];
if ($_GET['a'] == "default" && permission_exists('dialplan_advanced_edit')) { if ($_GET['a'] == "default" && permission_exists('dialplan_advanced_edit')) {
//create the dialplan/default.xml for single tenant or dialplan/domain.xml //create the dialplan/default.xml for single tenant or dialplan/domain.xml
require_once "includes/classes/switch_dialplan.php"; require_once "resources/classes/dialplan.php";
$dialplan = new dialplan; $dialplan = new dialplan;
$dialplan->domain_uuid = $_SESSION['domain_uuid']; $dialplan->domain_uuid = $_SESSION['domain_uuid'];
$dialplan->switch_dialplan_dir = $_SESSION['switch']['dialplan']['dir']; $dialplan->switch_dialplan_dir = $_SESSION['switch']['dialplan']['dir'];

2
app/extensions/resources/classes/extension.php
View File

@ -69,7 +69,7 @@
public $description; public $description;
public function __construct() { public function __construct() {
require_once "includes/classes/database.php"; require_once "resources/classes/database.php";
$this->app_uuid = 'e68d9689-2769-e013-28fa-6214bf47fca3'; $this->app_uuid = 'e68d9689-2769-e013-28fa-6214bf47fca3';
} }

2
app/hunt_groups/hunt_group_edit.php
View File

@ -219,7 +219,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
unset($sql); unset($sql);
//update the dialplan entry //update the dialplan entry
require_once "includes/classes/switch_dialplan.php"; require_once "resources/classes/dialplan.php";
$dialplan = new dialplan; $dialplan = new dialplan;
$dialplan->domain_uuid = $_SESSION['domain_uuid']; $dialplan->domain_uuid = $_SESSION['domain_uuid'];
$dialplan->app_uuid = $app_uuid; $dialplan->app_uuid = $app_uuid;

2
app/ivr_menu/ivr_menu_delete.php
View File

@ -46,7 +46,7 @@ if (count($_GET)>0) {
if (strlen($id)>0) { if (strlen($id)>0) {
//include the ivr menu class //include the ivr menu class
require_once "includes/classes/database.php"; require_once "resources/classes/database.php";
require_once "resources/classes/switch_ivr_menu.php"; require_once "resources/classes/switch_ivr_menu.php";
$ivr = new switch_ivr_menu; $ivr = new switch_ivr_menu;
$ivr->domain_uuid = $_SESSION["domain_uuid"]; $ivr->domain_uuid = $_SESSION["domain_uuid"];

2
app/ivr_menu/ivr_menu_edit.php
View File

@ -181,7 +181,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
//add or update the database //add or update the database
if ($_POST["persistformvar"] != "true") { if ($_POST["persistformvar"] != "true") {
//prepare the object //prepare the object
require_once "includes/classes/database.php"; require_once "resources/classes/database.php";
require_once "resources/classes/switch_ivr_menu.php"; require_once "resources/classes/switch_ivr_menu.php";
$ivr = new switch_ivr_menu; $ivr = new switch_ivr_menu;
$ivr->domain_uuid = $_SESSION["domain_uuid"]; $ivr->domain_uuid = $_SESSION["domain_uuid"];

2
app/ivr_menu/ivr_menu_option_delete.php
View File

@ -49,7 +49,7 @@ else {
//delete the ivr menu option //delete the ivr menu option
if (strlen($id)>0) { if (strlen($id)>0) {
//include the ivr menu class //include the ivr menu class
require_once "includes/classes/database.php"; require_once "resources/classes/database.php";
require_once "resources/classes/switch_ivr_menu.php"; require_once "resources/classes/switch_ivr_menu.php";
$ivr = new switch_ivr_menu; $ivr = new switch_ivr_menu;
$ivr->domain_uuid = $_SESSION["domain_uuid"]; $ivr->domain_uuid = $_SESSION["domain_uuid"];

2
app/ivr_menu/ivr_menu_option_edit.php
View File

@ -103,7 +103,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
//add or update the database //add or update the database
if ($_POST["persistformvar"] != "true") { if ($_POST["persistformvar"] != "true") {
//create the object //create the object
require_once "includes/classes/database.php"; require_once "resources/classes/database.php";
require_once "resources/classes/switch_ivr_menu.php"; require_once "resources/classes/switch_ivr_menu.php";
$ivr = new switch_ivr_menu; $ivr = new switch_ivr_menu;
$ivr->domain_uuid = $_SESSION["domain_uuid"]; $ivr->domain_uuid = $_SESSION["domain_uuid"];

2
app/ivr_menu/ivr_menus.php
View File

@ -75,7 +75,7 @@ else {
echo "<br>\n"; echo "<br>\n";
//get the count //get the count
require_once "includes/classes/database.php"; require_once "resources/classes/database.php";
require_once "resources/classes/switch_ivr_menu.php"; require_once "resources/classes/switch_ivr_menu.php";
$ivr = new switch_ivr_menu; $ivr = new switch_ivr_menu;
$ivr->domain_uuid = $_SESSION["domain_uuid"]; $ivr->domain_uuid = $_SESSION["domain_uuid"];

4
app/ivr_menu/resources/classes/switch_ivr_menu.php
View File

@ -24,7 +24,7 @@
Mark J Crane <markjcrane@fusionpbx.com> Mark J Crane <markjcrane@fusionpbx.com>
*/ */
include "root.php"; include "root.php";
require_once "includes/classes/switch_dialplan.php"; require_once "resources/classes/dialplan.php";
//define the directory class //define the directory class
class switch_ivr_menu { class switch_ivr_menu {
@ -65,7 +65,7 @@ require_once "includes/classes/switch_dialplan.php";
public $order_by; //array public $order_by; //array
public function __construct() { public function __construct() {
require_once "includes/classes/database.php"; require_once "resources/classes/database.php";
$this->app_uuid = 'a5788e9b-58bc-bd1b-df59-fff5d51253ab'; $this->app_uuid = 'a5788e9b-58bc-bd1b-df59-fff5d51253ab';
} }

2
app/modules/app_defaults.php
View File

@ -27,7 +27,7 @@
//use the module class to get the list of modules from the db and add any missing modules //use the module class to get the list of modules from the db and add any missing modules
if ($domains_processed == 1) { if ($domains_processed == 1) {
require_once "includes/classes/switch_modules.php"; require_once "resources/classes/modules.php";
$mod = new switch_modules; $mod = new switch_modules;
$mod->db = $db; $mod->db = $db;
$mod->dir = $_SESSION['switch']['mod']['dir']; $mod->dir = $_SESSION['switch']['mod']['dir'];

2
app/modules/modules.php
View File

@ -69,7 +69,7 @@ if (strlen($_GET["a"]) > 0) {
} }
//use the module class to get the list of modules from the db and add any missing modules //use the module class to get the list of modules from the db and add any missing modules
require_once "includes/classes/switch_modules.php"; require_once "resources/classes/modules.php";
$mod = new switch_modules; $mod = new switch_modules;
$mod->db = $db; $mod->db = $db;
$mod->dir = $_SESSION['switch']['mod']['dir']; $mod->dir = $_SESSION['switch']['mod']['dir'];

2
app/music_on_hold/resources/classes/switch_music_on_hold.php
View File

@ -37,7 +37,7 @@ include "root.php";
private $xml; private $xml;
public function __construct() { public function __construct() {
require_once "includes/classes/database.php"; require_once "resources/classes/database.php";
$this->app_uuid = ''; $this->app_uuid = '';
} }

2
app/registrations/status_registrations.php
View File

@ -156,7 +156,7 @@ require_once "resources/check_auth.php";
echo "</tr>\n"; echo "</tr>\n";
//order the array //order the array
require_once "includes/classes/array_order.php"; require_once "resources/classes/array_order.php";
$order = new array_order(); $order = new array_order();
$registrations = $order->sort($registrations, 'domain', 'user'); $registrations = $order->sort($registrations, 'domain', 'user');

2
app/ring_groups/ring_groups_edit.php
View File

@ -259,7 +259,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
$row = $prep_statement->fetch(PDO::FETCH_ASSOC); $row = $prep_statement->fetch(PDO::FETCH_ASSOC);
if ($row['num_rows'] == 0) { if ($row['num_rows'] == 0) {
//add the dialplan //add the dialplan
require_once "includes/classes/database.php"; require_once "resources/classes/database.php";
$database = new database; $database = new database;
$database->db = $db; $database->db = $db;
$database->table = "v_dialplans"; $database->table = "v_dialplans";

2
app/xml_cdr/v_xml_cdr_import.php
View File

@ -67,7 +67,7 @@
} }
//prepare the database object //prepare the database object
require_once "includes/classes/database.php"; require_once "resources/classes/database.php";
$database = new database; $database = new database;
$database->table = "v_xml_cdr"; $database->table = "v_xml_cdr";

2
core/domain_settings/domains.php
View File

@ -76,7 +76,7 @@ else {
unset($_SESSION['extension_array']); unset($_SESSION['extension_array']);
//set the setting arrays //set the setting arrays
//domains set() //domains set()
require "includes/classes/domains.php"; require "resources/classes/domains.php";
$domain = new domains(); $domain = new domains();
$domain->db = $db; $domain->db = $db;
$domain->set(); $domain->set();

2
core/menu/app_defaults.php
View File

@ -61,7 +61,7 @@
$db->exec(check_sql($sql)); $db->exec(check_sql($sql));
unset($sql); unset($sql);
//add the menu items //add the menu items
require_once "includes/classes/menu.php"; require_once "resources/classes/menu.php";
$menu = new menu; $menu = new menu;
$menu->db = $db; $menu->db = $db;
$menu->menu_uuid = $menu_uuid; $menu->menu_uuid = $menu_uuid;

2
core/menu/menu_edit.php
View File

@ -106,7 +106,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
unset($sql); unset($sql);
//add the default items in the menu //add the default items in the menu
require_once "includes/classes/menu.php"; require_once "resources/classes/menu.php";
$menu = new menu; $menu = new menu;
$menu->db = $db; $menu->db = $db;
$menu->menu_uuid = $menu_uuid; $menu->menu_uuid = $menu_uuid;

2
core/menu/menu_restore_default.php
View File

@ -45,7 +45,7 @@ else {
$menu_language = check_str($_REQUEST["menu_language"]); $menu_language = check_str($_REQUEST["menu_language"]);
//menu restore default //menu restore default
require_once "includes/classes/menu.php"; require_once "resources/classes/menu.php";
$menu = new menu; $menu = new menu;
$menu->db = $db; $menu->db = $db;
$menu->menu_uuid = $menu_uuid; $menu->menu_uuid = $menu_uuid;

1
includes/classes/array_order.php
View File

@ -1,4 +1,5 @@
<?php <?php
class array_order { class array_order {
var $sort_fields; var $sort_fields;

4
includes/classes/database.php
View File

@ -531,7 +531,7 @@ if (!function_exists('php_right')) {
//example usage //example usage
/* /*
//find //find
require_once "includes/classes/database.php"; require_once "resources/classes/database.php";
$database = new database; $database = new database;
$database->domain_uuid = $_SESSION["domain_uuid"]; $database->domain_uuid = $_SESSION["domain_uuid"];
$database->type = $db_type; $database->type = $db_type;
@ -548,7 +548,7 @@ if (!function_exists('php_right')) {
$database->find(); $database->find();
print_r($database->result); print_r($database->result);
//insert //insert
require_once "includes/classes/database.php"; require_once "resources/classes/database.php";
$database = new database; $database = new database;
$database->domain_uuid = $_SESSION["domain_uuid"]; $database->domain_uuid = $_SESSION["domain_uuid"];
$database->type = $db_type; $database->type = $db_type;

2
includes/classes/schema.php
View File

@ -121,7 +121,7 @@ include "root.php";
} }
//example use //example use
//require_once "includes/classes/schema.php"; //require_once "resources/classes/schema.php";
//$schema = new schema; //$schema = new schema;
//$schema->db_type = $db_type; //$schema->db_type = $db_type;
//$schema->sql(); //$schema->sql();

6
includes/classes/switch_fax.php
View File

@ -45,7 +45,7 @@ include "root.php";
public $fax_description; public $fax_description;
public function __construct() { public function __construct() {
require_once "includes/classes/database.php"; require_once "resources/classes/database.php";
$this->app_uuid = '24108154-4ac3-1db6-1551-4731703a4440'; $this->app_uuid = '24108154-4ac3-1db6-1551-4731703a4440';
} }
@ -521,8 +521,8 @@ include "root.php";
} }
} }
/* /*
require_once "includes/classes/database.php"; require_once "resources/classes/database.php";
require_once "includes/classes/switch_fax.php"; require_once "resources/classes/fax.php";
$fax = new switch_fax; $fax = new switch_fax;
$fax->domain_uuid = $_SESSION["domain_uuid"]; $fax->domain_uuid = $_SESSION["domain_uuid"];
print_r($fax->find()); print_r($fax->find());

2
resources/check_auth.php
View File

@ -60,7 +60,7 @@ session_start();
} }
//set the domain information //set the domain information
if (strlen($domain_name) > 0) { if (strlen($domain_name) > 0) {
require_once "includes/classes/domains.php"; require_once "resources/classes/domains.php";
foreach ($_SESSION['domains'] as &$row) { foreach ($_SESSION['domains'] as &$row) {
if ($row['domain_name'] == $domain_name) { if ($row['domain_name'] == $domain_name) {
//set the domain session variables //set the domain session variables

2
resources/classes/install.php
View File

@ -190,7 +190,7 @@ include "root.php";
} }
//how to use the class //how to use the class
//include "includes/classes/install.php"; //include "resources/classes/install.php";
//$install = new install; //$install = new install;
//$install->domain_uuid = $domain_uuid; //$install->domain_uuid = $domain_uuid;
//$install->switch_conf_dir = $switch_conf_dir; //$install->switch_conf_dir = $switch_conf_dir;

10
resources/install.php
View File

@ -491,7 +491,7 @@ if ($_POST["install_step"] == "3" && count($_POST) > 0 && strlen($_POST["persist
$db_tmp->sqliteCreateFunction('now', 'php_now', 0); $db_tmp->sqliteCreateFunction('now', 'php_now', 0);
//add the database structure //add the database structure
require_once "includes/classes/schema.php"; require_once "resources/classes/schema.php";
$schema = new schema; $schema = new schema;
$schema->db = $db_tmp; $schema->db = $db_tmp;
$schema->db_type = $db_type; $schema->db_type = $db_type;
@ -573,7 +573,7 @@ if ($_POST["install_step"] == "3" && count($_POST) > 0 && strlen($_POST["persist
} }
//add the database structure //add the database structure
require_once "includes/classes/schema.php"; require_once "resources/classes/schema.php";
$schema = new schema; $schema = new schema;
$schema->db = $db_tmp; $schema->db = $db_tmp;
$schema->db_type = $db_type; $schema->db_type = $db_type;
@ -740,7 +740,7 @@ if ($_POST["install_step"] == "3" && count($_POST) > 0 && strlen($_POST["persist
} }
//add the database structure //add the database structure
require_once "includes/classes/schema.php"; require_once "resources/classes/schema.php";
$schema = new schema; $schema = new schema;
$schema->db = $db_tmp; $schema->db = $db_tmp;
$schema->db_type = $db_type; $schema->db_type = $db_type;
@ -1215,7 +1215,7 @@ if ($_POST["install_step"] == "3" && count($_POST) > 0 && strlen($_POST["persist
unset($sql); unset($sql);
//add the menu items //add the menu items
require_once "includes/classes/menu.php"; require_once "resources/classes/menu.php";
$menu = new menu; $menu = new menu;
$menu->db = $db; $menu->db = $db;
$menu->menu_uuid = $menu_uuid; $menu->menu_uuid = $menu_uuid;
@ -1267,7 +1267,7 @@ if ($_POST["install_step"] == "3" && count($_POST) > 0 && strlen($_POST["persist
//print_r($install->result); //print_r($install->result);
//create the dialplan/default.xml for single tenant or dialplan/domain.xml //create the dialplan/default.xml for single tenant or dialplan/domain.xml
require_once "includes/classes/switch_dialplan.php"; require_once "resources/classes/dialplan.php";
$dialplan = new dialplan; $dialplan = new dialplan;
$dialplan->domain_uuid = $_SESSION["domain_uuid"]; $dialplan->domain_uuid = $_SESSION["domain_uuid"];
$dialplan->domain = $domain_name; $dialplan->domain = $domain_name;

2
resources/menu.php
View File

@ -61,7 +61,7 @@ require_once "resources/require.php";
$v_menu .= "<div id=\"menu\" style=\"position: relative; z-index:199; width:100%;\" align='left'>\n"; $v_menu .= "<div id=\"menu\" style=\"position: relative; z-index:199; width:100%;\" align='left'>\n";
$v_menu .= "\n"; $v_menu .= "\n";
require_once "includes/classes/menu.php"; require_once "resources/classes/menu.php";
$menu = new menu; $menu = new menu;
$menu->db = $db; $menu->db = $db;
$menu->menu_uuid = $_SESSION['domain']['menu']['uuid']; $menu->menu_uuid = $_SESSION['domain']['menu']['uuid'];

2
resources/pdo.php
View File

@ -260,7 +260,7 @@ if ($db_type == "pgsql") {
//set the setting arrays //set the setting arrays
if (!isset($_SESSION['domain']['menu'])){ if (!isset($_SESSION['domain']['menu'])){
//domains set() //domains set()
require "includes/classes/domains.php"; require "resources/classes/domains.php";
$domain = new domains(); $domain = new domains();
$domain->db = $db; $domain->db = $db;
$domain->set(); $domain->set();

2
resources/schema.php
View File

@ -25,7 +25,7 @@
*/ */
include "root.php"; include "root.php";
//require_once "resources/require.php"; //require_once "resources/require.php";
//require_once "includes/classes/database.php"; //require_once "resources/classes/database.php";
//$db = new database; //$db = new database;
//$db->db = $db; //$db->db = $db;
//$db->db_type = $db_type; //$db->db_type = $db_type;

6
resources/switch.php
View File

@ -2129,7 +2129,7 @@ function save_hunt_group_xml() {
unset($sql); unset($sql);
} }
require_once "includes/classes/switch_dialplan.php"; require_once "resources/classes/dialplan.php";
$dialplan = new dialplan; $dialplan = new dialplan;
$dialplan->domain_uuid = $domain_uuid; $dialplan->domain_uuid = $domain_uuid;
$dialplan->app_uuid = $app_uuid; $dialplan->app_uuid = $app_uuid;
@ -2178,7 +2178,7 @@ function save_hunt_group_xml() {
//if action is add or update //if action is add or update
if ($action == 'add' || $action == 'update') { if ($action == 'add' || $action == 'update') {
require_once "includes/classes/switch_dialplan.php"; require_once "resources/classes/dialplan.php";
$dialplan = new dialplan; $dialplan = new dialplan;
$dialplan->domain_uuid = $domain_uuid; $dialplan->domain_uuid = $domain_uuid;
$dialplan->dialplan_uuid = $dialplan_uuid; $dialplan->dialplan_uuid = $dialplan_uuid;
@ -3080,7 +3080,7 @@ if (!function_exists('save_call_center_xml')) {
global $db, $domain_uuid; global $db, $domain_uuid;
//include the classes //include the classes
include "includes/classes/switch_dialplan.php"; include "resources/classes/dialplan.php";
$sql = "select * from v_call_center_queues "; $sql = "select * from v_call_center_queues ";
$prep_statement = $db->prepare(check_sql($sql)); $prep_statement = $db->prepare(check_sql($sql));

2
themes/default/template.php
View File

@ -724,7 +724,7 @@ function confirmdelete(url) {
$menu_level = '0'; $menu_level = '0';
if ($db) { if ($db) {
if (strlen($php_self_parent_uuid) > 0) { if (strlen($php_self_parent_uuid) > 0) {
require_once "includes/classes/menu.php"; require_once "resources/classes/menu.php";
$menu = new menu; $menu = new menu;
$menu->db = $db; $menu->db = $db;
$menu->menu_uuid = $_SESSION['domain']['menu']['uuid']; $menu->menu_uuid = $_SESSION['domain']['menu']['uuid'];