diff --git a/uVote/api/ApiClass.php b/uVote/api/ApiClass.php index 907402c..00b847c 100644 --- a/uVote/api/ApiClass.php +++ b/uVote/api/ApiClass.php @@ -4,4 +4,7 @@ class ApiClass extends \SYSTEM\API\apiloginclass { public static function call_vote_action_vote($poll_ID, $vote) { return votes::write_vote($poll_ID, $vote); } + public static function call_vote_action_openinfo($poll_ID) { + return votes::get_openinfo($poll_ID); + } } \ No newline at end of file diff --git a/uVote/api/votes/votes.php b/uVote/api/votes/votes.php index b58c30a..da29f86 100644 --- a/uVote/api/votes/votes.php +++ b/uVote/api/votes/votes.php @@ -12,6 +12,14 @@ class votes { return $result; } + public static function get_openinfo($poll_ID){ + $con = new \SYSTEM\DB\Connection(new \DBD\uVote()); + $res = $con->prepare( 'selVoteByID', + 'SELECT * FROM `uvote_votes` WHERE `ID` = ?;', + array($poll_ID)); + $result = $res->next(); + return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/openvoteinfo.tpl'),$result == NULL ? array() : $result); + } public static function write_vote($poll_ID, $vote){ if(!\SYSTEM\SECURITY\Security::isLoggedIn()){ throw new ERROR("You need to be logged in.");} diff --git a/uVote/page/default_page/js/loadtexts.js b/uVote/page/default_page/js/loadtexts.js index 0af2618..fea4ac0 100644 --- a/uVote/page/default_page/js/loadtexts.js +++ b/uVote/page/default_page/js/loadtexts.js @@ -17,7 +17,7 @@ $(document).ready(function() { }); $('.btn_openvoteinfo').click(function () { - load_openvoteinfo($(this).attr('openvoteinfo')); + load_openvoteinfo($(this).attr('poll_ID')); }); // $('#register_btn').click(function () { // account_create ($(this).attr ('#inputEmail')) @@ -70,24 +70,24 @@ $(document).ready(function() { }); function account_create(inputEmail, inputPassword){ - $.get('.api.php?call=account&action=create&username=' + NULL + '&password_sha=' + password + '&email=' + email + '&locale=deDE', function (data) { + $.get('./api.php?call=account&action=create&username=' + NULL + '&password_sha=' + password + '&email=' + email + '&locale=deDE', function (data) { dataTmp = data; }).complete(function() { }); } -function load_openvoteinfo (openvoteinfo){ - var dataTmp; - $.get(openvoteinfo, function (data) { - dataTmp = data; +function load_openvoteinfo (poll_ID){ + var openvoteinfo; + $.get('./api.php?call=vote&action=openinfo&poll_ID=' + poll_ID, function (data) { + openvoteinfo = data; bodyelem = $(""); bodyelem.animate(); }).complete(function() { - $('#openvoteinfo').slideUp({duration: 'slow', + $('#openvoteinfo'+poll_ID).slideUp({duration: 'slow', complete: function(){ - $('#openvoteinfo').html(dataTmp); - $('#openvoteinfo').slideDown('slow'); + $('#openvoteinfo'+poll_ID).html(openvoteinfo); + $('#openvoteinfo'+poll_ID).slideDown('slow'); site_content_is_visible = true; }}); }); diff --git a/uVote/page/default_page/openvoteinfo.tpl b/uVote/page/default_page/openvoteinfo.tpl index 82a17c7..b3789ff 100644 --- a/uVote/page/default_page/openvoteinfo.tpl +++ b/uVote/page/default_page/openvoteinfo.tpl @@ -1,3 +1,3 @@
${vote_text}
+${text}