From 1ff201327a8618a7e2bb7c24c80652b8c6cee03b Mon Sep 17 00:00:00 2001 From: Naeltard Date: Sun, 25 Oct 2015 01:51:25 +0200 Subject: [PATCH] new sql fixes htaccess added --- .htaccess | 3 +++ uvote/api/votes/bars.php | 12 ++++++------ uvote/page/default_register/tpl/register.tpl | 3 ++- uvote/sql/mysql/{system.api.sql => system_api.sql} | 0 uvote/sql/mysql/system_text.sql | 1 - uvote/sql/mysql/uvote_votes_per_party.sql | 1 + uvote/sql/mysql/uvote_votes_tag.sql | 1 + 7 files changed, 13 insertions(+), 8 deletions(-) create mode 100644 .htaccess rename uvote/sql/mysql/{system.api.sql => system_api.sql} (100%) diff --git a/.htaccess b/.htaccess new file mode 100644 index 0000000..6d37bc9 --- /dev/null +++ b/.htaccess @@ -0,0 +1,3 @@ +RewriteEngine On +RewriteCond %{HTTP_HOST} !^www\.u-vote\.eu$ [NC] +RewriteRule ^(.*)$ http://www.u-vote.eu/$1 [R=301,L] \ No newline at end of file diff --git a/uvote/api/votes/bars.php b/uvote/api/votes/bars.php index 144fe4e..89a9f99 100644 --- a/uvote/api/votes/bars.php +++ b/uvote/api/votes/bars.php @@ -12,18 +12,18 @@ class bars{ public static function get_uvote_choice_overall(){ $vars = \SQL\UVOTE_DATA_CHOICE_OVERALL::Q1(array()); $vars['total_total'] = $vars['pro'] + $vars['con'] + $vars['ent']; - $vars['total_pro_percentage'] = round($vars['pro']/$vars['total_total']*100+1); - $vars['total_con_percentage'] = round($vars['con']/$vars['total_total']*100+1); - $vars['total_ent_percentage'] = round($vars['ent']/$vars['total_total']*100+1); + $vars['total_pro_percentage'] = $vars['total_total'] > 0 ? round($vars['pro']/$vars['total_total']*100+1) : 0; + $vars['total_con_percentage'] = $vars['total_total'] > 0 ? round($vars['con']/$vars['total_total']*100+1) : 0; + $vars['total_ent_percentage'] = $vars['total_total'] > 0 ? round($vars['ent']/$vars['total_total']*100+1) : 0; new SYSTEM\LOG\INFO($vars['total_ent_percentage']); return \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_analysis/tpl/tab_basic/uvote_total.tpl'),$vars); } public static function get_bt_choice_overall(){ $vars = \SQL\UVOTE_DATA_CHOICE_BT_OVERALL::Q1(array()); $vars['total_total'] = $vars['pro'] + $vars['con'] + $vars['ent']; - $vars['total_pro_percentage'] = round($vars['pro']/$vars['total_total']*100+1); - $vars['total_con_percentage'] = round($vars['con']/$vars['total_total']*100+1); - $vars['total_ent_percentage'] = round($vars['ent']/$vars['total_total']*100+1); + $vars['total_pro_percentage'] = $vars['total_total'] > 0 ? round($vars['pro']/$vars['total_total']*100+1) : 0; + $vars['total_con_percentage'] = $vars['total_total'] > 0 ? round($vars['con']/$vars['total_total']*100+1) : 0; + $vars['total_ent_percentage'] = $vars['total_total'] > 0 ? round($vars['ent']/$vars['total_total']*100+1) : 0; new SYSTEM\LOG\INFO($vars['total_ent_percentage']); return \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_analysis/tpl/tab_basic/bt_total.tpl'),$vars); } diff --git a/uvote/page/default_register/tpl/register.tpl b/uvote/page/default_register/tpl/register.tpl index 7a43234..6bd74d1 100644 --- a/uvote/page/default_register/tpl/register.tpl +++ b/uvote/page/default_register/tpl/register.tpl @@ -84,7 +84,8 @@ - + + diff --git a/uvote/sql/mysql/system.api.sql b/uvote/sql/mysql/system_api.sql similarity index 100% rename from uvote/sql/mysql/system.api.sql rename to uvote/sql/mysql/system_api.sql diff --git a/uvote/sql/mysql/system_text.sql b/uvote/sql/mysql/system_text.sql index ff81e28..0f5b024 100644 --- a/uvote/sql/mysql/system_text.sql +++ b/uvote/sql/mysql/system_text.sql @@ -94,7 +94,6 @@ INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_ INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('Beta-News-1', 'news'); -INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('analysis_help_basic_stats', 'domestic'); INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('ari_mail', 'uvote'); INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('ari_name', 'uvote'); INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('ari_pass', 'uvote'); diff --git a/uvote/sql/mysql/uvote_votes_per_party.sql b/uvote/sql/mysql/uvote_votes_per_party.sql index 6bb6176..44ad62e 100644 --- a/uvote/sql/mysql/uvote_votes_per_party.sql +++ b/uvote/sql/mysql/uvote_votes_per_party.sql @@ -1,3 +1,4 @@ +DELETE FROM `uvote_votes_per_party`; INSERT INTO `uvote_votes_per_party` (`poll_ID`, `party`, `votes_pro`, `votes_contra`, `nr_attending`, `total`, `choice`, `bt_choice`) VALUES (32, 'cdu', 248, 0, 254, 255, 1, 0); INSERT INTO `uvote_votes_per_party` (`poll_ID`, `party`, `votes_pro`, `votes_contra`, `nr_attending`, `total`, `choice`, `bt_choice`) VALUES (32, 'csu', 53, 0, 56, 56, 1, 0); INSERT INTO `uvote_votes_per_party` (`poll_ID`, `party`, `votes_pro`, `votes_contra`, `nr_attending`, `total`, `choice`, `bt_choice`) VALUES (32, 'gruene', 1, 10, 59, 63, 2, 0); diff --git a/uvote/sql/mysql/uvote_votes_tag.sql b/uvote/sql/mysql/uvote_votes_tag.sql index 4ec6329..4ea63f1 100644 --- a/uvote/sql/mysql/uvote_votes_tag.sql +++ b/uvote/sql/mysql/uvote_votes_tag.sql @@ -1,3 +1,4 @@ +DELETE FROM `uvote_votes_tag`; INSERT INTO `uvote_votes_tag` (`poll_ID`, `tag`, `group`) VALUES (32, 'Innenpolitik', 1); INSERT INTO `uvote_votes_tag` (`poll_ID`, `tag`, `group`) VALUES (32, 'Asylpolitik', 1); INSERT INTO `uvote_votes_tag` (`poll_ID`, `tag`, `group`) VALUES (33, 'Innenpolitik', 1);