Database class integration. Modify database class singular() method to support table names ending in 'ses', such as v_databases.

This commit is contained in:
Nate 2019-07-09 20:06:17 -06:00
parent 2cb44c3b7d
commit fca4691ac6
11 changed files with 287 additions and 340 deletions

View File

@ -50,8 +50,8 @@
$document['title'] = $text['title-apps']; $document['title'] = $text['title-apps'];
//get variables used to control the order //get variables used to control the order
$order_by = check_str($_GET["order_by"]); $order_by = $_GET["order_by"];
$order = check_str($_GET["order"]); $order = $_GET["order"];
//get the list of installed apps from the core and mod directories //get the list of installed apps from the core and mod directories
$config_list = glob($_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH . "/*/*/app_config.php"); $config_list = glob($_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH . "/*/*/app_config.php");

View File

@ -39,14 +39,10 @@ else {
$text = $language->get(); $text = $language->get();
//get the id //get the id
if (count($_GET) > 0) { if (is_uuid($_GET["id"]) {
$id = check_str($_GET["id"]);
}
if (strlen($id) > 0) {
if (count($_GET)>0 && $_POST["persistformvar"] != "true") {
$app_uuid = $_GET["id"]; $app_uuid = $_GET["id"];
//get the list of installed apps from the core and mod directories //get the list of installed apps from the core and mod directories
$config_list = glob($_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH . "/*/*/app_config.php"); $config_list = glob($_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH . "/*/*/app_config.php");
$x=0; $x=0;
@ -60,36 +56,45 @@ if (strlen($id) > 0) {
$name = $row['name']; $name = $row['name'];
if ($row["uuid"] == $app_uuid && $row['category'] != "Core") { if ($row["uuid"] == $app_uuid && $row['category'] != "Core") {
//delete the app from the menu //delete the app from the menu
foreach ($row['menu'] as &$menu) { foreach ($row['menu'] as $index => &$menu) {
//delete menu groups and permissions from the database //delete menu groups and permissions from the database
$sql = "delete from v_menu_item_groups "; $array['menu_item_groups'][$index]['menu_item_uuid'] = $menu['uuid'];
$sql .= "where menu_item_uuid = '".$menu['uuid']."' "; $array['menu_items'][$index['menu_item_uuid'] = $menu['uuid'];
$db->query($sql);
$sql = "delete from v_menu_items ";
$sql .= "where menu_item_uuid = '".$menu['uuid']."' ";
$db->query($sql);
//delete the app from the file system //delete the app from the file system
if (strlen($menu['path']) > 0) { if (strlen($menu['path']) > 0) {
system('rm -rf '.dirname($_SERVER["DOCUMENT_ROOT"].PROJECT_PATH.$menu['path'])); system('rm -rf '.dirname($_SERVER["DOCUMENT_ROOT"].PROJECT_PATH.$menu['path']));
} }
} }
if (is_array($array) && sizeof($array) != 0) {
$database = new database;
$database->app_name = 'apps';
$database->app_uuid = 'd8704214-75a0-e52f-1336-f0780e29fef8';
$database->delete($array);
unset($array);
}
//delete the group permissions for the app //delete the group permissions for the app
foreach ($row['permissions'] as &$permission) { foreach ($row['permissions'] as $index => &$permission) {
$sql = "delete from v_group_permissions "; $array['group_permissions'][$index]['permission_name'] = $permission['name'];
$sql .= "where permission_name = '".$permission['name']."' "; }
$db->query($sql); if (is_array($array) && sizeof($array) != 0) {
$database = new database;
$database->app_name = 'apps';
$database->app_uuid = 'd8704214-75a0-e52f-1336-f0780e29fef8';
$database->delete($array);
unset($array);
} }
} }
} }
} }
//set message
message::add($text['message-delete']);
} }
}
//redirect the browser //redirect the browser
message::add($text['message-delete']);
header("Location: apps.php"); header("Location: apps.php");
return; return;

View File

@ -39,9 +39,9 @@ else {
$text = $language->get(); $text = $language->get();
//action add or update //action add or update
if (isset($_REQUEST["id"])) { if (is_uuid($_REQUEST["id"])) {
$action = "update"; $action = "update";
$app_uuid = check_str($_REQUEST["id"]); $app_uuid = $_REQUEST["id"];
} }
else { else {
$action = "add"; $action = "add";
@ -49,14 +49,14 @@ else {
//get http post variables and set them to php variables //get http post variables and set them to php variables
if (count($_POST)>0) { if (count($_POST)>0) {
$app_enabled = check_str($_POST["app_enabled"]); $app_enabled = $_POST["app_enabled"];
} }
if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
$msg = ''; $msg = '';
if ($action == "update") { if ($action == "update") {
$app_uuid = check_str($_POST["app_uuid"]); $app_uuid = $_POST["app_uuid"];
} }
//check for all required data //check for all required data
@ -77,35 +77,27 @@ 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") {
if ($action == "add") { if ($action == "add") {
$sql = "insert into v_apps "; $array['apps'][0]['app_uuid'] = uuid();
$sql .= "(";
$sql .= "app_uuid ";
$sql .= ")";
$sql .= "values ";
$sql .= "(";
$sql .= "'".uuid()."' ";
$sql .= ")";
//$db->exec(check_sql($sql));
unset($sql);
message::add($text['message-add']); message::add($text['message-add']);
header("Location: apps.php"); }
return;
} //if ($action == "add")
if ($action == "update") { if ($action == "update") {
$sql = "update v_apps set "; $array['apps'][0]['app_uuid'] = $app_uuid;
$sql .= "app_uuid = '$app_uuid' ";
$sql .= "where app_uuid = '$app_uuid'";
//$db->exec(check_sql($sql));
unset($sql);
message::add($text['message-update']); message::add($text['message-update']);
header("Location: apps.php"); }
return;
} //if ($action == "update") if (is_array($array) && sizeof($array) != 0) {
} //if ($_POST["persistformvar"] != "true") $database = new database;
} //(count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) $database->app_name = 'apps';
$database->app_uuid = 'd8704214-75a0-e52f-1336-f0780e29fef8';
$database->save($array);
unset($array);
}
header("Location: apps.php");
exit;
}
}
//show the header //show the header
require_once "resources/header.php"; require_once "resources/header.php";

