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

Fix a few more line space, indentation, and other white space issues.

Browse Source
This commit is contained in:
Mark Crane
2012-10-11 06:36:24 +00:00
parent be979dbc3a
commit 6dc9eec702
10 changed files with 300 additions and 286 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/default_settings/default_setting_edit.php
+41 -41
View File
@@ -126,47 +126,47 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
$sql .= "where default_setting_uuid = '$default_setting_uuid'";
$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);
}
$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";
core/default_settings/default_settings.php
+13 -14
View File
@@ -136,20 +136,19 @@ 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_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' ";
$sub_prep_statement = $db->prepare(check_sql($sql));
core/menu/menu_restore_default.php
+3 -3
View File
@@ -36,14 +36,14 @@ else {
//get the http value and set as a php variable
$menu_uuid = check_str($_REQUEST["menu_uuid"]);
$menu_language = check_str($_REQUEST["menu_language"]);
$menu_language = check_str($_REQUEST["menu_language"]);
//menu restore default
require_once "includes/classes/menu.php";
$menu = new menu;
$menu->db = $db;
$menu->menu_uuid = $menu_uuid;
$menu->menu_language = $menu_language;
$menu->menu_language = $menu_language;
$menu->delete();
$menu->restore();
@@ -62,4 +62,4 @@ else {
require_once "includes/footer.php";
return;
?>
?>
core/users/group_permissions.php
+1 -1
View File
@@ -272,4 +272,4 @@ require_once "includes/paging.php";
//show the footer
require_once "includes/footer.php";
?>
?>