diff --git a/core/domain_settings/domain_setting_edit.php b/core/domain_settings/domain_setting_edit.php index 7119ce5a12..03c8602d03 100644 --- a/core/domain_settings/domain_setting_edit.php +++ b/core/domain_settings/domain_setting_edit.php @@ -391,6 +391,9 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { echo "\n"; echo "\n"; if (permission_exists('domain_setting_category_edit')) { + if ($action == 'add') { + $domain_setting_category = $_GET['domain_setting_category']; + } echo " \n"; } else { diff --git a/core/domain_settings/domain_settings.php b/core/domain_settings/domain_settings.php index 01f7fb2830..4301e93809 100644 --- a/core/domain_settings/domain_settings.php +++ b/core/domain_settings/domain_settings.php @@ -37,59 +37,46 @@ exit; } -//toggle enabled - if (sizeof($_REQUEST) > 1) { +//get posted values, if any + if (is_array($_REQUEST) && @sizeof($_REQUEST) > 1) { //get the variables $action = $_REQUEST["action"]; - $domain_uuid = $_REQUEST["domain_id"]; + $domain_uuid = $_REQUEST["domain_uuid"]; $domain_setting_uuids = $_REQUEST["id"]; $enabled = $_REQUEST['enabled']; - //change enabled value - if ( - permission_exists('domain_setting_edit') && - is_uuid($domain_uuid) && - is_array($domain_setting_uuids) && - sizeof($domain_setting_uuids) == 1 && - ($enabled == 'true' || $enabled == 'false') - ) { - $array['domain_settings'][0]['domain_setting_uuid'] = $domain_setting_uuids[0]; - $array['domain_settings'][0]['domain_setting_enabled'] = $enabled; - $database = new database; - $database->app_name = 'domains'; - $database->app_uuid = 'b31e723a-bf70-670c-a49b-470d2a232f71'; - $database->save($array); - unset($array); - - message::add($text['message-update']); - header("Location: ".PROJECT_PATH."/core/domains/domain_edit.php?id=".$domain_uuid); + //validate the token + $token = new token; + if (!$token->validate(PROJECT_PATH."/core/domains/domain_edit.php")) { + message::add($text['message-invalid_token'],'negative'); + header("Location: ".PROJECT_PATH."/core/domains/domains.php"); exit; } - //copy domain settings - if ($action == 'copy' && permission_exists('domain_setting_add')) { + //copy (to a different domain) + if ($action == 'copy' && permission_exists('domain_select') && count($_SESSION['domains']) > 1) { $target_domain_uuid = $_POST["target_domain_uuid"]; - if (is_uuid($target_domain_uuid) && is_array($domain_setting_uuids) && sizeof($domain_setting_uuids) != 0) { - foreach ($domain_setting_uuids as $index => $domain_setting_uuid) { + if (is_uuid($target_domain_uuid) && is_array($domain_setting_uuids) && @sizeof($domain_setting_uuids) > 0) { + $settings_copied = 0; + foreach ($domain_setting_uuids as $domain_setting_uuid) { if (is_uuid($domain_setting_uuid)) { - // get default setting from db + //get domain setting from db $sql = "select * from v_domain_settings "; $sql .= "where domain_setting_uuid = :domain_setting_uuid "; $parameters['domain_setting_uuid'] = $domain_setting_uuid; $database = new database; $row = $database->select($sql, $parameters, 'row'); if (is_array($row) && sizeof($row) != 0) { - $domain_setting_uuid = $row["default_setting_uuid"]; - $domain_setting_category = $row["default_setting_category"]; - $domain_setting_subcategory = $row["default_setting_subcategory"]; - $domain_setting_name = $row["default_setting_name"]; - $domain_setting_value = $row["default_setting_value"]; - $domain_setting_order = $row["default_setting_order"]; - $domain_setting_enabled = $row["default_setting_enabled"]; - $domain_setting_description = $row["default_setting_description"]; + $domain_setting_category = $row["domain_setting_category"]; + $domain_setting_subcategory = $row["domain_setting_subcategory"]; + $domain_setting_name = $row["domain_setting_name"]; + $domain_setting_value = $row["domain_setting_value"]; + $domain_setting_order = $row["domain_setting_order"]; + $domain_setting_enabled = $row["domain_setting_enabled"]; + $domain_setting_description = $row["domain_setting_description"]; } unset($sql, $parameters, $row); @@ -111,57 +98,89 @@ $parameters['domain_setting_name'] = $domain_setting_name; $database = new database; $target_domain_setting_uuid = $database->select($sql, $parameters, 'column'); - if (is_uuid($target_domain_setting_uuid)) { - $action = "update"; - } - else { - $action = "add"; - $target_domain_setting_uuid = uuid(); - } + + $action = is_uuid($target_domain_setting_uuid) ? 'update' : 'add'; unset($sql, $parameters); // fix null - $domain_setting_order = $domain_setting_order != '' ? $domain_setting_order : null; + $default_setting_order = $default_setting_order != '' ? $default_setting_order : null; - //prepare the array - $array['domain_settings'][$index]['domain_uuid'] = $target_domain_uuid; - $array['domain_settings'][$index]['domain_setting_uuid'] = $target_domain_setting_uuid; - $array['domain_settings'][$index]['default_setting_category'] = $default_setting_category; - $array['domain_settings'][$index]['domain_setting_uuid'] = $default_setting_subcategory; - $array['domain_settings'][$index]['domain_setting_uuid'] = $default_setting_name; - $array['domain_settings'][$index]['domain_setting_uuid'] = $default_setting_value; - $array['domain_settings'][$index]['domain_setting_uuid'] = $default_setting_order; - $array['domain_settings'][$index]['domain_setting_uuid'] = $default_setting_enabled; - $array['domain_settings'][$index]['domain_setting_uuid'] = $default_setting_description; + //begin array + $array['domain_settings'][0]['domain_uuid'] = $target_domain_uuid; + $array['domain_settings'][0]['domain_setting_category'] = $domain_setting_category; + $array['domain_settings'][0]['domain_setting_subcategory'] = $domain_setting_subcategory; + $array['domain_settings'][0]['domain_setting_name'] = $domain_setting_name; + $array['domain_settings'][0]['domain_setting_value'] = $domain_setting_value; + $array['domain_settings'][0]['domain_setting_order'] = $domain_setting_order; + $array['domain_settings'][0]['domain_setting_enabled'] = $domain_setting_enabled; + $array['domain_settings'][0]['domain_setting_description'] = $domain_setting_description; + + //insert + if ($action == "add" && permission_exists("domain_setting_add")) { + $array['domain_settings'][0]['domain_setting_uuid'] = uuid(); + } + //update + if ($action == "update" && permission_exists('domain_setting_edit')) { + $array['domain_settings'][0]['domain_setting_uuid'] = $target_domain_setting_uuid; + } + + //execute + if (is_uuid($array['domain_settings'][0]['domain_setting_uuid'])) { + $database = new database; + $database->app_name = 'domain_settings'; + $database->app_uuid = 'b31e723a-bf70-670c-a49b-470d2a232f71'; + $database->save($array); + unset($array); + + $settings_copied++; + } } - } // foreach - - //save the data - if (is_array($array) && sizeof($array) != 0) { - $database = new database; - $database->app_name = 'domain_settings'; - $database->app_uuid = 'b31e723a-bf70-670c-a49b-470d2a232f71'; - $database->save($array); - $message = $database->message; - - // set message - message::add($text['message-copy'].": ".sizeof($array)); - - unset($array); } - } - else { + // set message - message::add($text['message-copy_failed']); + message::add($text['message-copy'].": ".escape($settings_copied)); } - - header("Location: ".PROJECT_PATH."/core/domains/domains.php".($search != '' ? "?search=".escape($search) : null)); + + header("Location: ".PROJECT_PATH."/core/domains/domain_edit.php?id=".escape($_REQUEST["domain_uuid"])); exit; } - //delete domain settings + //toggle + $toggled = 0; + if ($action == 'toggle' && is_array($domain_setting_uuids) && sizeof($domain_setting_uuids) > 0) { + foreach ($domain_setting_uuids as $domain_setting_uuid) { + if (is_uuid($domain_setting_uuid)) { + //get current status + $sql = "select domain_setting_enabled from v_domain_settings where domain_setting_uuid = :domain_setting_uuid "; + $parameters['domain_setting_uuid'] = $domain_setting_uuid; + $database = new database; + $domain_setting_enabled = $database->select($sql, $parameters, 'column'); + $new_status = $domain_setting_enabled == 'true' ? 'false' : 'true'; + unset($sql, $parameters); + //set new status + $array['domain_settings'][0]['domain_setting_uuid'] = $domain_setting_uuid; + $array['domain_settings'][0]['domain_setting_enabled'] = $new_status; + $database = new database; + $database->app_name = 'domain_settings'; + $database->app_uuid = '2c2453c0-1bea-4475-9f44-4d969650de09'; + $database->save($array); + $message = $database->message; + unset($array); + //increment toggle total + $toggled++; + } + } + if ($toggled > 0) { + message::add($text['message-toggle'].': '.$toggled); + } + + header("Location: ".PROJECT_PATH."/core/domains/domain_edit.php?id=".escape($_REQUEST["domain_uuid"])); + exit; + } + + //delete if ($action == 'delete' && permission_exists('domain_setting_delete')) { //add multi-lingual support $language = new text; @@ -186,10 +205,6 @@ unset($array); } } - else { - // set message - message::add($text['message-delete_failed'], 'negative'); - } header("Location: ".PROJECT_PATH."/core/domains/domain_edit.php?id=".escape($_REQUEST["domain_uuid"])); exit; @@ -203,11 +218,6 @@ $order_by = $_GET["order_by"]; $order = $_GET["order"]; -//show the content - echo "
"; - echo ""; - echo ""; - //prepare to page the results $sql = "select count(*) from v_domain_settings "; $sql .= "where domain_uuid = :domain_uuid "; @@ -236,23 +246,80 @@ $sql .= limit_offset($rows_per_page, $offset); $database = new database; $result = $database->select($sql, $parameters, 'all'); - $result_count = sizeof($result); unset($sql, $parameters); $c = 0; $row_style["0"] = "row_style0"; $row_style["1"] = "row_style1"; +//copy settings javascript + if ( + permission_exists("domain_select") && + permission_exists("domain_setting_add") && + is_array($_SESSION['domains']) && + @sizeof($_SESSION['domains']) > 1 + ) { + echo ""; + } + //show the content + echo ""; + echo "\n"; + echo ""; + + echo "
\n"; + if (permission_exists('domain_setting_add')) { + echo " "; + } + if (is_array($result) && @sizeof($result) != 0) { + if (permission_exists("domain_select") && permission_exists("domain_setting_add") && count($_SESSION['domains']) > 1) { + echo " "; + echo " "; + echo " \n"; + echo " "; + } + if (permission_exists('default_setting_edit')) { + echo " "; + } + if (permission_exists('default_setting_delete')) { + echo " "; + } + } + echo "
\n"; + echo "".$text['header-domain_settings'].""; + echo "

\n"; + echo "\n"; - if (is_array($result) && sizeof($result) != 0) { + if (is_array($result) && @sizeof($result) != 0) { $previous_category = ''; foreach($result as $row) { if ($previous_category != $row['domain_setting_category']) { $c = 0; echo "\n"; - echo " "; echo ""; echo ""; - echo "\n"; echo "\n"; @@ -357,64 +421,54 @@ } echo " \n"; echo " \n"; echo " \n"; - echo " \n"; echo "\n"; $previous_category = $row['domain_setting_category']; - if ($c==0) { $c=1; } else { $c=0; } - } //end foreach + $c = $c ? 0 : 1; + } unset($sql, $result, $row_count); - } //end if results + } echo "\n"; - echo "\n"; - echo "\n"; - echo "
\n"; + echo " \n"; if ($previous_category != '') { echo "

\n"; } @@ -279,12 +346,9 @@ echo "		".$text['label-value']."".$text['label-enabled']."".$text['label-description'].""; + echo " \n"; if (permission_exists('domain_setting_add')) { - echo "".$v_link_label_add.""; - } - if (permission_exists('domain_setting_delete')) { - echo "".$v_link_label_delete.""; + echo "".$v_button_icon_add.""; } echo "
\n"; - echo " ".$text['label-'.escape($row['domain_setting_enabled'])]."\n"; + echo " \n"; echo " ".escape($row['domain_setting_description'])." "; + echo " "; if (permission_exists('domain_setting_edit')) { - echo "$v_link_label_edit"; - } - if (permission_exists('domain_setting_delete')) { - echo "$v_link_label_delete"; + echo "".$v_button_icon_edit.""; } echo "
\n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo "
 $paging_controls"; - if (permission_exists('domain_setting_add')) { - echo "$v_link_label_add"; - } - if (permission_exists('domain_setting_delete') && $result_count > 0) { - echo "".$v_link_label_delete.""; - } - echo "
\n"; - echo "
"; + + echo "
".$paging_controls."
"; + echo "
"; echo "

"; // check or uncheck all category checkboxes - if (isset($subcat_ids) && sizeof($subcat_ids) > 0) { - echo "\n"; } + + //handle form actions + echo "\n"; - } -//include the footer - //require_once "resources/footer.php"; - -?> +?> \ No newline at end of file diff --git a/core/domains/app_languages.php b/core/domains/app_languages.php index db4916cafb..940183d611 100644 --- a/core/domains/app_languages.php +++ b/core/domains/app_languages.php @@ -581,6 +581,26 @@ $text['header-domains']['ru-ru'] = "Домены"; $text['header-domains']['sv-se'] = "Domäner"; $text['header-domains']['uk-ua'] = "Домени"; +$text['header-domain_settings']['en-us'] = "Domain Settings"; +$text['header-domain_settings']['ar-eg'] = ""; +$text['header-domain_settings']['de-at'] = "Domain Einstellungen"; //copied from de-de +$text['header-domain_settings']['de-ch'] = "Domain Einstellungen"; //copied from de-de +$text['header-domain_settings']['de-de'] = "Domain Einstellungen"; +$text['header-domain_settings']['es-cl'] = "Configuraciones de dominio"; +$text['header-domain_settings']['es-mx'] = "Configuraciones de dominio"; //copied from es-cl +$text['header-domain_settings']['fr-ca'] = "Paramètres du domaine"; //copied from fr-fr +$text['header-domain_settings']['fr-fr'] = "Paramètres du domaine"; +$text['header-domain_settings']['he-il'] = ""; +$text['header-domain_settings']['it-it'] = "Parametro di Dominio"; +$text['header-domain_settings']['nl-nl'] = ""; +$text['header-domain_settings']['pl-pl'] = "Ustawienia domeny"; +$text['header-domain_settings']['pt-br'] = "Configurações do dominio"; +$text['header-domain_settings']['pt-pt'] = "Definições do Domínio"; +$text['header-domain_settings']['ro-ro'] = ""; +$text['header-domain_settings']['ru-ru'] = "Настройки домена"; +$text['header-domain_settings']['sv-se'] = "Domän Inställning"; +$text['header-domain_settings']['uk-ua'] = "Налаштування домену"; + $text['header-domain_setting-edit']['en-us'] = "Domain Setting"; $text['header-domain_setting-edit']['ar-eg'] = ""; $text['header-domain_setting-edit']['de-at'] = "Domain Einstellungen"; //copied from de-de diff --git a/core/domains/domain_edit.php b/core/domains/domain_edit.php index 7b9a55bd41..a992877ff9 100644 --- a/core/domains/domain_edit.php +++ b/core/domains/domain_edit.php @@ -561,17 +561,14 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { if (permission_exists('domain_add')) { //only for superadmin, not admin editing their own domain echo " \n"; } - //if (permission_exists("domain_select") && permission_exists("domain_setting_add") && count($_SESSION['domains']) > 1) { - // echo " "; - // echo " "; - // echo " \n"; - // echo " "; - //} + if (permission_exists("domain_select") && is_array($_SESSION['domains']) && @sizeof($_SESSION['domains']) > 1) { + echo " \n"; + } if (permission_exists('domain_export')) { echo " \n"; } @@ -642,6 +639,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { echo ""; if ($action == "update" && permission_exists('domain_setting_view')) { + echo "
\n"; require PROJECT_PATH."core/domain_settings/domain_settings.php"; } diff --git a/resources/app_languages.php b/resources/app_languages.php index 2641aa0b4a..98741ba9cd 100644 --- a/resources/app_languages.php +++ b/resources/app_languages.php @@ -190,6 +190,26 @@ $text['message-copy']['sv-se'] = "Kopiering Slutförd"; $text['message-copy']['uk-ua'] = "Скопійовано"; $text['message-copy']['tr-tr'] = "Kopyalama İşlemi Tamamlandı"; +$text['message-toggle']['en-us'] = "Toggle Completed"; +$text['message-toggle']['ar-eg'] = "الانتهاء من تبديل"; +$text['message-toggle']['de-at'] = "Toggle Completed"; //copied from de-de +$text['message-toggle']['de-ch'] = "Toggle Completed"; //copied from de-de +$text['message-toggle']['de-de'] = "Toggle Completed"; +$text['message-toggle']['es-cl'] = "Alternar Completado"; +$text['message-toggle']['es-mx'] = "Alternar Completado"; //copied from es-cl +$text['message-toggle']['fr-ca'] = "Basculer Terminé"; //copied from fr-fr +$text['message-toggle']['fr-fr'] = "Basculer Terminé"; +$text['message-toggle']['he-il'] = "הושלם Toggle"; +$text['message-toggle']['it-it'] = "Commutazione Completata"; +$text['message-toggle']['nl-nl'] = ""; +$text['message-toggle']['pl-pl'] = "Przegubowe Zakończony"; +$text['message-toggle']['pt-br'] = "Alternar Concluído"; //copied from pt-pt +$text['message-toggle']['pt-pt'] = "Alternar Concluído"; +$text['message-toggle']['ro-ro'] = "Completat toggle"; +$text['message-toggle']['ru-ru'] = "Переключить выполнено"; +$text['message-toggle']['sv-se'] = "Växla Avslutade"; +$text['message-toggle']['uk-ua'] = "переключити Завершений"; + $text['message-invalid_credentials']['en-us'] = "Invalid Username and/or Password"; $text['message-invalid_credentials']['ar-eg'] = ""; $text['message-invalid_credentials']['de-at'] = "Ungültiger Benutzername und/oder Passwort"; //copied from de-de diff --git a/themes/default/css.php b/themes/default/css.php index 42b10f565f..b5a895edb5 100644 --- a/themes/default/css.php +++ b/themes/default/css.php @@ -639,6 +639,7 @@ $default_login = ($_REQUEST['login'] == 'default') ? true : false; button.btn-icon { margin: 0 2px; + white-space: nowrap; } /* control icons (define after the default bootstrap btn-default class) */ @@ -932,16 +933,27 @@ $default_login = ($_REQUEST['login'] == 'default') ? true : false; font-weight: bold } - a { + a, + button.btn.btn-link { color: ; text-decoration: none; } - a:hover { + a:hover, + button.btn.btn-link:hover { color: ; text-decoration: underline; } + button.btn.btn-link { + margin: 0; + margin-top: -2px; + padding: 0; + border: none; + font-size: inherit; + font-family: inherit; + } + form { margin: 0; }