View File

@ -38,23 +38,20 @@ else {
$language = new text; $language = new text;
$text = $language->get(); $text = $language->get();
//get the id
if (count($_GET) > 0) {
$id = check_str($_GET["id"]);
}
//delete the records //delete the records
if (strlen($id) > 0) { if (is_uuid($_GET["id"])) {
$sql = ""; $database_uuid = $_GET["id"];
$sql .= "delete from v_databases "; $array['databases'][0]['database_uuid'] = $database_uuid;
$sql .= "where database_uuid = '$id' "; $database = new database;
$prep_statement = $db->prepare(check_sql($sql)); $database->app_name = 'databases';
$prep_statement->execute(); $database->app_uuid = '8d229b6d-1383-fcec-74c6-4ce1682479e2';
unset($sql); $database->delete($array);
unset($array);
message::add($text['message-delete']);
} }
//redirect the browser //redirect the browser
message::add($text['message-delete']);
header("Location: databases.php"); header("Location: databases.php");
return; return;

View File

@ -39,9 +39,9 @@ else {
$text = $language->get(); $text = $language->get();
//action add or update //action add or update
if (isset($_REQUEST["id"])) { if (is_uuid($_REQUEST["id"])) {
$action = "update"; $action = "update";
$database_uuid = check_str($_REQUEST["id"]); $database_uuid = $_REQUEST["id"];
} }
else { else {
$action = "add"; $action = "add";
@ -60,22 +60,22 @@ else {
//get http post variables and set them to php variables //get http post variables and set them to php variables
if (count($_POST)>0) { if (count($_POST)>0) {
$database_driver = check_str($_POST["database_driver"]); $database_driver = $_POST["database_driver"];
$database_type = check_str($_POST["database_type"]); $database_type = $_POST["database_type"];
$database_host = check_str($_POST["database_host"]); $database_host = $_POST["database_host"];
$database_port = check_str($_POST["database_port"]); $database_port = $_POST["database_port"];
$database_name = check_str($_POST["database_name"]); $database_name = $_POST["database_name"];
$database_username = check_str($_POST["database_username"]); $database_username = $_POST["database_username"];
$database_password = check_str($_POST["database_password"]); $database_password = $_POST["database_password"];
$database_path = check_str($_POST["database_path"]); $database_path = $_POST["database_path"];
$database_description = check_str($_POST["database_description"]); $database_description = $_POST["database_description"];
} }
if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
$msg = ''; $msg = '';
if ($action == "update") { if ($action == "update") {
$database_uuid = check_str($_POST["database_uuid"]); $database_uuid = $_POST["database_uuid"];
} }
//check for all required data //check for all required data
@ -103,39 +103,27 @@ 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") {
//begin array
$array['databases'][0]['database_driver'] = $database_driver;
$array['databases'][0]['database_type'] = $database_type;
$array['databases'][0]['database_host'] = $database_host;
$array['databases'][0]['database_port'] = $database_port;
$array['databases'][0]['database_name'] = $database_name;
$array['databases'][0]['database_username'] = $database_username;
$array['databases'][0]['database_password'] = $database_password;
$array['databases'][0]['database_path'] = $database_path;
$array['databases'][0]['database_description'] = $database_description;
if ($action == "add") { if ($action == "add") {
//add the data //add new uuid
$database_uuid = uuid(); $array['databases'][0]['database_uuid'] = uuid();
$sql = "insert into v_databases ";
$sql .= "("; $database = new database;
//$sql .= "domain_uuid, "; $database->app_name = 'databases';
$sql .= "database_uuid, "; $database->app_uuid = '8d229b6d-1383-fcec-74c6-4ce1682479e2';
$sql .= "database_driver, "; $database->save($array);
$sql .= "database_type, "; unset($array);
$sql .= "database_host, ";
$sql .= "database_port, ";
$sql .= "database_name, ";
$sql .= "database_username, ";
$sql .= "database_password, ";
$sql .= "database_path, ";
$sql .= "database_description ";
$sql .= ")";
$sql .= "values ";
$sql .= "(";
//$sql .= "'$domain_uuid', ";
$sql .= "'$database_uuid', ";
$sql .= "'$database_driver', ";
$sql .= "'$database_type', ";
$sql .= "'$database_host', ";
$sql .= "'$database_port', ";
$sql .= "'$database_name', ";
$sql .= "'$database_username', ";
$sql .= "'$database_password', ";
$sql .= "'$database_path', ";
$sql .= "'$database_description' ";
$sql .= ")";
$db->exec(check_sql($sql));
unset($sql);
//set the defaults //set the defaults
require_once "app_defaults.php"; require_once "app_defaults.php";
@ -143,24 +131,18 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
//redirect the browser //redirect the browser
message::add($text['message-add']); message::add($text['message-add']);
header("Location: databases.php"); header("Location: databases.php");
return; exit;
} //if ($action == "add") }
if ($action == "update") { if ($action == "update") {
//udpate the database //add uuid to update
$sql = "update v_databases set "; $array['databases'][0]['database_uuid'] = $database_uuid;
$sql .= "database_type = '$database_type', ";
$sql .= "database_driver = '$database_driver', "; $database = new database;
$sql .= "database_host = '$database_host', "; $database->app_name = 'databases';
$sql .= "database_port = '$database_port', "; $database->app_uuid = '8d229b6d-1383-fcec-74c6-4ce1682479e2';
$sql .= "database_name = '$database_name', "; $database->save($array);
$sql .= "database_username = '$database_username', "; unset($array);
$sql .= "database_password = '$database_password', ";
$sql .= "database_path = '$database_path', ";
$sql .= "database_description = '$database_description' ";
$sql .= "where database_uuid = '$database_uuid' ";
$db->exec(check_sql($sql));
unset($sql);
//set the defaults //set the defaults
$domains_processed = 1; $domains_processed = 1;
@ -169,20 +151,20 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
//redirect the browser //redirect the browser
message::add($text['message-update']); message::add($text['message-update']);
header("Location: databases.php"); header("Location: databases.php");
return; exit;
} //if ($action == "update") }
} //if ($_POST["persistformvar"] != "true") }
} //(count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) }
//pre-populate the form //pre-populate the form
if (count($_GET)>0 && $_POST["persistformvar"] != "true") { if (count($_GET)>0 && $_POST["persistformvar"] != "true") {
$database_uuid = $_GET["id"]; $database_uuid = $_GET["id"];
$sql = "select * from v_databases "; $sql = "select * from v_databases ";
$sql .= "where database_uuid = '$database_uuid' "; $sql .= "where database_uuid = :database_uuid ";
$prep_statement = $db->prepare(check_sql($sql)); $parameters['database_uuid'] = $database_uuid;
$prep_statement->execute(); $database = new database;
$result = $prep_statement->fetchAll(PDO::FETCH_NAMED); $row = $database->select($sql, $parameters, 'row');
foreach ($result as &$row) { if (is_array($row) && sizeof($row) != 0) {
$database_driver = $row["database_driver"]; $database_driver = $row["database_driver"];
$database_type = $row["database_type"]; $database_type = $row["database_type"];
$database_host = $row["database_host"]; $database_host = $row["database_host"];
@ -192,9 +174,8 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
$database_password = $row["database_password"]; $database_password = $row["database_password"];
$database_path = $row["database_path"]; $database_path = $row["database_path"];
$database_description = $row["database_description"]; $database_description = $row["database_description"];
break; //limit to 1 row
} }
unset ($prep_statement); unset($sql, $parameters, $row);
} }
//show the header //show the header

View File

@ -61,19 +61,11 @@ else {
echo "</table>\n"; echo "</table>\n";
//prepare to page the results //prepare to page the results
$sql = " select count(*) as num_rows from v_databases "; $sql = "select count(*) from v_databases ";
if (strlen($order_by)> 0) { $sql .= "order by $order_by $order "; } $sql .= order_by($order_by, $order);
$prep_statement = $db->prepare($sql); $database = new database;
if ($prep_statement) { $num_rows = $database->select($sql, null, 'column');
$prep_statement->execute(); unset($sql);
$row = $prep_statement->fetch(PDO::FETCH_ASSOC);
if ($row['num_rows'] > 0) {
$num_rows = $row['num_rows'];
}
else {
$num_rows = '0';
}
}
//prepare to page the results //prepare to page the results
$rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50; $rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50;
@ -85,13 +77,11 @@ else {
//get the list //get the list
$sql = "select * from v_databases "; $sql = "select * from v_databases ";
if (strlen($order_by)> 0) { $sql .= "order by $order_by $order "; } $sql .= order_by($order_by, $order);
$sql .= "limit $rows_per_page offset $offset "; $sql .= limit_offset($rows_per_page, $offset);
$prep_statement = $db->prepare(check_sql($sql)); $database = new database;
$prep_statement->execute(); $result = $database->select($sql, null, 'all');
$result = $prep_statement->fetchAll(PDO::FETCH_NAMED); unset($sql);
$result_count = count($result);
unset ($prep_statement, $sql);
$c = 0; $c = 0;
$row_style["0"] = "row_style0"; $row_style["0"] = "row_style0";
@ -113,7 +103,7 @@ else {
echo "</td>\n"; echo "</td>\n";
echo "</tr>\n"; echo "</tr>\n";
if ($result_count > 0) { if (is_array($result) && sizeof($result) != 0) {
foreach($result as $row) { foreach($result as $row) {
$tr_link = "href='database_edit.php?id=".$row['database_uuid']."'"; $tr_link = "href='database_edit.php?id=".$row['database_uuid']."'";
echo "<tr ".$tr_link.">\n"; echo "<tr ".$tr_link.">\n";
@ -132,7 +122,7 @@ else {
echo "</tr>\n"; echo "</tr>\n";
if ($c==0) { $c=1; } else { $c=0; } if ($c==0) { $c=1; } else { $c=0; }
} //end foreach } //end foreach
unset($sql, $result, $row_count); unset($result);
} //end if results } //end if results
echo "<tr>\n"; echo "<tr>\n";

View File

@ -43,24 +43,24 @@
$text = $language->get(); $text = $language->get();
//action add or update //action add or update
if (isset($_REQUEST["id"])) { if (is_uuid($_REQUEST["id"])) {
$action = "update"; $action = "update";
$default_setting_uuid = check_str($_REQUEST["id"]); $default_setting_uuid = $_REQUEST["id"];
} }
else { else {
$action = "add"; $action = "add";
} }
$search = check_str($_REQUEST['search']); $search = $_REQUEST['search'];
//get http post variables and set them to php variables //get http post variables and set them to php variables
if (count($_REQUEST) > 0) { if (count($_REQUEST) > 0) {
$default_setting_category = strtolower(check_str($_REQUEST["default_setting_category"])); $default_setting_category = strtolower($_REQUEST["default_setting_category"]);
$default_setting_subcategory = strtolower(check_str($_POST["default_setting_subcategory"])); $default_setting_subcategory = strtolower($_POST["default_setting_subcategory"]);
$default_setting_name = strtolower(check_str($_POST["default_setting_name"])); $default_setting_name = strtolower($_POST["default_setting_name"]);
$default_setting_value = check_str($_POST["default_setting_value"]); $default_setting_value = $_POST["default_setting_value"];
$default_setting_order = check_str($_POST["default_setting_order"]); $default_setting_order = $_POST["default_setting_order"];
$default_setting_enabled = check_str($_POST["default_setting_enabled"]); $default_setting_enabled = $_POST["default_setting_enabled"];
$default_setting_description = check_str($_POST["default_setting_description"]); $default_setting_description = $_POST["default_setting_description"];
} }
//process the http post //process the http post
@ -68,7 +68,7 @@
//set the default_setting_uuid //set the default_setting_uuid
if ($action == "update") { if ($action == "update") {
$default_setting_uuid = check_str($_POST["default_setting_uuid"]); $default_setting_uuid = $_POST["default_setting_uuid"];
} }
else { else {
$default_setting_uuid = uuid(); $default_setting_uuid = uuid();
@ -104,30 +104,31 @@
//update switch timezone variables //update switch timezone variables
if ($default_setting_category == "domain" && $default_setting_subcategory == "time_zone" && $default_setting_name == "name" ) { if ($default_setting_category == "domain" && $default_setting_subcategory == "time_zone" && $default_setting_name == "name" ) {
//get the action //get the action
$sql = "select * from v_vars "; $sql = "select count(*) from v_vars ";
$sql .= "where var_name = 'timezone' "; $sql .= "where var_name = 'timezone' ";
$prep_statement = $db->prepare(check_sql($sql)); $database = new database;
$prep_statement->execute(); $num_rows = $database->select($sql, null, 'column');
$result = $prep_statement->fetchAll(PDO::FETCH_NAMED); unset($sql);
$var_action = "add"; //update
foreach ($result as $row) { if ($num_rows != 0) {
$var_action = "update";
}
unset ($prep_statement);
//update the timezone
if ($var_action == "update") {
$sql = "update v_vars "; $sql = "update v_vars ";
$sql .= "set var_value = '".$default_setting_value."' "; $sql .= "set var_value = :default_setting_value ";
$sql .= "where var_name = 'timezone' "; $sql .= "where var_name = 'timezone' ";
$parameters['default_setting_value'] = $default_setting_value;
} }
//insert
else { else {
$sql = "insert into v_vars "; $sql = "insert into v_vars ";
$sql .= "(var_uuid, var_name, var_value, var_category, var_command, var_enabled) "; $sql .= "(var_uuid, var_name, var_value, var_category, var_command, var_enabled) ";
$sql .= "values ('".uuid()."', 'timezone', '$default_setting_value', 'Defaults', 'set', 'true'); "; $sql .= "values ('".uuid()."', 'timezone', :default_setting_value, 'Defaults', 'set', 'true'); ";
$parameters['default_setting_value'] = $default_setting_value;
} }
$db->query($sql); //execute
unset($sql); $database = new database;
$database->app_name = 'default_settings';
$database->app_uuid = '2c2453c0-1bea-4475-9f44-4d969650de09';
$database->execute($sql, $parameters);
unset($sql, $parameters);
//synchronize the configuration //synchronize the configuration
save_var_xml(); save_var_xml();
@ -167,13 +168,13 @@
//pre-populate the form //pre-populate the form
if (count($_GET) > 0 && $_POST["persistformvar"] != "true") { if (count($_GET) > 0 && $_POST["persistformvar"] != "true") {
$default_setting_uuid = check_str($_GET["id"]); $default_setting_uuid = $_GET["id"];
$sql = "select * from v_default_settings "; $sql = "select * from v_default_settings ";
$sql .= "where default_setting_uuid = '$default_setting_uuid' "; $sql .= "where default_setting_uuid = :default_setting_uuid ";
$prep_statement = $db->prepare(check_sql($sql)); $parameters['default_setting_uuid'] = $default_setting_uuid;
$prep_statement->execute(); $database = new database;
$default_settings = $prep_statement->fetchAll(PDO::FETCH_NAMED); $row = $database->select($sql, $parameters, 'row');
foreach ($default_settings as &$row) { if (is_array($row) && sizeof($row) != 0) {
$default_setting_category = $row["default_setting_category"]; $default_setting_category = $row["default_setting_category"];
$default_setting_subcategory = $row["default_setting_subcategory"]; $default_setting_subcategory = $row["default_setting_subcategory"];
$default_setting_name = $row["default_setting_name"]; $default_setting_name = $row["default_setting_name"];
@ -181,9 +182,8 @@
$default_setting_order = $row["default_setting_order"]; $default_setting_order = $row["default_setting_order"];
$default_setting_enabled = $row["default_setting_enabled"]; $default_setting_enabled = $row["default_setting_enabled"];
$default_setting_description = $row["default_setting_description"]; $default_setting_description = $row["default_setting_description"];
break; //limit to 1 row
} }
unset ($prep_statement); unset($sql, $parameters);
} }
//show the header //show the header
@ -297,21 +297,21 @@
} }
elseif ($category == "domain" && $subcategory == "menu" && $name == "uuid" ) { elseif ($category == "domain" && $subcategory == "menu" && $name == "uuid" ) {
echo " <select class='formfld' id='default_setting_value' name='default_setting_value' style=''>\n"; echo " <select class='formfld' id='default_setting_value' name='default_setting_value' style=''>\n";
$sql = "";
$sql .= "select * from v_menus "; $sql .= "select * from v_menus ";
$sql .= "order by menu_language, menu_name asc "; $sql .= "order by menu_language, menu_name asc ";
$sub_prep_statement = $db->prepare(check_sql($sql)); $database = new database;
$sub_prep_statement->execute(); $sub_result = $database->select($sql, null, 'all');
$sub_result = $sub_prep_statement->fetchAll(PDO::FETCH_NAMED); if (is_array($sub_result) && sizeof($sub_result) != 0) {
foreach ($sub_result as $sub_row) { foreach ($sub_result as $sub_row) {
if (strtolower($default_setting_value) == strtolower($sub_row["menu_uuid"])) { if (strtolower($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"; echo " <option value='".strtolower($sub_row["menu_uuid"])."' selected='selected'>".$sub_row["menu_language"]." - ".$sub_row["menu_name"]."\n";
} }
else { else {
echo " <option value='".strtolower($sub_row["menu_uuid"])."'>".$sub_row["menu_language"]." - ".$sub_row["menu_name"]."</option>\n"; echo " <option value='".strtolower($sub_row["menu_uuid"])."'>".$sub_row["menu_language"]." - ".$sub_row["menu_name"]."</option>\n";
}
} }
} }
unset ($sub_prep_statement); unset($sql, $sub_result, $sub_row);
echo " </select>\n"; echo " </select>\n";
} }
elseif ($category == "domain" && $subcategory == "template" && $name == "name" ) { elseif ($category == "domain" && $subcategory == "template" && $name == "name" ) {

View File

@ -46,27 +46,33 @@ else {
$toggled = 0; $toggled = 0;
if (is_array($default_setting_uuids) && sizeof($default_setting_uuids) > 0) { if (is_array($default_setting_uuids) && sizeof($default_setting_uuids) > 0) {
foreach ($default_setting_uuids as $default_setting_uuid) { foreach ($default_setting_uuids as $default_setting_uuid) {
//get current status if (is_uuid($default_setting_uuid)) {
$sql = "select default_setting_enabled from v_default_settings where default_setting_uuid = '".check_str($default_setting_uuid)."'"; //get current status
$prep_statement = $db->prepare(check_sql($sql)); $sql = "select default_setting_enabled from v_default_settings where default_setting_uuid = :default_setting_uuid ";
$prep_statement->execute(); $parameters['default_setting_uuid'] = $default_setting_uuid;
$row = $prep_statement->fetch(PDO::FETCH_NAMED); $database = new database;
$new_status = ($row['default_setting_enabled'] == 'true') ? 'false' : "true"; $default_setting_enabled = $database->select($sql, $parameters, 'column');
unset ($sql, $prep_statement, $row); $new_status = ($default_setting_enabled == 'true') ? 'false' : 'true';
//set new status unset($sql, $parameters);
$sql = "update v_default_settings set default_setting_enabled = '".$new_status."' where default_setting_uuid = '".check_str($default_setting_uuid)."'"; //set new status
$prep_statement = $db->prepare(check_sql($sql)); $array['default_settings'][0]['default_setting_uuid'] = $default_setting_uuid;
$prep_statement->execute(); $array['default_settings'][0]['default_setting_enabled'] = $new_status;
unset ($sql, $prep_statement); $database = new database;
$database->app_name = 'default_settings';
$toggled++; $database->app_uuid = '2c2453c0-1bea-4475-9f44-4d969650de09';
$database->save($array);
$message = $database->message;
unset($array);
//increment toggle total
$toggled++;
}
}
if ($toggled > 0) {
$_SESSION["message"] = $text['message-toggled'].': '.$toggled;
} }
} }
//redirect the user //redirect the user
if ($toggled > 0) { header("Location: default_settings.php".($search != '' ? '?search='.$search : null));
$_SESSION["message"] = $text['message-toggled'].': '.$toggled;
}
header("Location: default_settings.php".(($search != '') ? '?search='.$search : null));
?> ?>

View File

@ -44,38 +44,41 @@
//get posted values, if any //get posted values, if any
if (sizeof($_REQUEST) > 0) { if (sizeof($_REQUEST) > 0) {
$action = check_str($_REQUEST["action"]); $action = $_REQUEST["action"];
$default_setting_uuids = $_REQUEST["id"]; $default_setting_uuids = $_REQUEST["id"];
$enabled = check_str($_REQUEST['enabled']); $enabled = $_REQUEST['enabled'];
$category = check_str($_REQUEST['category']); $category = $_REQUEST['category'];
$search = check_str($_REQUEST['search']); $search = $_REQUEST['search'];
if (sizeof($default_setting_uuids) == 1 && $enabled != '') { if (sizeof($default_setting_uuids) == 1 && $enabled != '' && is_uuid($default_setting_uuids[0])) {
$sql = "update v_default_settings set "; $array['default_settings'][0]['default_setting_uuid'] = $default_setting_uuids[0];
$sql .= "default_setting_enabled = '".$enabled."' "; $array['default_settings'][0]['default_setting_enabled'] = $enabled;
$sql .= "where default_setting_uuid = '".$default_setting_uuids[0]."'"; $database = new database;
$db->exec(check_sql($sql)); $database->app_name = 'default_settings';
unset($sql); $database->app_uuid = '2c2453c0-1bea-4475-9f44-4d969650de09';
$database->save($array);
$message = $database->message;
unset($array);
message::add($text['message-update']); message::add($text['message-update']);
header("Location: default_settings.php".(($search != '') ? "?search=".escape($search) : null)."#anchor_".escape($category)); header("Location: default_settings.php".($search != '' ? "?search=".escape($search) : null)."#anchor_".escape($category));
exit; exit;
} }
if ($action == 'copy' && permission_exists('domain_setting_add')) { if ($action == 'copy' && permission_exists('domain_setting_add')) {
$target_domain_uuid = check_str($_POST["target_domain_uuid"]); $target_domain_uuid = $_POST["target_domain_uuid"];
if ($target_domain_uuid != '' && sizeof($default_setting_uuids) > 0) { if (is_uuid($target_domain_uuid) && sizeof($default_setting_uuids) > 0) {
$settings_copied = 0; $settings_copied = 0;
foreach ($default_setting_uuids as $default_setting_uuid) { foreach ($default_setting_uuids as $default_setting_uuid) {
// get default setting from db // get default setting from db
$sql = "select * from v_default_settings "; $sql = "select * from v_default_settings ";
$sql .= "where default_setting_uuid = '".$default_setting_uuid."' "; $sql .= "where default_setting_uuid = :default_setting_uuid ";
$prep_statement = $db->prepare(check_sql($sql)); $parameters['default_setting_uuid'] = $default_setting_uuid;
$prep_statement->execute(); $database = new database;
$result = $prep_statement->fetchAll(PDO::FETCH_NAMED); $row = $database->select($sql, $parameters, 'row');
foreach ($result as &$row) { if (is_array($row) && sizeof($row) != 0) {
$default_setting_category = $row["default_setting_category"]; $default_setting_category = $row["default_setting_category"];
$default_setting_subcategory = $row["default_setting_subcategory"]; $default_setting_subcategory = $row["default_setting_subcategory"];
$default_setting_name = $row["default_setting_name"]; $default_setting_name = $row["default_setting_name"];
@ -84,7 +87,7 @@
$default_setting_enabled = $row["default_setting_enabled"]; $default_setting_enabled = $row["default_setting_enabled"];
$default_setting_description = $row["default_setting_description"]; $default_setting_description = $row["default_setting_description"];
} }
unset ($prep_statement); unset($sql, $parameters, $row);
//set a random password for http_auth_password //set a random password for http_auth_password
if ($default_setting_subcategory == "http_auth_password") { if ($default_setting_subcategory == "http_auth_password") {
@ -93,77 +96,54 @@
// check if exists // check if exists
$sql = "select domain_setting_uuid from v_domain_settings "; $sql = "select domain_setting_uuid from v_domain_settings ";
$sql .= "where domain_uuid = '".$target_domain_uuid."' "; $sql .= "where domain_uuid = :domain_uuid ";
$sql .= "and domain_setting_category = '".$default_setting_category."' "; $sql .= "and domain_setting_category = :domain_setting_category ";
$sql .= "and domain_setting_subcategory = '".$default_setting_subcategory."' "; $sql .= "and domain_setting_subcategory = :domain_setting_subcategory ";
$sql .= "and domain_setting_name = '".$default_setting_name."' "; $sql .= "and domain_setting_name = :domain_setting_name ";
$sql .= "and domain_setting_name <> 'array' "; $sql .= "and domain_setting_name <> 'array' ";
$prep_statement = $db->prepare(check_sql($sql)); $parameters['domain_uuid'] = $target_domain_uuid;
$prep_statement->execute(); $parameters['domain_setting_category'] = $default_setting_category;
$result = $prep_statement->fetchAll(PDO::FETCH_NAMED); $parameters['domain_setting_subcategory'] = $default_setting_subcategory;
if (sizeof($result) > 0) { $parameters['domain_setting_name'] = $default_setting_name;
foreach ($result as &$row) { $database = new database;
$target_domain_setting_uuid = $row["domain_setting_uuid"]; $target_domain_setting_uuid = $database->select($sql, $parameters, 'column');
break; $action = is_uuid($target_domain_setting_uuid) ? 'update' : 'add';
} unset($sql, $parameters);
$action = "update";
}
else {
$action = "add";
}
unset ($prep_statement);
// fix null // fix null
$default_setting_order = ($default_setting_order != '') ? $default_setting_order : 'null'; $default_setting_order = $default_setting_order != '' ? $default_setting_order : 'null';
// insert for target domain //begin array
$array['domain_settings'][0]['domain_uuid'] = $target_domain_uuid;
$array['domain_settings'][0]['domain_setting_category'] = $default_setting_category;
$array['domain_settings'][0]['domain_setting_subcategory'] = $default_setting_subcategory;
$array['domain_settings'][0]['domain_setting_name'] = $default_setting_name;
$array['domain_settings'][0]['domain_setting_value'] = $default_setting_value;
$array['domain_settings'][0]['domain_setting_order'] = $default_setting_order;
$array['domain_settings'][0]['domain_setting_enabled'] = $default_setting_enabled;
$array['domain_settings'][0]['domain_setting_description'] = $default_setting_description;
//insert
if ($action == "add" && permission_exists("domain_select") && permission_exists("domain_setting_add") && count($_SESSION['domains']) > 1) { if ($action == "add" && permission_exists("domain_select") && permission_exists("domain_setting_add") && count($_SESSION['domains']) > 1) {
$sql = "insert into v_domain_settings "; $array['domain_settings'][0]['domain_setting_uuid'] = uuid();
$sql .= "("; }
$sql .= "domain_uuid, "; //update
$sql .= "domain_setting_uuid, ";
$sql .= "domain_setting_category, ";
$sql .= "domain_setting_subcategory, ";
$sql .= "domain_setting_name, ";
$sql .= "domain_setting_value, ";
$sql .= "domain_setting_order, ";
$sql .= "domain_setting_enabled, ";
$sql .= "domain_setting_description ";
$sql .= ")";
$sql .= "values ";
$sql .= "(";
$sql .= "'".$target_domain_uuid."', ";
$sql .= "'".uuid()."', ";
$sql .= "'".$default_setting_category."', ";
$sql .= "'".$default_setting_subcategory."', ";
$sql .= "'".$default_setting_name."', ";
$sql .= "'".$default_setting_value."', ";
$sql .= " ".$default_setting_order." , ";
$sql .= "'".$default_setting_enabled."', ";
$sql .= "'".$default_setting_description."' ";
$sql .= ")";
$db->exec(check_sql($sql));
unset($sql);
$settings_copied++;
} // add
if ($action == "update" && permission_exists('domain_setting_edit')) { if ($action == "update" && permission_exists('domain_setting_edit')) {
$sql = "update v_domain_settings set "; $array['domain_settings'][0]['domain_setting_uuid'] = $target_domain_setting_uuid;
$sql .= "domain_setting_category = '".$default_setting_category."', "; }
$sql .= "domain_setting_subcategory = '".$default_setting_subcategory."', ";
$sql .= "domain_setting_name = '".$default_setting_name."', "; //execute
$sql .= "domain_setting_value = '".$default_setting_value."', "; if (is_uuid($array['domain_settings'][0]['domain_setting_uuid'])) {
$sql .= "domain_setting_order = ".$default_setting_order.", "; $database = new database;
$sql .= "domain_setting_enabled = '".$default_setting_enabled."', "; $database->app_name = 'default_settings';
$sql .= "domain_setting_description = '".$default_setting_description."' "; $database->app_uuid = '2c2453c0-1bea-4475-9f44-4d969650de09';
$sql .= "where domain_uuid = '".$target_domain_uuid."' "; $database->save($array);
$sql .= "and domain_setting_uuid = '".$target_domain_setting_uuid."' "; $message = $database->message;
$db->exec(check_sql($sql)); unset($array);
unset($sql);
$settings_copied++; $settings_copied++;
} // update }
} // foreach } // foreach
// set message // set message
@ -174,21 +154,24 @@
message::add($text['message-copy_failed']); message::add($text['message-copy_failed']);
} }
header("Location: default_settings.php".(($search != '') ? "?search=".escape($search) : null)); header("Location: default_settings.php".($search != '' ? "?search=".escape($search) : null));
exit; exit;
} }
if ($action == 'delete' && permission_exists('default_setting_delete')) { if ($action == 'delete' && permission_exists('default_setting_delete')) {
if (sizeof($default_setting_uuids) > 0) { if (sizeof($default_setting_uuids) > 0) {
foreach ($default_setting_uuids as $default_setting_uuid) { foreach ($default_setting_uuids as $index => $default_setting_uuid) {
//delete default_setting(s) //delete default_setting(s)
$sql = "delete from v_default_settings "; $array['default_settings'][$index]['default_setting_uuid'] = $default_setting_uuid;
$sql .= "where default_setting_uuid = '".$default_setting_uuid."' "; }
$prep_statement = $db->prepare(check_sql($sql)); if (is_array($array)) {
$prep_statement->execute(); $database = new database;
unset($sql); $database->app_name = 'default_settings';
$database->app_uuid = '2c2453c0-1bea-4475-9f44-4d969650de09';
$database->delete($array);
$message = $database->message;
unset($array);
} }
// set message // set message
$_SESSION["message"] = $text['message-delete'].": ".sizeof($default_setting_uuids); $_SESSION["message"] = $text['message-delete'].": ".sizeof($default_setting_uuids);
} }
@ -298,18 +281,10 @@
echo "<br>"; echo "<br>";
//prepare to page the results //prepare to page the results
$sql = "select count(*) as num_rows from v_default_settings "; $sql = "select count(*) from v_default_settings ";
$prep_statement = $db->prepare($sql); $database = new database;
if ($prep_statement) { $num_rows = $database->select($sql, null, 'column');
$prep_statement->execute(); unset($sql);
$row = $prep_statement->fetch(PDO::FETCH_ASSOC);
if ($row['num_rows'] > 0) {
$num_rows = $row['num_rows'];
}
else {
$num_rows = '0';
}
}
//prepare to page the results //prepare to page the results
$rows_per_page = 1000; $rows_per_page = 1000;
@ -321,24 +296,22 @@
//get the list //get the list
$sql = "select * from v_default_settings "; $sql = "select * from v_default_settings ";
if (strlen($order_by) == 0) { if ($order_by == '') {
$sql .= "order by default_setting_category, default_setting_subcategory, default_setting_order asc, default_setting_name, default_setting_value "; $sql .= "order by default_setting_category, default_setting_subcategory, default_setting_order asc, default_setting_name, default_setting_value ";
} }
else { else {
$sql .= "order by $order_by $order "; $sql .= order_by($order_by, $order);
} }
$sql .= "limit $rows_per_page offset $offset "; $sql .= limit_offset($rows_per_page, $offset);
$prep_statement = $db->prepare(check_sql($sql)); $database = new database;
$prep_statement->execute(); $result = $database->select($sql, null, 'all');
$result = $prep_statement->fetchAll(PDO::FETCH_NAMED); unset($sql);
$result_count = count($result);
unset ($prep_statement, $sql);
$c = 0; $c = 0;
$row_style["0"] = "row_style0"; $row_style["0"] = "row_style0";
$row_style["1"] = "row_style1"; $row_style["1"] = "row_style1";
if ($result_count > 0) { if (is_array($result) && sizeof($result) != 0) {
$previous_category = ''; $previous_category = '';
foreach($result as $row) { foreach($result as $row) {
@ -403,14 +376,14 @@
$name = $row['default_setting_name']; $name = $row['default_setting_name'];
if ($category == "domain" && $subcategory == "menu" && $name == "uuid" ) { if ($category == "domain" && $subcategory == "menu" && $name == "uuid" ) {
$sql = "select * from v_menus "; $sql = "select * from v_menus ";
$sql .= "where menu_uuid = '".$row['default_setting_value']."' "; $sql .= "where menu_uuid = :menu_uuid ";
$sub_prep_statement = $db->prepare(check_sql($sql)); $parameters['menu_uuid'] = $row['default_setting_value'];
$sub_prep_statement->execute(); $database = new database;
$sub_result = $sub_prep_statement->fetchAll(PDO::FETCH_NAMED); $sub_result = $database->select($sql, $parameters, 'all');
unset ($prep_statement, $sql);
foreach ($sub_result as &$sub_row) { foreach ($sub_result as &$sub_row) {
echo $sub_row["menu_language"]." - ".$sub_row["menu_name"]."\n"; echo $sub_row["menu_language"]." - ".$sub_row["menu_name"]."\n";
} }
unset($sql, $sub_result, $sub_row);
} }
else if ($category == "domain" && $subcategory == "template" && $name == "name" ) { else if ($category == "domain" && $subcategory == "template" && $name == "name" ) {
echo " ".ucwords($row['default_setting_value']); echo " ".ucwords($row['default_setting_value']);

View File

@ -38,7 +38,7 @@ else {
$language = new text; $language = new text;
$text = $language->get(); $text = $language->get();
$search = check_str($_REQUEST['search']); $search = $_REQUEST['search'];
require "resources/classes/domains.php"; require "resources/classes/domains.php";
$domain = new domains(); $domain = new domains();
@ -46,6 +46,6 @@ $domain->db = $db;
$domain->set(); $domain->set();
message::add($text['message-settings_reloaded']); message::add($text['message-settings_reloaded']);
header("Location: default_settings.php".(($search != '') ? "?search=".$search : null)); header("Location: default_settings.php".($search != '' ? "?search=".$search : null));
?> ?>

View File

@ -1813,6 +1813,9 @@ include "root.php";
private function singular($word) { private function singular($word) {
//"-es" is used for words that end in "-x", "-s", "-z", "-sh", "-ch" in which case you add //"-es" is used for words that end in "-x", "-s", "-z", "-sh", "-ch" in which case you add
if (substr($word, -2) == "es") { if (substr($word, -2) == "es") {
if (substr($word, -3) == "ses") {
return rtrim($word, "s");
}
if (substr($word, -3) == "ies") { if (substr($word, -3) == "ies") {
return substr($word,0,-3)."y"; return substr($word,0,-3)."y";
} }