nsinnovations/fusionpbx
2
0
Fork 0
mirror of https://github.com/fusionpbx/fusionpbx.git synced 2025-12-30 00:53:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

code cleanup

Browse Source
This commit is contained in:
Nuno Miguel Reis
2012-10-11 19:03:17 +00:00
parent 2d0d667bca
commit 8db6d7ba64
4 changed files with 40 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
core/default_settings/default_setting_edit.php
View File

@@ -127,47 +127,6 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
$db->exec(check_sql($sql));
unset($sql);
$sql = "select * from v_domain_settings ";
$sql .= "where domain_uuid = '".$_SESSION['domain_uuid']."' ";
$sql .= "and domain_setting_subcategory = 'menu' ";
$sql .= "and domain_setting_name = 'uuid' ";
$prep_statement = $db->prepare(check_sql($sql));
$prep_statement->execute();
$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
unset ($prep_statement);
if(count($result)>0){
$sql = "update v_domain_settings set ";
$sql .= "domain_setting_value = '$default_setting_value' ";
$sql .= "where domain_uuid = '".$_SESSION['domain_uuid']."' ";
$sql .= "and domain_setting_subcategory = 'menu' ";
$db->exec(check_sql($sql));
unset($sql);
}else{
$sql = "insert into v_domain_settings ";
$sql .= "(";
$sql .= "domain_uuid, ";
$sql .= "domain_setting_uuid, ";
$sql .= "domain_setting_category, ";
$sql .= "domain_setting_subcategory, ";
$sql .= "domain_setting_name, ";
$sql .= "domain_setting_value, ";
$sql .= "domain_setting_enabled ";
$sql .= ")";
$sql .= "values ";
$sql .= "(";
$sql .= "'".$_SESSION['domain_uuid']."', ";
$sql .= "'".uuid()."', ";
$sql .= "'domain', ";
$sql .= "'menu', ";
$sql .= "'uuid', ";
$sql .= "'$default_setting_value', ";
$sql .= "'true' ";
$sql .= ")";
$db->exec(check_sql($sql));
unset($sql);
}
require_once "includes/header.php";
echo "<meta http-equiv=\"refresh\" content=\"2;url=default_settings.php\">\n";
echo "<div align='center'>\n";
@@ -271,20 +230,6 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
if ($category == "domain" && $subcategory == "menu" && $name == "uuid" ) {
echo " <select id='default_setting_value' name='default_setting_value' class='formfld' style=''>\n";
echo " <option value=''></option>\n";
$sql = "select * from v_domain_settings ";
$sql .= "where domain_uuid = '".$_SESSION['domain_uuid']."' ";
$sql .= "and domain_setting_subcategory = 'menu' ";
$sql .= "and domain_setting_name = 'uuid' ";
$prep_statement = $db->prepare(check_sql($sql));
$prep_statement->execute();
$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
foreach ($result as &$row2) {
$domain_setting_value = $row2["domain_setting_value"];
break; //limit to 1 row
}
unset ($prep_statement);
$sql = "";
$sql .= "select * from v_menus ";
$sql .= "order by menu_language, menu_name asc ";
@@ -292,7 +237,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
$sub_prep_statement->execute();
$sub_result = $sub_prep_statement->fetchAll(PDO::FETCH_NAMED);
foreach ($sub_result as $sub_row) {
if (strtolower($domain_setting_value) == strtolower($sub_row["menu_uuid"])) {
if (strtolower($row['default_setting_value']) == strtolower($sub_row["menu_uuid"])) {
echo " <option value='".strtolower($sub_row["menu_uuid"])."' selected='selected'>".$sub_row["menu_language"]." - ".$sub_row["menu_name"]."\n";
}
else {

15
core/default_settings/default_settings.php
View File

@@ -136,21 +136,8 @@ 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' ";
$sql .= "and domain_setting_name = 'uuid' ";
$prep_statement = $db->prepare(check_sql($sql));
$prep_statement->execute();
$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
foreach ($result as &$row2) {
$domain_setting_value = $row2["domain_setting_value"];
break; //limit to 1 row
}
unset ($prep_statement);
$sql = "select * from v_menus ";
$sql .= "where menu_uuid = '$domain_setting_value' ";
$sql .= "where menu_uuid = '".$row['default_setting_value']."' ";
$sub_prep_statement = $db->prepare(check_sql($sql));
$sub_prep_statement->execute();
$sub_result = $sub_prep_statement->fetchAll(PDO::FETCH_NAMED);

4
includes/classes/menu.php
View File

@@ -27,7 +27,6 @@
//define the follow me class
class menu {
public $menu_uuid;
public $menu_language;
//delete items in the menu that are not protected
function delete() {
@@ -73,7 +72,7 @@
foreach ($apps as $row) {
foreach ($row['menu'] as $menu) {
//set the variables
$menu_item_title = $menu['title'][$this->menu_language];
$menu_item_title = $menu['title']['en-us'];
$menu_item_uuid = $menu['uuid'];
$menu_item_parent_uuid = $menu['parent_uuid'];
$menu_item_category = $menu['category'];
@@ -149,7 +148,6 @@
$sql .= "'$menu_language', ";
$sql .= "'$menu_item_title' ";
$sql .= ")";
echo $sql; exit;
$db->exec(check_sql($sql));
unset($sql);

81
install.php
View File

@@ -34,8 +34,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
@@ -244,6 +243,7 @@ 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") {
@@ -276,7 +276,6 @@ 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
@@ -676,6 +675,12 @@ if ($_POST["install_step"] == "3" && count($_POST)>0 && strlen($_POST["persistfo
$tmp[$x]['subcategory'] = 'time_zone';
$tmp[$x]['enabled'] = 'true';
$x++;
$tmp[$x]['name'] = 'code';
$tmp[$x]['value'] = 'en-us';
$tmp[$x]['category'] = 'domain';
$tmp[$x]['subcategory'] = 'language';
$tmp[$x]['enabled'] = 'true';
$x++;
$tmp[$x]['name'] = 'name';
$tmp[$x]['value'] = $install_template_name;
$tmp[$x]['category'] = 'domain';
@@ -1133,49 +1138,37 @@ if ($_POST["install_step"] == "3" && count($_POST)>0 && strlen($_POST["persistfo
require "includes/require.php";
//set the defaults
$x = 0;
$tmp[$x]['menu_name'] = 'default';
$tmp[$x]['menu_language'] = 'en-us';
$tmp[$x]['menu_description'] = '';
$tmp[$x]['menu_uuid'] = $menu_uuid;
$x++;
$tmp[$x]['menu_name'] = 'portuguese';
$tmp[$x]['menu_language'] = 'pt-pt';
$tmp[$x]['menu_description'] = '';
$tmp[$x]['menu_uuid'] = $menu_uuid_pt;
$menu_name = 'default';
$menu_language = 'en-us';
$menu_description = '';
//add the parent menu
foreach($tmp as $row) {
$sql = "insert into v_menus ";
$sql .= "(";
$sql .= "menu_uuid, ";
$sql .= "menu_name, ";
$sql .= "menu_language, ";
$sql .= "menu_description ";
$sql .= ") ";
$sql .= "values ";
$sql .= "(";
$sql .= "'".$row['menu_uuid']."', ";
$sql .= "'".$row['menu_name']."', ";
$sql .= "'".$row['menu_language']."', ";
$sql .= "'".$row['menu_description']."' ";
$sql .= ");";
if ($v_debug) {
fwrite($fp, $sql."\n");
}
$db->exec(check_sql($sql));
unset($sql);
//add the menu items
require_once "includes/classes/menu.php";
$menu = new menu;
$menu->db = $db;
$menu->menu_uuid = $row['menu_uuid'];
$menu->menu_language = $row['menu_language'];
$menu->restore();
unset($menu);
$sql = "insert into v_menus ";
$sql .= "(";
$sql .= "menu_uuid, ";
$sql .= "menu_name, ";
$sql .= "menu_language, ";
$sql .= "menu_description ";
$sql .= ") ";
$sql .= "values ";
$sql .= "(";
$sql .= "'".$menu_uuid."', ";
$sql .= "'$menu_name', ";
$sql .= "'$menu_language', ";
$sql .= "'$menu_description' ";
$sql .= ");";
if ($v_debug) {
fwrite($fp, $sql."\n");
}
unset($tmp);
$db->exec(check_sql($sql));
unset($sql);
//add the menu items
require_once "includes/classes/menu.php";
$menu = new menu;
$menu->db = $db;
$menu->menu_uuid = $menu_uuid;
$menu->restore();
unset($menu);
//setup the switch config directory if it exists
if ($switch_conf_dir != "/conf") {