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

missing config entry, uvote_accord call fixed

Browse Source
This commit is contained in:
Ulf Gebhardt 2014-03-17 20:07:11 +01:00
parent 292d2e7a9e
commit e29b6b58cd
3 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config.php
View File

@ -3,6 +3,7 @@
$uvote_config = array( array(SYSTEM\CONFIG\config_ids::SYS_CONFIG_ERRORREPORTING, E_ALL | E_STRICT),
array(SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL, 'http://www.mojotrollz.eu/web/uVote/'),
array(SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEPATH, '/home/web/webdir/uVote/'),
array(SYSTEM\CONFIG\config_ids::SYS_CONFIG_DEFAULT_RESULT, SYSTEM\CONFIG\config_ids::SYS_CONFIG_DEFAULT_RESULT_JSON),
array(SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_TYPE, SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_TYPE_MYS),
array(SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_HOST, '127.0.0.1'),
array(SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_PORT, ''),

14
uVote/api/votes/votes.php
View File

@ -142,14 +142,12 @@ class votes {
}
public static function vote_accord_with_party($party){
if (\SYSTEM\SECURITY\Security::isloggedin()){
$user = \SYSTEM\SECURITY\Security::getUser()->id;
} else {
throw new ERROR("U need to be logged in....sry bro / sis");
}
//echo "TEEEEEEEEEEEEEEEEEEEEEEEEEEEEST".$party.\SYSTEM\SECURITY\Security::getUser()->id;
return \DBD\UVOTE_ACCORD_WITH_FRACTION::QA(array('spd',1));
//return "test";
if (!\SYSTEM\SECURITY\Security::isloggedin()){
throw new ERROR("U need to be logged in....sry bro / sis");}
$user = \SYSTEM\SECURITY\Security::getUser()->id;
$data = \DBD\UVOTE_ACCORD_WITH_FRACTION::QA(array('spd',$user));
//$data_escaped = array_walk_recursive($data, 'mysql_real_escape_string');
return \SYSTEM\LOG\JsonResult::toString($data);
}
public static function get_users_choice_per_poll($poll_ID){
return \DBD\UVOTE_DATA_USERS_CHOICE_PER_POLL::QA(array($poll_ID));}

12
uVote/dbd/qq/UVOTE_ACCORD_WITH_FRACTION.php
View File

@ -6,8 +6,12 @@ class UVOTE_ACCORD_WITH_FRACTION extends \SYSTEM\DB\QP {
//pg
'',
//mys
'SELECT uvote_votes.*
FROM uvote_votes
WHERE ID IN (SELECT poll_ID FROM uvote_votes_per_party WHERE party = ?
AND choice = ?);'
' SELECT v.*, d.choice as user_choice, p.choice as party_choice
FROM uvote_data as d
LEFT JOIN uvote_votes as v
ON d.poll_ID = v.ID
LEFT JOIN uvote_votes_per_party as p
ON v.ID = p.poll_ID
WHERE p.party = ?
AND d.user_ID = ?;'
);}}