webcraftmedia/u-vote.eu
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

updated system reference, updated font_awesome reference, fixed paths according to new system

Browse Source
This commit is contained in:
Ulf Gebhardt 2016-04-04 19:16:33 +02:00
parent 5614a2e825
commit 890135b984
17 changed files with 78 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/font_awesome

@ -1 +1 @@
Subproject commit 9820fd005745bea6789338b0ba25366b1d2e26cd
Subproject commit 895ccfb0b94ee4c2242ea4dd211f24bc83f3eb53

2
lib/system

@ -1 +1 @@
Subproject commit b80827e711506a335dc51774948eba102396b528
Subproject commit 60fb33a7ab9fbf72aa4e9e9e5b7a87f31c3ca985

2
nbproject/project.xml
View File

@ -3,7 +3,7 @@
<type>org.netbeans.modules.php.project</type>
<configuration>
<data xmlns="http://www.netbeans.org/ns/php-project/1">
<name>uVote</name>
<name>uvote</name>
</data>
</configuration>
</project>

18
uvote/api/votes/bars.php
View File

@ -7,7 +7,7 @@ class bars{
$vars['total_pro_percentage'] = $vars['total_total'] > 0 ? round($vars['total_pro']/$vars['total_total']*100) : 0;
$vars['total_con_percentage'] = $vars['total_total'] > 0 ? round($vars['total_con']/$vars['total_total']*100) : 0;
$vars['total_ent_percentage'] = $vars['total_total'] > 0 ? round($vars['total_ent']/$vars['total_total']*100) : 0;
return \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_analysis/tpl/tab_basic/user_total.tpl'),$vars);
return \SYSTEM\PAGE\replace::replaceFile((new PPAGE('user_main_analysis/tpl/tab_basic/user_total.tpl'))->SERVERPATH(),$vars);
}
public static function get_uvote_choice_overall(){
$vars = \SQL\UVOTE_DATA_CHOICE_OVERALL::Q1(array());
@ -16,7 +16,7 @@ class bars{
$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);
return \SYSTEM\PAGE\replace::replaceFile((new PPAGE('user_main_analysis/tpl/tab_basic/uvote_total.tpl'))->SERVERPATH(),$vars);
}
public static function get_bt_choice_overall(){
$vars = \SQL\UVOTE_DATA_CHOICE_BT_OVERALL::Q1(array());
@ -25,14 +25,14 @@ class bars{
$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);
return \SYSTEM\PAGE\replace::replaceFile((new PPAGE('user_main_analysis/tpl/tab_basic/bt_total.tpl'))->SERVERPATH(),$vars);
}
public static function bilance_community(){
$result = '';
$vars = \SQL\UVOTE_DATA_UVOTE_TO_PARTY_OVERALL::QA(array());
foreach($vars as $bar){
$bar['match_percentage'] = round($bar['class_MATCH']/($bar['class_MATCH']+$bar['class_MISSMATCH'])*100,2);
$result .= \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_analysis/tpl/tab_bilance/bars_community.tpl'), $bar);
$result .= \SYSTEM\PAGE\replace::replaceFile((new PPAGE('user_main_analysis/tpl/tab_bilance/bars_community.tpl'))->SERVERPATH(), $bar);
}
return $result;
}
@ -41,7 +41,7 @@ class bars{
$vars = \SQL\UVOTE_DATA_BT_TO_PARTY_OVERALL::QA(array());
foreach($vars as $bar){
$bar['match_percentage'] = round($bar['class_MATCH']/($bar['class_MATCH']+$bar['class_MISSMATCH'])*100,2);
$result .= \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_analysis/tpl/tab_bilance/bars_community.tpl'), $bar);
$result .= \SYSTEM\PAGE\replace::replaceFile((new PPAGE('user_main_analysis/tpl/tab_bilance/bars_community.tpl'))->SERVERPATH(), $bar);
}
return $result;
}
@ -52,7 +52,7 @@ class bars{
//$res2 = votes::vote_accord_with_party($row['party']);
//$row['according_laws'] = self::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_analysis/tpl/tab_bilance/bars_user.tpl'), $row);
$result .= \SYSTEM\PAGE\replace::replaceFile((new PPAGE('user_main_analysis/tpl/tab_bilance/bars_user.tpl'))->SERVERPATH(), $row);
}
return $result;
}
@ -79,7 +79,7 @@ class bars{
while($row = $res->next()){
$row['match_percentage'] = round($row['class_MATCH']/($row['class_MATCH']+$row['class_MISSMATCH'])*100,2);
$row['bar'] = $bar;
$result .= \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_analysis/tpl/tab_bilance_choice/bars_user.tpl'), $row);;
$result .= \SYSTEM\PAGE\replace::replaceFile((new PPAGE('user_main_analysis/tpl/tab_bilance_choice/bars_user.tpl'))->SERVERPATH(), $row);;
}
if(empty($result)){
return 'Keine relevanten Daten verfügbar';
@ -105,7 +105,7 @@ class bars{
$row['match_percentage'] = round($row['class_MATCH']/($row['class_MATCH']+$row['class_MISSMATCH'])*100,2);
$row['bar'] = $bar;
$row['icon_type'] = $icon_type;
$result .= \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_analysis/tpl/tab_bilance_choice/urvotebt_by_choice.tpl'), $row);;
$result .= \SYSTEM\PAGE\replace::replaceFile((new PPAGE('user_main_analysis/tpl/tab_bilance_choice/urvotebt_by_choice.tpl'))->SERVERPATH(), $row);;
}
if(empty($result)){
return 'Keine relevanten Daten verfügbar<br><br>';
@ -125,7 +125,7 @@ class bars{
array(\SYSTEM\SECURITY\Security::getUser()->id));
while($row = $res->next()){
$row['match_percentage'] = ($row['class_MATCH']+$row['class_MISSMATCH']) > 0 ? round($row['class_MATCH']/($row['class_MATCH']+$row['class_MISSMATCH'])*100,2) : 0;
$result .= \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_analysis/tpl/tab_bilance/bars_user_bt.tpl'), $row);
$result .= \SYSTEM\PAGE\replace::replaceFile((new PPAGE('user_main_analysis/tpl/tab_bilance/bars_user_bt.tpl'))->SERVERPATH(), $row);
}
return $result;
}

18
uvote/api/votes/lists.php
View File

@ -27,10 +27,10 @@ class lists{
$vote['frontend_logos'] = './api.php?call=files&cat=frontend_logos&id=';
if($time_remain > 0){
$vote['statusmarker'] = 'aktuell';
$result[0] .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_votelist/tpl/vote.tpl'), $vote);
$result[0] .= SYSTEM\PAGE\replace::replaceFile((new PPAGE('user_main_votelist/tpl/vote.tpl'))->SERVERPATH(), $vote);
} else {
$vote['statusmarker'] = 'vergangen';
$result[1] .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_votelist/tpl/vote.tpl'), $vote);
$result[1] .= SYSTEM\PAGE\replace::replaceFile((new PPAGE('user_main_votelist/tpl/vote.tpl'))->SERVERPATH(), $vote);
}
}
return $result[0].$result[1];
@ -39,7 +39,7 @@ class lists{
$result = '';
$vars = \SQL\UVOTE_DATA_USER_TAGS_OF_VOTE::QA(array($poll_ID));
foreach ($vars as $tag){
$result .= \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_votelist/tpl/tag.tpl'),$tag);
$result .= \SYSTEM\PAGE\replace::replaceFile((new PPAGE('user_main_votelist/tpl/tag.tpl'))->SERVERPATH(),$tag);
}
return $result;
}
@ -63,18 +63,12 @@ class lists{
$vote['frontend_logos'] = './api.php?call=files&cat=frontend_logos&id=';
if($time_remain > 0){
$vote['statusmarker'] = 'aktuell';
$result[0] .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_votelist/tpl/vote.tpl'), $vote);
$result[0] .= SYSTEM\PAGE\replace::replaceFile((new PPAGE('user_main_votelist/tpl/vote.tpl'))->SERVERPATH(), $vote);
} else {
$vote['statusmarker'] = 'vergangen';
$result[1] .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_votelist/tpl/vote.tpl'), $vote);
$result[1] .= SYSTEM\PAGE\replace::replaceFile((new PPAGE('user_main_votelist/tpl/vote.tpl'))->SERVERPATH(), $vote);
}
}
return $result[0].$result[1];
}
}
/*
* To change this license header, choose License Headers in Project Properties.
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
}

8
uvote/api/votes/stats_basic.php
View File

@ -21,14 +21,14 @@ class stats_basic {
$vars['analysis_help_basic_votes'] = \SYSTEM\PAGE\text::get('analysis_help_basic_votes');
$vars['analysis_math_basic_votes'] = \SYSTEM\PAGE\text::get('analysis_math_basic_votes');
$vars['frontend_logos'] = './api.php?call=files&cat=frontend_logos&id=';
return \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_analysis/tpl/tab_basic/tab_basic_user.tpl'),$vars);
return \SYSTEM\PAGE\replace::replaceFile((new PPAGE('user_main_analysis/tpl/tab_basic/tab_basic_user.tpl'))->SERVERPATH(),$vars);
}
public static function community_basic(){
$vars['basic_stats_community'] = bars::get_uvote_choice_overall();
$vars['analysis_help_community'] = \SYSTEM\PAGE\text::get('analysis_help_community');
$vars['analysis_math_community'] = \SYSTEM\PAGE\text::get('analysis_math_community');
$vars['frontend_logos'] = './api.php?call=files&cat=frontend_logos&id=';
return \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_analysis/tpl/tab_basic/tab_basic_community.tpl'),$vars);
return \SYSTEM\PAGE\replace::replaceFile((new PPAGE('user_main_analysis/tpl/tab_basic/tab_basic_community.tpl'))->SERVERPATH(),$vars);
}
public static function bt_basic(){
@ -36,6 +36,6 @@ class stats_basic {
$vars['analysis_help_bt_basic'] = \SYSTEM\PAGE\text::get('analysis_help_bt_basic');
$vars['analysis_math_bt_basic'] = \SYSTEM\PAGE\text::get('analysis_math_bt_basic');
$vars['frontend_logos'] = './api.php?call=files&cat=frontend_logos&id=';
return \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_analysis/tpl/tab_basic/tab_basic_bt.tpl'),$vars);
return \SYSTEM\PAGE\replace::replaceFile((new PPAGE('user_main_analysis/tpl/tab_basic/tab_basic_bt.tpl'))->SERVERPATH(),$vars);
}
}
}

11
uvote/api/votes/stats_bilance.php
View File

@ -1,6 +1,5 @@
<?php
class stats_bilance {
public static function basic_bilance($cat){
if($cat == 'user'){return self::user_bilance();}
if($cat == 'user_bt'){return self::user_bt_bilance();}
@ -17,7 +16,7 @@ class stats_bilance {
$vars['analysis_help_party_donut'] = \SYSTEM\PAGE\text::get('analysis_help_party_donut');
$vars['analysis_math_party_donut'] = \SYSTEM\PAGE\text::get('analysis_math_party_donut');
$vars['frontend_logos'] = './api.php?call=files&cat=frontend_logos&id=';
return \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_analysis/tpl/tab_bilance/tab_bilance_user.tpl'),$vars);
return \SYSTEM\PAGE\replace::replaceFile((new PPAGE('user_main_analysis/tpl/tab_bilance/tab_bilance_user.tpl'))->SERVERPATH(),$vars);
}
public static function user_bt_bilance(){
$vars = array();
@ -25,7 +24,7 @@ class stats_bilance {
$vars['analysis_help_bt'] = \SYSTEM\PAGE\text::get('analysis_help_bt');
$vars['analysis_math_bt'] = \SYSTEM\PAGE\text::get('analysis_math_bt');
$vars['frontend_logos'] = './api.php?call=files&cat=frontend_logos&id=';
return \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_analysis/tpl/tab_bilance/tab_bilance_user_bt.tpl'),$vars);
return \SYSTEM\PAGE\replace::replaceFile((new PPAGE('user_main_analysis/tpl/tab_bilance/tab_bilance_user_bt.tpl'))->SERVERPATH(),$vars);
}
public static function community_bilance(){
$vars = array();
@ -33,7 +32,7 @@ class stats_bilance {
$vars['analysis_math_community_to_fr'] = \SYSTEM\PAGE\text::get('analysis_math_community_to_fr');
$vars['bilance_community'] = bars::bilance_community();
$vars['frontend_logos'] = './api.php?call=files&cat=frontend_logos&id=';
return \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_analysis/tpl/tab_bilance/tab_bilance_community.tpl'),$vars);
return \SYSTEM\PAGE\replace::replaceFile((new PPAGE('user_main_analysis/tpl/tab_bilance/tab_bilance_community.tpl'))->SERVERPATH(),$vars);
}
public static function bt_bilance(){
$vars = array();
@ -41,6 +40,6 @@ class stats_bilance {
$vars['analysis_math_choices_bt'] = \SYSTEM\PAGE\text::get('analysis_math_choices_bt');
$vars['bilance_bt'] = bars::bilance_bt();
$vars['frontend_logos'] = './api.php?call=files&cat=frontend_logos&id=';
return \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_analysis/tpl/tab_bilance/tab_bilance_bt.tpl'),$vars);
return \SYSTEM\PAGE\replace::replaceFile((new PPAGE('user_main_analysis/tpl/tab_bilance/tab_bilance_bt.tpl'))->SERVERPATH(),$vars);
}
}
}

4
uvote/api/votes/stats_bilance_choice.php
View File

@ -20,7 +20,7 @@ class stats_bilance_choice {
$vars['analysis_help_uservera_to_party_ent'] = \SYSTEM\PAGE\text::get('analysis_help_uservera_to_party_ent');
$vars['analysis_math_uservera_to_party_ent'] = \SYSTEM\PAGE\text::get('analysis_math_uservera_to_party_ent');
$vars['frontend_logos'] = './api.php?call=files&cat=frontend_logos&id=';
return \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_analysis/tpl/tab_bilance_choice/tab_bilance_choice_user_party.tpl'),$vars);
return \SYSTEM\PAGE\replace::replaceFile((new PPAGE('user_main_analysis/tpl/tab_bilance_choice/tab_bilance_choice_user_party.tpl'))->SERVERPATH(),$vars);
}
public static function user_bt_bilance_choice(){
$vars['choices_user_ID_per_bt_pro'] = bars::bilance_choice_user_bt('1');
@ -29,6 +29,6 @@ class stats_bilance_choice {
$vars['analysis_help_bt_by_vote'] = \SYSTEM\PAGE\text::get('analysis_help_bt_by_vote');
$vars['analysis_math_bt_by_vote'] = \SYSTEM\PAGE\text::get('analysis_math_bt_by_vote');
$vars['frontend_logos'] = './api.php?call=files&cat=frontend_logos&id=';
return \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_analysis/tpl/tab_bilance_choice/tab_bilance_choice_user_bt.tpl'),$vars);
return \SYSTEM\PAGE\replace::replaceFile((new PPAGE('user_main_analysis/tpl/tab_bilance_choice/tab_bilance_choice_user_bt.tpl'))->SERVERPATH(),$vars);
}
}

6
uvote/api/votes/votes.php
View File

@ -80,7 +80,7 @@ class votes {
$vars = \SQL\UVOTE_DATA_TEMP_VOTES::Q1(array(\SYSTEM\SECURITY\Security::getUser()->id, \SYSTEM\SECURITY\Security::getUser()->id));
$v = $vars['voted'];
$nv = $vars['not_voted'];
return \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_analysis/tpl/tab_basic/temp_votes.tpl'),
return \SYSTEM\PAGE\replace::replaceFile((new PPAGE('user_main_analysis/tpl/tab_basic/temp_votes.tpl'))->SERVERPATH(),
array( 'vote_percent'=> $v > 0 ? round($v/($nv+$v)*100, 2) : 0,
'no_vote_percent'=> $nv > 0 ? round($nv/($nv+$v)*100, 2) : 0,
'voted'=> $v,
@ -90,7 +90,7 @@ class votes {
$vars = \SQL\UVOTE_DATA_OVERALL_VOTES::Q1(array(\SYSTEM\SECURITY\Security::getUser()->id, \SYSTEM\SECURITY\Security::getUser()->id, \SYSTEM\SECURITY\Security::getUser()->id, \SYSTEM\SECURITY\Security::getUser()->creationDate));
$v = $vars['voted'];
$nv = $vars['not_voted'];
return \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_analysis/tpl/tab_basic/overall_votes.tpl'),
return \SYSTEM\PAGE\replace::replaceFile((new PPAGE('user_main_analysis/tpl/tab_basic/overall_votes.tpl'))->SERVERPATH(),
array( 'vote_perc'=> $v > 0 ? round($v/($nv+$v)*100, 2) : 0,
'no_vote_perc'=> $v > 0 ? round($nv/($nv+$v)*100, 2) : 0,
'voted'=> $v,
@ -142,7 +142,7 @@ class votes {
$res = \SQL\UVOTE_DATA_POLL_INITIATIVE::QA(array($poll_ID));
foreach ($res as $row){
$result .= \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_poll/tpl/buttons/sub_button.tpl'), $row);
$result .= \SYSTEM\PAGE\replace::replaceFile((new PPAGE('user_main_poll/tpl/buttons/sub_button.tpl'))->SERVERPATH(), $row);
}
// $res['title'] = utf8_encode($res['title']);
return $result;

34
uvote/page/default_page/default_page.php
View File

@ -1,41 +1,37 @@
<?php
class default_page extends SYSTEM\PAGE\Page {
private function js(){
return \SYSTEM\HTML\html::script(\LIB\lib_jquery::js()).
\SYSTEM\HTML\html::script(\LIB\lib_bootstrap::js()).
\SYSTEM\HTML\html::script(\LIB\lib_jqbootstrapvalidation::js()).
\SYSTEM\HTML\html::script(\LIB\lib_system::js()).
\SYSTEM\HTML\html::script(\SYSTEM\WEBPATH(new \PPAGE(),'default_page/js/loadtexts.js')).
\SYSTEM\HTML\html::script(\SYSTEM\WEBPATH(new \PPAGE(),'default_page/js/account_create.js')).
return \SYSTEM\HTML\html::script(\LIB\lib_jquery::js()->WEBPATH()).
\SYSTEM\HTML\html::script(\LIB\lib_bootstrap::js()->WEBPATH()).
\SYSTEM\HTML\html::script(\LIB\lib_jqbootstrapvalidation::js()->WEBPATH()).
\SYSTEM\HTML\html::script(\LIB\lib_system::js()->WEBPATH()).
\SYSTEM\HTML\html::script((new \PPAGE('default_page/js/loadtexts.js'))->WEBPATH()).
\SYSTEM\HTML\html::script('https://www.google.com/jsapi').
'<script type="text/javascript">google.load("visualization", "1", {packages:["corechart"]});</script>';
}
private function css(){
return \SYSTEM\HTML\html::link(\LIB\lib_bootstrap::css()).
\SYSTEM\HTML\html::link(\SYSTEM\WEBPATH(new \PPAGE(),'default_page/css/default_page.css')).
\SYSTEM\HTML\html::link(\LIB\lib_font_awesome::css())
;
return \SYSTEM\HTML\html::link(\LIB\lib_bootstrap::css()->WEBPATH(false)).
\SYSTEM\HTML\html::link((new \PPAGE('default_page/css/default_page.css'))->WEBPATH()).
\SYSTEM\HTML\html::link(\LIB\lib_font_awesome::css()->WEBPATH(false));
}
public function getloggedinform(){
return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/tpl/login/loggedinform.tpl'),array());}
return SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_page/tpl/login/loggedinform.tpl'))->SERVERPATH(),array());}
public function exchange_registerform(){
return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/tpl/login/register_form.tpl'),array());}
return SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_page/tpl/login/register_form.tpl'))->SERVERPATH(),array());}
public function getloginform(){
return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/tpl/login/loginform.tpl'),array());}
return SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_page/tpl/login/loginform.tpl'))->SERVERPATH(),array());}
public function exchange_loginform(){
return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/tpl/login/loggedinformtop.tpl'),array());}
return SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_page/tpl/login/loggedinformtop.tpl'))->SERVERPATH(),array());}
public function get_menu(){
return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/tpl/menu/menu.tpl'),array());}
return SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_page/tpl/menu/menu.tpl'))->SERVERPATH(),array());}
public function exchange_menu(){
return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/tpl/menu/menu_loggedout.tpl'),array());}
return SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_page/tpl/menu/menu_loggedout.tpl'))->SERVERPATH(),array());}
public function html($_escaped_fragment_ = NULL){
$vars = array();
@ -50,6 +46,6 @@ class default_page extends SYSTEM\PAGE\Page {
$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(),'default_page/tpl/page.tpl'), $vars);
return SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_page/tpl/page.tpl'))->SERVERPATH(), $vars);
}
}

9
uvote/page/default_register/default_register.php
View File

@ -1,18 +1,15 @@
<?php
class default_register extends SYSTEM\PAGE\Page {
private function css(){
return '<link href="'.SYSTEM\WEBPATH(new PPAGE(),'default_register/css/default_register.css').'" rel="stylesheet">';}
return array(new PPAGE('default_register/css/default_register.css'));}
public static function js(){
return array(\SYSTEM\WEBPATH(new \PPAGE(),'default_register/js/default_register.js'));}
return array(new PPAGE('default_register/js/default_register.js'));}
public function html(){
$vars = array();
$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/tpl/register.tpl'), $vars);
return \SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_register/tpl/register.tpl'))->SERVERPATH(), $vars);
}
}

4
uvote/page/user_main_analysis/user_main_analysis.php
View File

@ -1,7 +1,7 @@
<?php
class user_main_analysis extends SYSTEM\PAGE\Page {
public static function js(){
return array(\SYSTEM\WEBPATH(new \PPAGE(),'user_main_analysis/js/user_main_analysis.js'));}
return array(new \PPAGE('user_main_analysis/js/user_main_analysis.js'));}
public function html(){
$vars = array();
$vars['frontend_logos'] = './api.php?call=files&cat=frontend_logos&id=';
@ -9,7 +9,7 @@ class user_main_analysis extends SYSTEM\PAGE\Page {
$vars = array_merge($vars, \SYSTEM\PAGE\text::tag('uvote_register'));
$vars = array_merge($vars, \SYSTEM\PAGE\text::tag('help'));
$vars = array_merge($vars, \SYSTEM\PAGE\text::tag('math'));
return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_analysis/tpl/user_main_analysis.tpl'),$vars);
return SYSTEM\PAGE\replace::replaceFile((new PPAGE('user_main_analysis/tpl/user_main_analysis.tpl'))->SERVERPATH(),$vars);
}
}

2
uvote/page/user_main_impressum/user_main_impressum.php
View File

@ -5,6 +5,6 @@ class user_main_impressum {
$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\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_impressum/tpl/user_main_impressum.tpl'), $vars);
return SYSTEM\PAGE\replace::replaceFile((new PPAGE('user_main_impressum/tpl/user_main_impressum.tpl'))->SERVERPATH(), $vars);
}
}

20
uvote/page/user_main_poll/user_main_poll.php
View File

@ -18,7 +18,7 @@ class user_main_poll extends SYSTEM\PAGE\Page {
'party_ent' => $pv['nr_attending'] > 0 ? round(($pv['nr_attending'] - $pv['votes_pro'] - $pv['votes_contra'])/$pv['nr_attending']*100,0) : $pv['nr_attending']);
if($vote['party_yes'] == '0' && $vote['party_no'] == '0' && $vote['party_ent'] == '0'){
$vote['party_ent'] = 100;}
$result .= \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_poll/tpl/stats/vote_bt.tpl'),$vote);
$result .= \SYSTEM\PAGE\replace::replaceFile((new PPAGE('user_main_poll/tpl/stats/vote_bt.tpl'))->SERVERPATH(),$vote);
}
return $result;
}
@ -29,7 +29,7 @@ class user_main_poll 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(),'user_main_poll/tpl/stats/bars_user.tpl'),$bars);
return SYSTEM\PAGE\replace::replaceFile((new PPAGE('user_main_poll/tpl/stats/bars_user.tpl'))->SERVERPATH(),$bars);
}
private function bars_bt(){
@ -42,7 +42,7 @@ class user_main_poll extends SYSTEM\PAGE\Page {
if ($var['choice_full'] == 'open'){
$var['choice_full'] = 'noch nicht';
}
return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_poll/tpl/stats/table_bt_choice.tpl'), $var);
return SYSTEM\PAGE\replace::replaceFile((new PPAGE('user_main_poll/tpl/stats/table_bt_choice.tpl'))->SERVERPATH(), $var);
}
$vars['disclaimer'] = '';
$vars['choice'] = switchers::tablerow_class($info['bt_choice']);
@ -50,22 +50,22 @@ class user_main_poll extends SYSTEM\PAGE\Page {
if ($vars['choice_full'] == 'open'){
$vars['choice_full'] = 'noch nicht';
}
$vars['choice_show'] = SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_poll/tpl/stats/table_bt_choice.tpl'), $vars);
$vars['choice_show'] = SYSTEM\PAGE\replace::replaceFile((new PPAGE('user_main_poll/tpl/stats/table_bt_choice.tpl'))->SERVERPATH(), $vars);
$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(),'user_main_poll/tpl/stats/table_bt.tpl'), $vars);
return SYSTEM\PAGE\replace::replaceFile((new PPAGE('user_main_poll/tpl/stats/table_bt.tpl'))->SERVERPATH(), $vars);
}
private function voice_weight(){
$vars = \SQL\UVOTE_DATA_USER_COUNT_CHOICE_PER_POLL::Q1(array($this->poll_ID));
$vars['voteweight'] = $vars['count'] ? round(1/$vars['count']*100) : 'no votes';
return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_poll/tpl/stats/voteweight.tpl'), $vars);
return SYSTEM\PAGE\replace::replaceFile((new PPAGE('user_main_poll/tpl/stats/voteweight.tpl'))->SERVERPATH(), $vars);
}
private function vote_buttons($user_poll){
if(!$user_poll){
return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_poll/tpl/buttons/vote_buttons_fresh.tpl', array('poll_ID'=>$this->poll_ID)));
return SYSTEM\PAGE\replace::replaceFile((new PPAGE('user_main_poll/tpl/buttons/vote_buttons_fresh.tpl'))->SERVERPATH(), array('poll_ID'=>$this->poll_ID));
}
$classes = array('','','');
switch($user_poll){
@ -75,11 +75,11 @@ class user_main_poll extends SYSTEM\PAGE\Page {
default: $classes = array('poll_ID'=>$this->poll_ID, 'yes'=>'','no'=>'','ent'=>'','choice'=>'');
}
return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_poll/tpl/buttons/vote_buttons.tpl'), $classes);
return SYSTEM\PAGE\replace::replaceFile((new PPAGE('user_main_poll/tpl/buttons/vote_buttons.tpl'))->SERVERPATH(), $classes);
}
public static function js(){
return array(\SYSTEM\WEBPATH(new \PPAGE(),'user_main_poll/js/user_main_poll.js'));}
return array(new \PPAGE('user_main_poll/js/user_main_poll.js'));}
public function html(){
$user_vote = votes::getUserPollData($this->poll_ID);
@ -95,7 +95,7 @@ class user_main_poll extends SYSTEM\PAGE\Page {
$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'));
$result = SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_poll/tpl/full_vote.tpl'), $vars);
$result = SYSTEM\PAGE\replace::replaceFile((new PPAGE('user_main_poll/tpl/full_vote.tpl'))->SERVERPATH(), $vars);
return $result;
}

2
uvote/page/user_main_start/user_main_start.php
View File

@ -20,7 +20,7 @@ class user_main_start extends SYSTEM\PAGE\Page {
$vars['news'] = $this->newsfeed();
$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(),'user_main_start/tpl/user_main_start.tpl'), $vars);
return SYSTEM\PAGE\replace::replaceFile((new PPAGE('user_main_start/tpl/user_main_start.tpl'))->SERVERPATH(), $vars);
}
}

6
uvote/page/user_main_votelist/user_main_votelist.php
View File

@ -8,12 +8,12 @@ class user_main_votelist extends SYSTEM\PAGE\Page {
$result = '';
$vars = \SQL\UVOTE_DATA_USER_TAGS::QA(array());
foreach($vars as $tag){
$result .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_votelist/tpl/filter.tpl'), $tag);
$result .= SYSTEM\PAGE\replace::replaceFile((new PPAGE('user_main_votelist/tpl/filter.tpl'))->SERVERPATH(), $tag);
}
return $result;
}
public static function js(){
return array(\SYSTEM\WEBPATH(new \PPAGE(),'user_main_votelist/js/user_main_votelist.js'));}
return array(new \PPAGE('user_main_votelist/js/user_main_votelist.js'));}
public function html(){
$vars = array();
$vars['votelist'] = lists::generate_votelist('');
@ -23,7 +23,7 @@ class user_main_votelist extends SYSTEM\PAGE\Page {
$vars['filterlist'] = $this->get_list_tags();
$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(),'user_main_votelist/tpl/user_main_votelist.tpl'), $vars);
return SYSTEM\PAGE\replace::replaceFile((new PPAGE('user_main_votelist/tpl/user_main_votelist.tpl'))->SERVERPATH(), $vars);
}
}

22
uvote/sql/DATA_UVOTE.php
View File

@ -3,16 +3,16 @@ namespace SQL;
class DATA_UVOTE extends \SYSTEM\DB\QI {
public static function get_class(){return \get_class();}
public static function files_mysql(){
return array( \SYSTEM\SERVERPATH(new \PSQL(),'/mysql/schema_uvote_votes.sql'),
\SYSTEM\SERVERPATH(new \PSQL(),'/mysql/schema_uvote_data.sql'),
\SYSTEM\SERVERPATH(new \PSQL(),'/mysql/schema_uvote_votes_per_party.sql'),
\SYSTEM\SERVERPATH(new \PSQL(),'/mysql/schema_uvote_user_additional.sql'),
\SYSTEM\SERVERPATH(new \PSQL(),'/mysql/schema_uvote_votes_tag.sql'),
\SYSTEM\SERVERPATH(new \PSQL(),'/mysql/uvote_votes.sql'),
\SYSTEM\SERVERPATH(new \PSQL(),'/mysql/uvote_votes_per_party.sql'),
\SYSTEM\SERVERPATH(new \PSQL(),'/mysql/uvote_votes_tag.sql'),
\SYSTEM\SERVERPATH(new \PSQL(),'/mysql/system_text.sql'),
\SYSTEM\SERVERPATH(new \PSQL(),'/mysql/system_page.sql'),
\SYSTEM\SERVERPATH(new \PSQL(),'/mysql/system_api.sql'));
return array( (new \PSQL('/mysql/schema_uvote_votes.sql'))->SERVERPATH(),
(new \PSQL('/mysql/schema_uvote_data.sql'))->SERVERPATH(),
(new \PSQL('/mysql/schema_uvote_votes_per_party.sql'))->SERVERPATH(),
(new \PSQL('/mysql/schema_uvote_user_additional.sql'))->SERVERPATH(),
(new \PSQL('/mysql/schema_uvote_votes_tag.sql'))->SERVERPATH(),
(new \PSQL('/mysql/uvote_votes.sql'))->SERVERPATH(),
(new \PSQL('/mysql/uvote_votes_per_party.sql'))->SERVERPATH(),
(new \PSQL('/mysql/uvote_votes_tag.sql'))->SERVERPATH(),
(new \PSQL('/mysql/system_text.sql'))->SERVERPATH(),
(new \PSQL('/mysql/system_page.sql'))->SERVERPATH(),
(new \PSQL('/mysql/system_api.sql'))->SERVERPATH());
}
}