From b6822b040cab44d49cf3cafab46a33faf8f116e5 Mon Sep 17 00:00:00 2001 From: jekkos Date: Thu, 2 Jun 2016 08:50:45 +0200 Subject: [PATCH] Add configuration options for notification alignment (#478) Fix country code edit bug (#497) Review xss filtering in load_config hook (#39) --- application/controllers/Config.php | 2 ++ application/hooks/load_config.php | 4 ++-- application/language/de-CH/config_lang.php | 1 + application/language/en/config_lang.php | 1 + application/language/es/config_lang.php | 1 + application/language/fr/config_lang.php | 1 + application/language/hr-HR/config_lang.php | 1 + application/language/hu-HU/config_lang.php | 1 + application/language/id/config_lang.php | 1 + application/language/nl-BE/config_lang.php | 1 + application/language/pt-BR/config_lang.php | 1 + application/language/ru/config_lang.php | 1 + application/language/th/config_lang.php | 1 + application/language/tr/config_lang.php | 1 + application/language/zh/config_lang.php | 1 + application/views/configs/general_config.php | 24 ++++++++++++++++++++ application/views/configs/locale_config.php | 4 ++-- application/views/partial/header.php | 10 ++++++-- application/views/sales/register.php | 4 ++-- css/ospos.css | 4 ++++ database/2.4_to_3.0.sql | 4 +++- dist/opensourcepos.min.css | 2 +- dist/opensourcepos.min.js | 2 +- templates/spacelab/views/partial/header.php | 4 ++-- translations/config_lang.csv | 3 ++- 25 files changed, 66 insertions(+), 14 deletions(-) diff --git a/application/controllers/Config.php b/application/controllers/Config.php index 507b36e5f..8a86bcb8c 100644 --- a/application/controllers/Config.php +++ b/application/controllers/Config.php @@ -64,6 +64,8 @@ class Config extends Secure_area 'receiving_calculate_average_price'=>$this->input->post('receiving_calculate_average_price') != null, 'lines_per_page'=>$this->input->post('lines_per_page'), 'default_sales_discount'=>$this->input->post('default_sales_discount'), + 'config_notify_horizontal_position'=>$this->input->post('config_notify_horizontal_position'), + 'config_notify_vertical_position'=>$this->input->post('config_notify_vertical_position'), 'custom1_name'=>$this->input->post('custom1_name'), 'custom2_name'=>$this->input->post('custom2_name'), 'custom3_name'=>$this->input->post('custom3_name'), diff --git a/application/hooks/load_config.php b/application/hooks/load_config.php index 7b7776e14..e61b520bb 100644 --- a/application/hooks/load_config.php +++ b/application/hooks/load_config.php @@ -10,7 +10,7 @@ function load_config() } //Set language from config database - $language = $CI->security->xss_clean($CI->config->item('language')); + $language = $CI->config->item('language'); //Loads all the language files from the language directory if(!empty($language)) @@ -36,7 +36,7 @@ function load_config() //Set timezone from config database if($CI->config->item('timezone')) { - date_default_timezone_set($CI->security->xss_clean($CI->config->item('timezone'))); + date_default_timezone_set($CI->config->item('timezone')); } else { diff --git a/application/language/de-CH/config_lang.php b/application/language/de-CH/config_lang.php index fdb5de9d2..10a8f74c1 100644 --- a/application/language/de-CH/config_lang.php +++ b/application/language/de-CH/config_lang.php @@ -150,3 +150,4 @@ $lang["config_website"] = "Website"; $lang["config_datetimeformat"] = "Datum und Zeit"; $lang["config_country_codes"] = "Country Codes"; $lang["config_country_codes_tooltip"] = "Comma separated list of country codes for nominatim address lookup."; +$lang["config_notify_alignment"] = "Notification Popup Position"; diff --git a/application/language/en/config_lang.php b/application/language/en/config_lang.php index 570562c74..b1460e844 100644 --- a/application/language/en/config_lang.php +++ b/application/language/en/config_lang.php @@ -150,3 +150,4 @@ $lang["config_website"] = "Website"; $lang["config_datetimeformat"] = "Date and Time format"; $lang["config_country_codes"] = "Country Codes"; $lang["config_country_codes_tooltip"] = "Comma separated list of country codes for nominatim address lookup."; +$lang["config_notify_alignment"] = "Notification Popup Position"; diff --git a/application/language/es/config_lang.php b/application/language/es/config_lang.php index c63807aa2..4b34b79a2 100644 --- a/application/language/es/config_lang.php +++ b/application/language/es/config_lang.php @@ -150,3 +150,4 @@ $lang["config_website"] = "Sitio Web"; $lang["config_datetimeformat"] = "Date and Time format"; $lang["config_country_codes"] = "Country Codes"; $lang["config_country_codes_tooltip"] = "Comma separated list of country codes for nominatim address lookup."; +$lang["config_notify_alignment"] = "Notification Popup Position"; diff --git a/application/language/fr/config_lang.php b/application/language/fr/config_lang.php index 22e8b06eb..ca092323a 100644 --- a/application/language/fr/config_lang.php +++ b/application/language/fr/config_lang.php @@ -150,3 +150,4 @@ $lang["config_website"] = "Site-web"; $lang["config_datetimeformat"] = "Date and Time format"; $lang["config_country_codes"] = "Country Codes"; $lang["config_country_codes_tooltip"] = "Comma separated list of country codes for nominatim address lookup."; +$lang["config_notify_alignment"] = "Notification Popup Position"; diff --git a/application/language/hr-HR/config_lang.php b/application/language/hr-HR/config_lang.php index 35d0c088a..d00bbcb22 100644 --- a/application/language/hr-HR/config_lang.php +++ b/application/language/hr-HR/config_lang.php @@ -150,3 +150,4 @@ $lang["config_website"] = "web strana"; $lang["config_datetimeformat"] = "Oblik datuma i vremena"; $lang["config_country_codes"] = "Country Codes"; $lang["config_country_codes_tooltip"] = "Comma separated list of country codes for nominatim address lookup."; +$lang["config_notify_alignment"] = "Notification Popup Position"; diff --git a/application/language/hu-HU/config_lang.php b/application/language/hu-HU/config_lang.php index bcbab7040..8b235238a 100644 --- a/application/language/hu-HU/config_lang.php +++ b/application/language/hu-HU/config_lang.php @@ -150,3 +150,4 @@ $lang["config_website"] = "Weboldal"; $lang["config_datetimeformat"] = "Dátum és idő formátum"; $lang["config_country_codes"] = "Country Codes"; $lang["config_country_codes_tooltip"] = "Comma separated list of country codes for nominatim address lookup."; +$lang["config_notify_alignment"] = "Notification Popup Position"; diff --git a/application/language/id/config_lang.php b/application/language/id/config_lang.php index 7f47b6c05..0ef217322 100644 --- a/application/language/id/config_lang.php +++ b/application/language/id/config_lang.php @@ -150,3 +150,4 @@ $lang["config_website"] = "Situs Perusahaan"; $lang["config_datetimeformat"] = "Date and Time format"; $lang["config_country_codes"] = "Country Codes"; $lang["config_country_codes_tooltip"] = "Comma separated list of country codes for nominatim address lookup."; +$lang["config_notify_alignment"] = "Notification Popup Position"; diff --git a/application/language/nl-BE/config_lang.php b/application/language/nl-BE/config_lang.php index ad7f57893..f19b7a3b8 100755 --- a/application/language/nl-BE/config_lang.php +++ b/application/language/nl-BE/config_lang.php @@ -150,3 +150,4 @@ $lang["config_website"] = "Website"; $lang["config_datetimeformat"] = "Date and Time format"; $lang["config_country_codes"] = "Country Codes"; $lang["config_country_codes_tooltip"] = "Comma separated list of country codes for nominatim address lookup."; +$lang["config_notify_alignment"] = "Notification Popup Position"; diff --git a/application/language/pt-BR/config_lang.php b/application/language/pt-BR/config_lang.php index eabfb3e34..c914f7eef 100644 --- a/application/language/pt-BR/config_lang.php +++ b/application/language/pt-BR/config_lang.php @@ -150,3 +150,4 @@ $lang["config_website"] = "Site da internet"; $lang["config_datetimeformat"] = "Formato da data e hora"; $lang["config_country_codes"] = "Country Codes"; $lang["config_country_codes_tooltip"] = "Comma separated list of country codes for nominatim address lookup."; +$lang["config_notify_alignment"] = "Notification Popup Position"; diff --git a/application/language/ru/config_lang.php b/application/language/ru/config_lang.php index 3397a8972..b72d8b8ad 100644 --- a/application/language/ru/config_lang.php +++ b/application/language/ru/config_lang.php @@ -150,3 +150,4 @@ $lang["config_website"] = "Веб-сайт"; $lang["config_datetimeformat"] = "Date and Time format"; $lang["config_country_codes"] = "Country Codes"; $lang["config_country_codes_tooltip"] = "Comma separated list of country codes for nominatim address lookup."; +$lang["config_notify_alignment"] = "Notification Popup Position"; diff --git a/application/language/th/config_lang.php b/application/language/th/config_lang.php index a5952dff1..96fcf7164 100644 --- a/application/language/th/config_lang.php +++ b/application/language/th/config_lang.php @@ -150,3 +150,4 @@ $lang["config_website"] = "เว็บไซต์"; $lang["config_datetimeformat"] = "รูปแบบวันเวลา"; $lang["config_country_codes"] = "Country Codes"; $lang["config_country_codes_tooltip"] = "Comma separated list of country codes for nominatim address lookup."; +$lang["config_notify_alignment"] = "Notification Popup Position"; diff --git a/application/language/tr/config_lang.php b/application/language/tr/config_lang.php index 8a58be2d1..a5e9a6663 100644 --- a/application/language/tr/config_lang.php +++ b/application/language/tr/config_lang.php @@ -150,3 +150,4 @@ $lang["config_website"] = "Website"; $lang["config_datetimeformat"] = "Date and Time format"; $lang["config_country_codes"] = "Country Codes"; $lang["config_country_codes_tooltip"] = "Comma separated list of country codes for nominatim address lookup."; +$lang["config_notify_alignment"] = "Notification Popup Position"; diff --git a/application/language/zh/config_lang.php b/application/language/zh/config_lang.php index 2b2307a1c..463f87aea 100755 --- a/application/language/zh/config_lang.php +++ b/application/language/zh/config_lang.php @@ -150,3 +150,4 @@ $lang["config_website"] = "網站"; $lang["config_datetimeformat"] = "Date and Time format"; $lang["config_country_codes"] = "Country Codes"; $lang["config_country_codes_tooltip"] = "Comma separated list of country codes for nominatim address lookup."; +$lang["config_notify_alignment"] = "Notification Popup Position"; diff --git a/application/views/configs/general_config.php b/application/views/configs/general_config.php index 22cc62821..bb290c2c6 100644 --- a/application/views/configs/general_config.php +++ b/application/views/configs/general_config.php @@ -95,6 +95,29 @@ +
+ lang->line('config_notify_alignment'), 'config_notify_horizontal_position', array('class'=>'control-label col-xs-2')); ?> +
+
+
+ 'Top', + 'bottom' => 'Bottom' + ), + $this->config->item('config_notify_vertical_position'), array('class'=>'form-control input-sm')); ?> +
+
+ 'Left', + 'center' => 'Center', + 'right' => 'Right' + ), + $this->config->item('config_notify_horizontal_position'), array('class'=>'form-control input-sm')); ?> +
+
+
+
+
lang->line('config_custom1'), 'config_custom1', array('class'=>'control-label col-xs-2')); ?>
@@ -227,6 +250,7 @@ //validation and submit handling $(document).ready(function() { + $("#backup_db").click(function() { window.location=''; }); diff --git a/application/views/configs/locale_config.php b/application/views/configs/locale_config.php index 22c4841f1..294f3cdd1 100644 --- a/application/views/configs/locale_config.php +++ b/application/views/configs/locale_config.php @@ -92,12 +92,12 @@
-
+
lang->line('config_country_codes'), 'country_codes', array('class'=>'control-label col-xs-2')); ?>
config->item('country_codes'), array('class'=>'form-control input-sm')); ?>
-
+
diff --git a/application/views/partial/header.php b/application/views/partial/header.php index 044e23181..3a5409157 100644 --- a/application/views/partial/header.php +++ b/application/views/partial/header.php @@ -66,10 +66,10 @@ - + - + @@ -90,6 +90,12 @@ document.getElementById('liveclock').innerHTML = phpjsDate("config->item('dateformat').' '.$this->config->item('timeformat') ?>", now); } + + $.notifyDefaults({ placement: { + align: 'config->item('config_notify_horizontal_position'); ?>', + from: 'config->item('config_notify_vertical_position'); ?>' + }}); +