From 67092e2782006142ff32a205b684e15595b13586 Mon Sep 17 00:00:00 2001 From: rylon Date: Sat, 23 May 2015 10:49:46 +0200 Subject: [PATCH] made uvote work, updated system reference --- lib/system | 2 +- uvote/api/votes/votes.php | 2 +- uvote/files/frontend_logos/icon_urn.png | Bin 0 -> 8095 bytes .../default_bulletin/default_bulletin.php | 33 +++++++++--------- .../default_bulletin/{ => tpl}/bars_user.tpl | 0 .../default_bulletin/{ => tpl}/bulletin.tpl | 0 .../default_bulletin/{ => tpl}/comment.tpl | 0 .../{ => tpl}/icons_table_parties.tpl | 0 .../default_bulletin/{ => tpl}/table_bt.tpl | 0 .../{ => tpl}/table_parties.tpl | 0 .../default_bulletin/{ => tpl}/vote_bt.tpl | 0 .../default_bulletin/{ => tpl}/voteweight.tpl | 0 .../page/default_comment/default_comment.php | 8 ++--- .../default_comment/{ => tpl}/comment.tpl | 0 uvote/page/default_page/default_page.php | 4 +-- .../default_register/default_register.php | 4 +-- .../default_register/{ => tpl}/register.tpl | 4 +-- uvote/page/user_list_active/active.tpl | 1 - .../tpl/active.tpl} | 0 .../user_list_active/user_list_active.php | 13 ++++--- uvote/page/user_list_ended/tpl/ended.tpl | 1 + .../page/user_list_ended/user_list_ended.php | 17 +++++---- uvote/page/user_main/user_main.php | 5 +-- .../user_main_myVote/{ => tpl}/myVote.tpl | 0 .../user_main_myVote/user_main_myVote.php | 7 ++-- .../{ => tpl}/bt_to_uvote_overall.tpl | 0 .../page/user_main_uVote/{ => tpl}/uVote.tpl | 0 .../{ => tpl}/uvoteparties.tpl | 0 .../{ => tpl}/votecountchoice.tpl | 0 .../{ => tpl}/votecountchoicebt.tpl | 0 .../page/user_main_uVote/user_main_uVote.php | 15 ++++---- .../user_main_urVote/{ => tpl}/all_polls.tpl | 0 .../{ => tpl}/bt_to_user_overall.tpl | 0 .../{ => tpl}/overall_all_polls.tpl | 0 .../user_main_urVote/{ => tpl}/urVote.tpl | 0 .../{ => tpl}/urvoteparties.tpl | 0 .../user_main_urVote/user_main_urVote.php | 25 ++++++------- 37 files changed, 65 insertions(+), 76 deletions(-) create mode 100644 uvote/files/frontend_logos/icon_urn.png rename uvote/page/default_bulletin/{ => tpl}/bars_user.tpl (100%) rename uvote/page/default_bulletin/{ => tpl}/bulletin.tpl (100%) rename uvote/page/default_bulletin/{ => tpl}/comment.tpl (100%) rename uvote/page/default_bulletin/{ => tpl}/icons_table_parties.tpl (100%) rename uvote/page/default_bulletin/{ => tpl}/table_bt.tpl (100%) rename uvote/page/default_bulletin/{ => tpl}/table_parties.tpl (100%) rename uvote/page/default_bulletin/{ => tpl}/vote_bt.tpl (100%) rename uvote/page/default_bulletin/{ => tpl}/voteweight.tpl (100%) rename uvote/page/default_comment/{ => tpl}/comment.tpl (100%) rename uvote/page/default_register/{ => tpl}/register.tpl (98%) delete mode 100644 uvote/page/user_list_active/active.tpl rename uvote/page/{user_list_ended/ended.tpl => user_list_active/tpl/active.tpl} (100%) create mode 100644 uvote/page/user_list_ended/tpl/ended.tpl rename uvote/page/user_main_myVote/{ => tpl}/myVote.tpl (100%) rename uvote/page/user_main_uVote/{ => tpl}/bt_to_uvote_overall.tpl (100%) rename uvote/page/user_main_uVote/{ => tpl}/uVote.tpl (100%) rename uvote/page/user_main_uVote/{ => tpl}/uvoteparties.tpl (100%) rename uvote/page/user_main_uVote/{ => tpl}/votecountchoice.tpl (100%) rename uvote/page/user_main_uVote/{ => tpl}/votecountchoicebt.tpl (100%) rename uvote/page/user_main_urVote/{ => tpl}/all_polls.tpl (100%) rename uvote/page/user_main_urVote/{ => tpl}/bt_to_user_overall.tpl (100%) rename uvote/page/user_main_urVote/{ => tpl}/overall_all_polls.tpl (100%) rename uvote/page/user_main_urVote/{ => tpl}/urVote.tpl (100%) rename uvote/page/user_main_urVote/{ => tpl}/urvoteparties.tpl (100%) diff --git a/lib/system b/lib/system index 90ce83b..bb73e4d 160000 --- a/lib/system +++ b/lib/system @@ -1 +1 @@ -Subproject commit 90ce83ba36c6081b1395b555575260cb13358693 +Subproject commit bb73e4d8a5547ba56f433c65fb70f2cd765e1a06 diff --git a/uvote/api/votes/votes.php b/uvote/api/votes/votes.php index 1cb4c1b..8ef7f93 100644 --- a/uvote/api/votes/votes.php +++ b/uvote/api/votes/votes.php @@ -173,7 +173,7 @@ class votes { public static function open_vote($poll_ID){ $vote = self::get_voteinfo($poll_ID); //votes::getVoteOfGroup($poll_ID); - $result = SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/full_vote.tpl'), $vote); + $result = SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/tpl/full_vote.tpl'), $vote); return $result; } } diff --git a/uvote/files/frontend_logos/icon_urn.png b/uvote/files/frontend_logos/icon_urn.png new file mode 100644 index 0000000000000000000000000000000000000000..f68e86c64a10cb0403f894057182afe19684d4d5 GIT binary patch literal 8095 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['bt_choice']); foreach($party_votes as $pv){ - $result .= \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_bulletin/vote_bt.tpl'), + $result .= \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_bulletin/tpl/vote_bt.tpl'), array( 'party' => $pv['party'], 'choice' => $this->get_party_per_poll($pv['choice']), 'choice_class' => $this->tablerow_class($pv['choice']), @@ -57,7 +57,7 @@ class default_bulletin extends SYSTEM\PAGE\Page { private function get_pro_comments (){ $result = ''; - $vars = votes::getUserComments($this->poll_ID, 1); + /*$vars = votes::getUserComments($this->poll_ID, 1); foreach($vars as $com){ $rating = votes::get_commentrate($com['c_ID'], 1); @@ -65,14 +65,14 @@ class default_bulletin extends SYSTEM\PAGE\Page { $rating2 = votes::get_commentrate($com['c_ID'], 2); $com['count_down'] = $rating2['count']; // $com['c_txt'] = utf8_encode($com['c_txt']); - $result .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_bulletin/comment.tpl'), $com); - } + $result .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_bulletin/tpl/comment.tpl'), $com); + }*/ return $result; } private function get_con_comments (){ $result = ''; - $vars = votes::getUserComments($this->poll_ID, 2); + /*$vars = votes::getUserComments($this->poll_ID, 2); foreach($vars as $com){ $rating = votes::get_commentrate($com['c_ID'], 1); @@ -80,8 +80,8 @@ class default_bulletin extends SYSTEM\PAGE\Page { $rating2 = votes::get_commentrate($com['c_ID'], 2); $com['count_down'] = $rating2['count']; // $com['c_txt'] = utf8_encode($com['c_txt']); - $result .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_bulletin/comment.tpl'), $com); - } + $result .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_bulletin/tpl/comment.tpl'), $com); + }*/ return $result; } @@ -91,7 +91,7 @@ class default_bulletin extends SYSTEM\PAGE\Page { $bars['vote_no_perc'] = round($bars['no_perc']*100,0); $bars['vote_ent_perc'] = round($bars['ent_perc']*100,0); $bars['title'] = 'Gemessen auf uVote'; - return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_bulletin/bars_user.tpl'),$bars); + return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_bulletin/tpl/bars_user.tpl'),$bars); } private function bars_party(){ @@ -102,7 +102,7 @@ class default_bulletin extends SYSTEM\PAGE\Page { $vote['party_yes'] = $vote['votes_pro'] > 0 ? round($vote['votes_pro']/$vote['total']*100,0) : $vote['votes_pro']; $vote['party_no'] = $vote['votes_contra'] > 0 ? round($vote['votes_contra']/$vote['total']*100,0) : $vote['votes_contra']; $vote['party_ent'] = $vote['nr_attending'] > 0 ? round(($vote['nr_attending'] - $vote['votes_pro'] - $vote['votes_contra'])/$vote['total']*100,0) : $vote['nr_attending']; - $result .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_bulletin/table_parties.tpl'), $vote); + $result .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_bulletin/tpl/table_parties.tpl'), $vote); } return $result; @@ -113,7 +113,7 @@ class default_bulletin extends SYSTEM\PAGE\Page { if (!$vars['bt_total']){ return '';} $info = array(); - return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_bulletin/icons_table_parties.tpl'), $info); + return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_bulletin/tpl/icons_table_parties.tpl'), $info); } private function bars_bt(){ @@ -123,13 +123,13 @@ class default_bulletin extends SYSTEM\PAGE\Page { $vars['bt_ent'] = round(($vars['bt_attending'] - $vars['bt_pro'] - $vars['bt_con'])/$vars['bt_total']*100,0); $vars['bt_pro'] = round($vars['bt_pro']/$vars['bt_total']*100,0); $vars['bt_con'] = round($vars['bt_con']/$vars['bt_total']*100,0); - return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_bulletin/table_bt.tpl'), $vars); + return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_bulletin/tpl/table_bt.tpl'), $vars); } private function voice_weight(){ $vars = votes::get_count_user_votes_per_poll($this->poll_ID); $vars['voteweight'] = round(1/$vars['count']*100); - return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_bulletin/voteweight.tpl'), $vars); + return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_bulletin/tpl/voteweight.tpl'), $vars); } private function p_fields (){ @@ -230,13 +230,12 @@ class default_bulletin extends SYSTEM\PAGE\Page { } $vars['poll_ID'] = $this->poll_ID; //put it here - so its filled in! - $vars['frontend_logos'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=img&cat=frontend_logos&id='; - $vars = array_merge($vars, \SYSTEM\locale::getStrings(DBD\locale_string::VALUE_CATEGORY_MAINPAGE)); - $vars = array_merge($vars, \SYSTEM\locale::getStrings(150)); - $vars = array_merge($vars, \SYSTEM\locale::getStrings(100)); + $vars['frontend_logos'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=files&cat=frontend_logos&id='; + $vars = array_merge($vars, \SYSTEM\PAGE\text::tag('uvote_register')); + $vars = array_merge($vars, \SYSTEM\PAGE\text::tag('uvote')); $vars = array_merge($vars,votes::get_voteinfo($this->poll_ID)); - return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_bulletin/bulletin.tpl'),$vars); + return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_bulletin/tpl/bulletin.tpl'),$vars); } } \ No newline at end of file diff --git a/uvote/page/default_bulletin/bars_user.tpl b/uvote/page/default_bulletin/tpl/bars_user.tpl similarity index 100% rename from uvote/page/default_bulletin/bars_user.tpl rename to uvote/page/default_bulletin/tpl/bars_user.tpl diff --git a/uvote/page/default_bulletin/bulletin.tpl b/uvote/page/default_bulletin/tpl/bulletin.tpl similarity index 100% rename from uvote/page/default_bulletin/bulletin.tpl rename to uvote/page/default_bulletin/tpl/bulletin.tpl diff --git a/uvote/page/default_bulletin/comment.tpl b/uvote/page/default_bulletin/tpl/comment.tpl similarity index 100% rename from uvote/page/default_bulletin/comment.tpl rename to uvote/page/default_bulletin/tpl/comment.tpl diff --git a/uvote/page/default_bulletin/icons_table_parties.tpl b/uvote/page/default_bulletin/tpl/icons_table_parties.tpl similarity index 100% rename from uvote/page/default_bulletin/icons_table_parties.tpl rename to uvote/page/default_bulletin/tpl/icons_table_parties.tpl diff --git a/uvote/page/default_bulletin/table_bt.tpl b/uvote/page/default_bulletin/tpl/table_bt.tpl similarity index 100% rename from uvote/page/default_bulletin/table_bt.tpl rename to uvote/page/default_bulletin/tpl/table_bt.tpl diff --git a/uvote/page/default_bulletin/table_parties.tpl b/uvote/page/default_bulletin/tpl/table_parties.tpl similarity index 100% rename from uvote/page/default_bulletin/table_parties.tpl rename to uvote/page/default_bulletin/tpl/table_parties.tpl diff --git a/uvote/page/default_bulletin/vote_bt.tpl b/uvote/page/default_bulletin/tpl/vote_bt.tpl similarity index 100% rename from uvote/page/default_bulletin/vote_bt.tpl rename to uvote/page/default_bulletin/tpl/vote_bt.tpl diff --git a/uvote/page/default_bulletin/voteweight.tpl b/uvote/page/default_bulletin/tpl/voteweight.tpl similarity index 100% rename from uvote/page/default_bulletin/voteweight.tpl rename to uvote/page/default_bulletin/tpl/voteweight.tpl diff --git a/uvote/page/default_comment/default_comment.php b/uvote/page/default_comment/default_comment.php index 32b9b0c..204f805 100644 --- a/uvote/page/default_comment/default_comment.php +++ b/uvote/page/default_comment/default_comment.php @@ -30,7 +30,7 @@ class default_comment extends SYSTEM\PAGE\Page { $vars = votes::getUserComments($this->poll_ID, 1); foreach($vars as $com){ $com['c_txt'] = utf8_encode($com['c_txt']); - $result .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_bulletin/comment.tpl'), $com); + $result .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_bulletin/tpl/comment.tpl'), $com); } return $result; @@ -41,7 +41,7 @@ class default_comment extends SYSTEM\PAGE\Page { foreach($vars as $com){ $com['c_txt'] = utf8_encode($com['c_txt']); - $result .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_bulletin/comment.tpl'), $com); + $result .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_bulletin/tpl/comment.tpl'), $com); } return $result; @@ -75,13 +75,13 @@ class default_comment extends SYSTEM\PAGE\Page { } $vars['poll_ID'] = $this->poll_ID; //put it here - so its filled in! - $vars['frontend_logos'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=img&cat=frontend_logos&id='; + $vars['frontend_logos'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=files&cat=frontend_logos&id='; $vars = array_merge($vars, \SYSTEM\locale::getStrings(DBD\locale_string::VALUE_CATEGORY_MAINPAGE)); $vars = array_merge($vars, \SYSTEM\locale::getStrings(150)); $vars = array_merge($vars, \SYSTEM\locale::getStrings(100)); $vars = array_merge($vars,votes::get_voteinfo($this->poll_ID)); - return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_comment/comment.tpl'),$vars); + return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_comment/tpl/comment.tpl'),$vars); } } \ No newline at end of file diff --git a/uvote/page/default_comment/comment.tpl b/uvote/page/default_comment/tpl/comment.tpl similarity index 100% rename from uvote/page/default_comment/comment.tpl rename to uvote/page/default_comment/tpl/comment.tpl diff --git a/uvote/page/default_page/default_page.php b/uvote/page/default_page/default_page.php index 0a42ad4..b842e7f 100644 --- a/uvote/page/default_page/default_page.php +++ b/uvote/page/default_page/default_page.php @@ -156,10 +156,10 @@ class default_page extends SYSTEM\PAGE\Page { if(!$_escaped_fragment_){ $vars['js'] = $this->js();} $vars['css'] = $this->css(); - $vars['votelist'] = $this->generate_votelist(); $vars['registerform'] = \SYSTEM\SECURITY\Security::isLoggedIn() ? $this->getloggedinform() : $this->exchange_registerform(); $vars['loginform'] = \SYSTEM\SECURITY\Security::isLoggedIn() ? $this->exchange_loginform() : $this->getloginform() ; - $vars['frontend_logos'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=img&cat=frontend_logos&id='; + $vars['frontend_logos'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=files&cat=frontend_logos&id='; + $vars['votelist'] = $this->generate_votelist(); $vars = array_merge($vars, \SYSTEM\PAGE\text::tag('uvote')); $vars = array_merge($vars, \SYSTEM\PAGE\text::tag('uvote_register')); diff --git a/uvote/page/default_register/default_register.php b/uvote/page/default_register/default_register.php index a167f29..01e5414 100644 --- a/uvote/page/default_register/default_register.php +++ b/uvote/page/default_register/default_register.php @@ -7,11 +7,11 @@ class default_register extends SYSTEM\PAGE\Page { public function html(){ $vars = array(); - $vars['frontend_logos'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=img&cat=frontend_logos&id='; + $vars['frontend_logos'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=files&cat=frontend_logos&id='; $vars['css'] = $this->css(); $vars = array_merge($vars, \SYSTEM\PAGE\text::tag('uvote_register')); $vars = array_merge($vars, \SYSTEM\PAGE\text::tag('uvote')); - return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_register/register.tpl'), $vars); + return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_register/tpl/register.tpl'), $vars); } } \ No newline at end of file diff --git a/uvote/page/default_register/register.tpl b/uvote/page/default_register/tpl/register.tpl similarity index 98% rename from uvote/page/default_register/register.tpl rename to uvote/page/default_register/tpl/register.tpl index d5d4172..2e9f067 100644 --- a/uvote/page/default_register/register.tpl +++ b/uvote/page/default_register/tpl/register.tpl @@ -28,7 +28,7 @@
  • -
    + diff --git a/uvote/page/user_list_active/active.tpl b/uvote/page/user_list_active/active.tpl deleted file mode 100644 index 3955133..0000000 --- a/uvote/page/user_list_active/active.tpl +++ /dev/null @@ -1 +0,0 @@ -${votetlist} \ No newline at end of file diff --git a/uvote/page/user_list_ended/ended.tpl b/uvote/page/user_list_active/tpl/active.tpl similarity index 100% rename from uvote/page/user_list_ended/ended.tpl rename to uvote/page/user_list_active/tpl/active.tpl diff --git a/uvote/page/user_list_active/user_list_active.php b/uvote/page/user_list_active/user_list_active.php index 1d42c71..8d06192 100644 --- a/uvote/page/user_list_active/user_list_active.php +++ b/uvote/page/user_list_active/user_list_active.php @@ -66,7 +66,7 @@ class user_list_active extends SYSTEM\PAGE\Page { $party_votes = votes::get_barsperparty($vote['ID']); $vote['bt_vote_class'] = $this->tablerow_class($vote['bt_choice']); foreach($party_votes as $pv){ - $vote['bt'] .= \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/vote_bt.tpl'), + $vote['bt'] .= \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/tpl/vote_bt.tpl'), array( 'party' => $pv['party'], 'choice' => $this->get_party_per_poll($pv['choice']), 'choice_class' => $this->badge_class($pv['choice']))); @@ -76,7 +76,7 @@ class user_list_active extends SYSTEM\PAGE\Page { $uvote = votes::get_users_choice_per_poll($vote['ID']); $vote['uv_vote_class'] = count($uvote) > 0 ? $this->tablerow_class($uvote[0]['choice']) : ''; foreach($uvote as $v){ - $vote['uv'] .= \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/vote_uv.tpl'), + $vote['uv'] .= \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/tpl/vote_uv.tpl'), array( 'badge' => self::badge_class($v['choice']), 'perc' => $v['count'] > 0 ? round($v['count']/$vote_count['count']*100, 2) : 0)); } @@ -86,9 +86,9 @@ class user_list_active extends SYSTEM\PAGE\Page { $vote['panel_class'] = default_page::panel_class($user_vote); if($time_remain > 0){ - $result[0] .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/vote.tpl'), $vote); + $result[0] .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/tpl/vote.tpl'), $vote); } else { - $result[1] .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/vote.tpl'), $vote); + $result[1] .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/tpl/vote.tpl'), $vote); } } return $result[0].$result[1]; @@ -97,11 +97,10 @@ class user_list_active extends SYSTEM\PAGE\Page { public function html(){ $vars = array(); $vars['votelist'] = $this->generate_votelist(); - $vars['frontend_logos'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=img&cat=frontend_logos&id='; + $vars['frontend_logos'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=files&cat=frontend_logos&id='; $vars = array_merge($vars, \SYSTEM\PAGE\text::tag('uvote_register')); - $vars = array_merge($vars, \SYSTEM\PAGE\text::tag('uvote_poll')); $vars = array_merge($vars, \SYSTEM\PAGE\text::tag('uvote')); - return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_list_active/active.tpl'), $vars); + return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_list_active/tpl/active.tpl'), $vars); } } \ No newline at end of file diff --git a/uvote/page/user_list_ended/tpl/ended.tpl b/uvote/page/user_list_ended/tpl/ended.tpl new file mode 100644 index 0000000..f2cef67 --- /dev/null +++ b/uvote/page/user_list_ended/tpl/ended.tpl @@ -0,0 +1 @@ +${votelist} \ No newline at end of file diff --git a/uvote/page/user_list_ended/user_list_ended.php b/uvote/page/user_list_ended/user_list_ended.php index 55a6b8a..f20dfc2 100644 --- a/uvote/page/user_list_ended/user_list_ended.php +++ b/uvote/page/user_list_ended/user_list_ended.php @@ -65,7 +65,7 @@ class user_list_ended extends SYSTEM\PAGE\Page { $party_votes = votes::get_barsperparty($vote['ID']); $vote['bt_vote_class'] = $this->tablerow_class($vote['bt_choice']); foreach($party_votes as $pv){ - $vote['bt'] .= \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/vote_bt.tpl'), + $vote['bt'] .= \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/tpl/vote_bt.tpl'), array( 'party' => $pv['party'], 'choice' => $this->get_party_per_poll($pv['choice']), 'choice_class' => $this->badge_class($pv['choice']))); @@ -75,7 +75,7 @@ class user_list_ended extends SYSTEM\PAGE\Page { $uvote = votes::get_users_choice_per_poll($vote['ID']); $vote['uv_vote_class'] = count($uvote) > 0 ? $this->tablerow_class($uvote[0]['choice']) : ''; foreach($uvote as $v){ - $vote['uv'] .= \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/vote_uv.tpl'), + $vote['uv'] .= \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/tpl/vote_uv.tpl'), array( 'badge' => self::badge_class($v['choice']), 'perc' => $v['count'] > 0 ? round($v['count']/$vote_count['count']*100, 2) : 0)); } @@ -85,9 +85,9 @@ class user_list_ended extends SYSTEM\PAGE\Page { $vote['panel_class'] = default_page::panel_class($user_vote); if($time_remain > 0){ - $result[0] .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/vote.tpl'), $vote); + $result[0] .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/tpl/vote.tpl'), $vote); } else { - $result[1] .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/vote.tpl'), $vote); + $result[1] .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/tpl/vote.tpl'), $vote); } } return $result[0].$result[1]; @@ -96,11 +96,10 @@ class user_list_ended extends SYSTEM\PAGE\Page { public function html(){ $vars = array(); $vars['votelist'] = $this->generate_votelist(); - $vars['frontend_logos'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=img&cat=frontend_logos&id='; - $vars = array_merge($vars, \SYSTEM\locale::getStrings(DBD\locale_string::VALUE_CATEGORY_MAINPAGE)); - $vars = array_merge($vars, \SYSTEM\locale::getStrings(150)); - $vars = array_merge($vars, \SYSTEM\locale::getStrings(110)); - return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_list_ended/ended.tpl'), $vars); + $vars['frontend_logos'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=files&cat=frontend_logos&id='; + $vars = array_merge($vars, \SYSTEM\PAGE\text::tag('uvote')); + $vars = array_merge($vars, \SYSTEM\PAGE\text::tag('uvote_register')); + return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_list_ended/tpl/ended.tpl'), $vars); } } \ No newline at end of file diff --git a/uvote/page/user_main/user_main.php b/uvote/page/user_main/user_main.php index 2f86906..20903e9 100644 --- a/uvote/page/user_main/user_main.php +++ b/uvote/page/user_main/user_main.php @@ -6,12 +6,9 @@ class user_main extends SYSTEM\PAGE\Page { return '';} public function html(){ $vars = array(); - $uv = new user_main_uVote(); - $vars['frontend_logos'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=img&cat=frontend_logos&id='; + $vars['frontend_logos'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=files&cat=frontend_logos&id='; $vars['uVote'] = $uv->html(); - - return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main/main_menu.tpl'),$vars); } diff --git a/uvote/page/user_main_myVote/myVote.tpl b/uvote/page/user_main_myVote/tpl/myVote.tpl similarity index 100% rename from uvote/page/user_main_myVote/myVote.tpl rename to uvote/page/user_main_myVote/tpl/myVote.tpl diff --git a/uvote/page/user_main_myVote/user_main_myVote.php b/uvote/page/user_main_myVote/user_main_myVote.php index 536b4a3..d67ad93 100644 --- a/uvote/page/user_main_myVote/user_main_myVote.php +++ b/uvote/page/user_main_myVote/user_main_myVote.php @@ -20,10 +20,9 @@ class user_main_myVote extends SYSTEM\PAGE\Page { $vars = array(); $vars = $this->get_add_data(); $vars['frontend_logos'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=img&cat=frontend_logos&id='; - $vars = array_merge($vars, \SYSTEM\locale::getStrings(DBD\locale_string::VALUE_CATEGORY_MAINPAGE)); - $vars = array_merge($vars, \SYSTEM\locale::getStrings(150)); - $vars = array_merge($vars, \SYSTEM\locale::getStrings(110)); - return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_myVote/myVote.tpl'), $vars); + $vars = array_merge($vars, \SYSTEM\PAGE\text::tag('uvote')); + $vars = array_merge($vars, \SYSTEM\PAGE\text::tag('uvote_register')); + return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_myVote/tpl/myVote.tpl'), $vars); } } \ No newline at end of file diff --git a/uvote/page/user_main_uVote/bt_to_uvote_overall.tpl b/uvote/page/user_main_uVote/tpl/bt_to_uvote_overall.tpl similarity index 100% rename from uvote/page/user_main_uVote/bt_to_uvote_overall.tpl rename to uvote/page/user_main_uVote/tpl/bt_to_uvote_overall.tpl diff --git a/uvote/page/user_main_uVote/uVote.tpl b/uvote/page/user_main_uVote/tpl/uVote.tpl similarity index 100% rename from uvote/page/user_main_uVote/uVote.tpl rename to uvote/page/user_main_uVote/tpl/uVote.tpl diff --git a/uvote/page/user_main_uVote/uvoteparties.tpl b/uvote/page/user_main_uVote/tpl/uvoteparties.tpl similarity index 100% rename from uvote/page/user_main_uVote/uvoteparties.tpl rename to uvote/page/user_main_uVote/tpl/uvoteparties.tpl diff --git a/uvote/page/user_main_uVote/votecountchoice.tpl b/uvote/page/user_main_uVote/tpl/votecountchoice.tpl similarity index 100% rename from uvote/page/user_main_uVote/votecountchoice.tpl rename to uvote/page/user_main_uVote/tpl/votecountchoice.tpl diff --git a/uvote/page/user_main_uVote/votecountchoicebt.tpl b/uvote/page/user_main_uVote/tpl/votecountchoicebt.tpl similarity index 100% rename from uvote/page/user_main_uVote/votecountchoicebt.tpl rename to uvote/page/user_main_uVote/tpl/votecountchoicebt.tpl diff --git a/uvote/page/user_main_uVote/user_main_uVote.php b/uvote/page/user_main_uVote/user_main_uVote.php index c7bc9dc..4d61608 100644 --- a/uvote/page/user_main_uVote/user_main_uVote.php +++ b/uvote/page/user_main_uVote/user_main_uVote.php @@ -7,7 +7,7 @@ class user_main_uVote extends SYSTEM\PAGE\Page { foreach($votes as $vote){ $vote['match_percentage'] = round($vote['class_MATCH']/($vote['class_MATCH']+$vote['class_MISSMATCH'])*100,2); - $result .= \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_uVote/uvoteparties.tpl'), $vote); + $result .= \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_uVote/tpl/uvoteparties.tpl'), $vote); } print_r($votes, TRUE); return $result; @@ -34,7 +34,7 @@ class user_main_uVote extends SYSTEM\PAGE\Page { } //$vote['count']; //$vote['choice']; - $result .= \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_uVote/votecountchoice.tpl'),$vote); + $result .= \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_uVote/tpl/votecountchoice.tpl'),$vote); } return $result; } @@ -60,7 +60,7 @@ class user_main_uVote extends SYSTEM\PAGE\Page { } //$vote['count']; //$vote['choice']; - $result .= \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_uVote/votecountchoicebt.tpl'),$vote); + $result .= \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_uVote/tpl/votecountchoicebt.tpl'),$vote); } return $result; } @@ -78,11 +78,10 @@ class user_main_uVote extends SYSTEM\PAGE\Page { $vars['votes_all'] = $this->votes_all(); $vars['votes_all_bt'] = $this->votes_all_bt(); $vars['user_count'] = $this->user_count(); - $vars['frontend_logos'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=img&cat=frontend_logos&id='; - $vars = array_merge($vars, \SYSTEM\locale::getStrings(DBD\locale_string::VALUE_CATEGORY_MAINPAGE)); - $vars = array_merge($vars, \SYSTEM\locale::getStrings(150)); - $vars = array_merge($vars, \SYSTEM\locale::getStrings(100)); - return \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_uVote/uVote.tpl'),$vars); + $vars['frontend_logos'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=files&cat=frontend_logos&id='; + $vars = array_merge($vars, \SYSTEM\PAGE\text::tag('uvote')); + $vars = array_merge($vars, \SYSTEM\PAGE\text::tag('uvote_register')); + return \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_uVote/tpl/uVote.tpl'),$vars); } } \ No newline at end of file diff --git a/uvote/page/user_main_urVote/all_polls.tpl b/uvote/page/user_main_urVote/tpl/all_polls.tpl similarity index 100% rename from uvote/page/user_main_urVote/all_polls.tpl rename to uvote/page/user_main_urVote/tpl/all_polls.tpl diff --git a/uvote/page/user_main_urVote/bt_to_user_overall.tpl b/uvote/page/user_main_urVote/tpl/bt_to_user_overall.tpl similarity index 100% rename from uvote/page/user_main_urVote/bt_to_user_overall.tpl rename to uvote/page/user_main_urVote/tpl/bt_to_user_overall.tpl diff --git a/uvote/page/user_main_urVote/overall_all_polls.tpl b/uvote/page/user_main_urVote/tpl/overall_all_polls.tpl similarity index 100% rename from uvote/page/user_main_urVote/overall_all_polls.tpl rename to uvote/page/user_main_urVote/tpl/overall_all_polls.tpl diff --git a/uvote/page/user_main_urVote/urVote.tpl b/uvote/page/user_main_urVote/tpl/urVote.tpl similarity index 100% rename from uvote/page/user_main_urVote/urVote.tpl rename to uvote/page/user_main_urVote/tpl/urVote.tpl diff --git a/uvote/page/user_main_urVote/urvoteparties.tpl b/uvote/page/user_main_urVote/tpl/urvoteparties.tpl similarity index 100% rename from uvote/page/user_main_urVote/urvoteparties.tpl rename to uvote/page/user_main_urVote/tpl/urvoteparties.tpl diff --git a/uvote/page/user_main_urVote/user_main_urVote.php b/uvote/page/user_main_urVote/user_main_urVote.php index 6889e5d..3c8d97f 100644 --- a/uvote/page/user_main_urVote/user_main_urVote.php +++ b/uvote/page/user_main_urVote/user_main_urVote.php @@ -1,13 +1,10 @@ id, \SYSTEM\SECURITY\Security::getUser()->creationDate); $v = $vars['voted'] > 1 ? $vars['voted'] : 1; $nv = $vars['not_voted']; - return \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_urVote/overall_all_polls.tpl'), + return \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_urVote/tpl/overall_all_polls.tpl'), array( 'vote_perc'=> round($v/($nv+$v)*100, 2), 'no_vote_perc'=> round($nv/($nv+$v)*100, 2), 'voted'=> $v, @@ -19,9 +16,9 @@ class user_main_urVote extends SYSTEM\PAGE\Page { $v = $vars['voted']; $nv = $vars['not_voted']; print_r($vars, true); - return \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_urVote/all_polls.tpl'), - array( 'vote_perc'=> round($v/($nv+$v)*100, 2), - 'no_vote_perc'=> round($nv/($nv+$v)*100, 2), + return \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_urVote/tpl/all_polls.tpl'), + array( 'vote_perc'=> round($v/(($nv+$v)*100+1), 2), + 'no_vote_perc'=> round($nv/(($nv+$v)*100+1), 2), 'voted'=> $v, 'not_voted'=> $nv)); } @@ -40,7 +37,7 @@ class user_main_urVote extends SYSTEM\PAGE\Page { while($row = $res->next()){ $row['match_percentage'] = round($row['class_MATCH']/($row['class_MATCH']+$row['class_MISSMATCH']+1)*100,2); - $result .= \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_urVote/bt_to_user_overall.tpl'), $row); + $result .= \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_urVote/tpl/bt_to_user_overall.tpl'), $row); } return $result; $row['votes_cast'] = round(($row['class_MATCH']+$row['class_MISSMATCH']),2); @@ -65,7 +62,7 @@ class user_main_urVote extends SYSTEM\PAGE\Page { $res2 = votes::vote_accord_with_party($row['party']); $row['according_laws'] = $this->build_according_law_html($res2, $row['party']); $row['match_percentage'] = round($row['class_MATCH']/($row['class_MATCH']+$row['class_MISSMATCH'])*100,2); - $result .= \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_urVote/urvoteparties.tpl'), $row);; + $result .= \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_urVote/tpl/urvoteparties.tpl'), $row);; } return $result; } @@ -84,12 +81,12 @@ class user_main_urVote extends SYSTEM\PAGE\Page { // $vars['poll_compare'] = $this->count_all_polls(); $vars['choices_user_ID'] = $this->user_per_party_overall(); $vars['choices_bt_to_user'] = $this->user_to_bt(); - $vars['frontend_logos'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=img&cat=frontend_logos&id='; + $vars['frontend_logos'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=files&cat=frontend_logos&id='; $vars['user_temp_votes'] = $this->user_temp_votes(); $vars['user_overall_votes'] = $this->user_overall_votes(); - $vars = array_merge($vars, \SYSTEM\locale::getStrings(DBD\locale_string::VALUE_CATEGORY_MAINPAGE)); - $vars = array_merge($vars, \SYSTEM\locale::getStrings(150)); - return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_urVote/urVote.tpl'),$vars); + $vars = array_merge($vars, \SYSTEM\PAGE\text::tag('uvote')); + $vars = array_merge($vars, \SYSTEM\PAGE\text::tag('uvote_register')); + return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_urVote/tpl/urVote.tpl'),$vars); } } \ No newline at end of file