diff --git a/uVote/page/default_bulletin/default_bulletin.php b/uVote/page/default_bulletin/default_bulletin.php
index 3a8fea8..78aa978 100644
--- a/uVote/page/default_bulletin/default_bulletin.php
+++ b/uVote/page/default_bulletin/default_bulletin.php
@@ -44,8 +44,7 @@ class default_bulletin extends SYSTEM\PAGE\Page {
return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_bulletin/voteweight.tpl'), $vars);;
}
- private function vote_buttons($poll_expired){
- $user_poll = votes::getUserPollData($this->poll_ID);
+ private function vote_buttons($poll_expired,$user_poll){
if($poll_expired){
if(!$user_poll){
return '
Stimme hier ab
@@ -98,21 +97,29 @@ class default_bulletin extends SYSTEM\PAGE\Page {
public function html(){
$poll_expired = \DBD\UVOTE_POLL_EXPIRED::Q1(array($this->poll_ID));
+ $user_vote = votes::getUserPollData($this->poll_ID);
/*$poll_data = array();
$poll_data[] = DBD\UVOTE_DATA_CHOICE_OVERALL::Q1(array(1));
$poll_data[] = DBD\UVOTE_DATA_CHOICE_OVERALL::Q1(array(2));
$poll_data[] = DBD\UVOTE_DATA_CHOICE_OVERALL::Q1(array(3));*/
$vars = array();
- $vars['bars_party'] = $poll_expired ? '' : $this->bars_party();
- $vars['bars_user'] = $this->bars_user();
- $vars['bars_bt'] = $this->bars_bt();
+ $vars['bars_party'] = $vars['bars_user'] = $vars['bars_bt'] = $vars['voice_weight'] = 'Vote to see results!';
$vars['js'] = $this->js();
$vars['css'] = $this->css();
- $vars['frontend_logos'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=img&cat=frontend_logos&id=';
- $vars ['vote_buttons'] = $this->vote_buttons($poll_expired);
- $vars['voice_weight'] = $this->voice_weight();
+
$vars['poll_ID'] = $this->poll_ID;
+ $vars['vote_buttons'] = $this->vote_buttons($poll_expired,$user_vote);
+
+ if($user_vote){
+ $vars['bars_party'] = $poll_expired ? '' : $this->bars_party();
+ $vars['bars_user'] = $this->bars_user();
+ $vars['bars_bt'] = $this->bars_bt();
+ $vars['voice_weight'] = $this->voice_weight();
+ }
+
+ $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,votes::get_voteinfo($this->poll_ID));
return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_bulletin/bulletin.tpl'),$vars);
}