Fix a few more line space, indentation, and other white space issues.
This commit is contained in:
Mark Crane
parent
be979dbc3a
commit
6dc9eec702
|
|
@ -136,7 +136,6 @@ require_once "includes/paging.php";
|
|||
$subcategory = $row['default_setting_subcategory'];
|
||||
$name = $row['default_setting_name'];
|
||||
if ($category == "domain" && $subcategory == "menu" && $name == "uuid" ) {
|
||||
|
||||
$sql = "select * from v_domain_settings ";
|
||||
$sql .= "where domain_uuid = '".$_SESSION['domain_uuid']."' ";
|
||||
$sql .= "and domain_setting_subcategory = 'menu' ";
|
||||
|
|
|
|||
|
|
@ -56,12 +56,14 @@ session_start();
|
|||
if (count($username_array) > 1 || strlen(check_str($_REQUEST["domain_name"])) > 0) {
|
||||
foreach ($_SESSION['domains'] as &$row) {
|
||||
if ($row['domain_name'] == $domain_name) {
|
||||
//set the domain session variables
|
||||
$domain_uuid = $row["domain_uuid"];
|
||||
$_SESSION["domain_uuid"] = $row["domain_uuid"];
|
||||
$_SESSION['domains'][$row['domain_uuid']]['domain_uuid'] = $row['domain_uuid'];
|
||||
$_SESSION['domains'][$row['domain_uuid']]['domain_name'] = $domain_name;
|
||||
$_SESSION["domain_name"] = $domain_name;
|
||||
|
||||
//set the setting arrays
|
||||
//domains set()
|
||||
require "includes/classes/domains.php";
|
||||
$domain = new domains();
|
||||
|
|
|
|||
|
|
@ -1,10 +1,30 @@
|
|||
<?php
|
||||
/*
|
||||
FusionPBX
|
||||
Version: MPL 1.1
|
||||
|
||||
The contents of this file are subject to the Mozilla Public License Version
|
||||
1.1 (the "License"); you may not use this file except in compliance with
|
||||
the License. You may obtain a copy of the License at
|
||||
http://www.mozilla.org/MPL/
|
||||
|
||||
Software distributed under the License is distributed on an "AS IS" basis,
|
||||
WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||
for the specific language governing rights and limitations under the
|
||||
License.
|
||||
|
||||
The Original Code is FusionPBX
|
||||
|
||||
The Initial Developer of the Original Code is
|
||||
Mark J Crane <markjcrane@fusionpbx.com>
|
||||
Portions created by the Initial Developer are Copyright (C) 2008-2012
|
||||
the Initial Developer. All Rights Reserved.
|
||||
|
||||
Contributor(s):
|
||||
Mark J Crane <markjcrane@fusionpbx.com>
|
||||
sreis
|
||||
*/
|
||||
|
||||
/**
|
||||
* Description of domains
|
||||
*
|
||||
* @author sreis
|
||||
*/
|
||||
class domains {
|
||||
|
||||
public function set() {
|
||||
|
|
@ -12,8 +32,6 @@
|
|||
//set the variable
|
||||
$db = $this->db;
|
||||
|
||||
//get the session settings
|
||||
|
||||
//get the default settings
|
||||
$sql = "select * from v_default_settings ";
|
||||
$sql .= "where default_setting_enabled = 'true' ";
|
||||
|
|
@ -31,7 +49,6 @@
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
//get the domains settings
|
||||
$sql = "select * from v_domain_settings ";
|
||||
$sql .= "where domain_uuid = '" . $_SESSION["domain_uuid"] . "' ";
|
||||
|
|
@ -94,7 +111,7 @@
|
|||
}
|
||||
}
|
||||
|
||||
//recordings add the domain to the path if there is more than one domains
|
||||
//recordings add the domain to the path if there is more than one domains
|
||||
if (count($_SESSION["domains"]) > 1) {
|
||||
if (strlen($_SESSION['switch']['recordings']['dir']) > 0) {
|
||||
if (substr($_SESSION['switch']['recordings']['dir'], -strlen($_SESSION["domain_name"])) != $_SESSION["domain_name"]) {
|
||||
|
|
|
|||
|
|
@ -17,7 +17,6 @@
|
|||
dbh = freeswitch.Dbh("core:"..db_path.."/"..db_name);
|
||||
end
|
||||
|
||||
|
||||
-- show all channel variables
|
||||
--dat = env:serialize()
|
||||
--freeswitch.consoleLog("INFO","info:\n" .. dat .. "\n")
|
||||
|
|
|
|||
|
|
@ -257,10 +257,10 @@ if ($db_type == "pgsql") {
|
|||
unset($result, $prep_statement);
|
||||
}
|
||||
|
||||
//set the setting arrays
|
||||
if (!isset($_SESSION['domain']['menu'])){
|
||||
//domains set()
|
||||
require "includes/classes/domains.php";
|
||||
|
||||
$domain = new domains();
|
||||
$domain->db = $db;
|
||||
$domain->set();
|
||||
|
|
|
|||
|
|
@ -35,6 +35,7 @@ require_once "includes/lib_functions.php";
|
|||
//add the menu uuid
|
||||
$menu_uuid = 'b4750c3f-2a86-b00d-b7d0-345c14eca286';
|
||||
$menu_uuid_pt = '1a2b789b-64a0-4a45-84eb-7ebf4f9c576b';
|
||||
|
||||
//error reporting
|
||||
ini_set('display_errors', '1');
|
||||
//error_reporting (E_ALL); // Report everything
|
||||
|
|
@ -212,7 +213,6 @@ require_once "includes/lib_functions.php";
|
|||
break;
|
||||
case "OpenBSD":
|
||||
$startup_script_dir = '';
|
||||
|
||||
//set the default db_path
|
||||
if (strlen($db_path) == 0) { //secure dir
|
||||
$db_path = $_SERVER["DOCUMENT_ROOT"].PROJECT_PATH.'/secure';
|
||||
|
|
@ -244,7 +244,6 @@ require_once "includes/lib_functions.php";
|
|||
// HP-UX
|
||||
// OpenBSD (not in Wikipedia)
|
||||
|
||||
|
||||
//set the dir defaults for windows
|
||||
if (substr(strtoupper(PHP_OS), 0, 3) == "WIN") {
|
||||
if (substr($_SERVER["DOCUMENT_ROOT"], -3) == "www") {
|
||||
|
|
@ -277,6 +276,7 @@ require_once "includes/lib_functions.php";
|
|||
$startup_script_dir = '';
|
||||
}
|
||||
}
|
||||
|
||||
$msg = '';
|
||||
if ($_POST["install_step"] == "2" && count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
|
||||
//check for all required data
|
||||
|
|
@ -1144,7 +1144,6 @@ if ($_POST["install_step"] == "3" && count($_POST)>0 && strlen($_POST["persistfo
|
|||
$tmp[$x]['menu_description'] = '';
|
||||
$tmp[$x]['menu_uuid'] = $menu_uuid_pt;
|
||||
|
||||
|
||||
//add the parent menu
|
||||
foreach($tmp as $row) {
|
||||
$sql = "insert into v_menus ";
|
||||
|
|
@ -1178,8 +1177,6 @@ if ($_POST["install_step"] == "3" && count($_POST)>0 && strlen($_POST["persistfo
|
|||
}
|
||||
unset($tmp);
|
||||
|
||||
|
||||
|
||||
//setup the switch config directory if it exists
|
||||
if ($switch_conf_dir != "/conf") {
|
||||
if ($v_debug) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue