diff --git a/config.php b/config.php index ee89ee8..6fe3d88 100644 --- a/config.php +++ b/config.php @@ -15,5 +15,5 @@ $uvote_config = array( array(SYSTEM\CONFIG\config_ids::SYS_CONFIG_ERRORREPORTIN array(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_TITLE, 'mojotrollz - Admin Area'), array(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_COPYRIGHT, 'uVote, © WebCraft Media 2013'), - array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_LANGS, array('deDE', 'enUS', 'huHU')), + array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_LANGS, array('deDE', 'enUS')), array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DEFAULT_LANG, 'deDE')); \ No newline at end of file diff --git a/uVote/api/votes/votes.php b/uVote/api/votes/votes.php index ae15727..10045c4 100644 --- a/uVote/api/votes/votes.php +++ b/uVote/api/votes/votes.php @@ -2,16 +2,7 @@ class votes { public static function getAllVotesOfGroup($groupid){ - $con = new \SYSTEM\DB\Connection(new \DBD\uVote()); - $res = $con->prepare( 'selVoteByGrp', - 'SELECT * FROM `uvote_votes` WHERE `group` = ?;', - array($groupid)); - $result = array(); - while($r = $res->next()){ - $result[] = $r;} - - return $result; - } + return \DBD\UVOTE_GENERATE_VOTELIST::QA(array($groupid));} public static function getVoteOfGroup($poll_ID){ $con = new \SYSTEM\DB\Connection(new \DBD\uVote()); diff --git a/uVote/dbd/autoload.inc.php b/uVote/dbd/autoload.inc.php index 91ed195..86529c2 100644 --- a/uVote/dbd/autoload.inc.php +++ b/uVote/dbd/autoload.inc.php @@ -1,6 +1,7 @@ registerFolder(dirname(__FILE__).'/tbl/definitions/','DBD\DEFINITIONS'); //$autoload->registerFolder(dirname(__FILE__).'/tbl/data/','DBD\DATA'); //$autoload->registerFolder(dirname(__FILE__).'/tbl/data_processed/','DBD\DATA_PROCESSED'); \ No newline at end of file diff --git a/uVote/dbd/qq/UVOTE_GENERATE_VOTELIST.php b/uVote/dbd/qq/UVOTE_GENERATE_VOTELIST.php new file mode 100644 index 0000000..3f4e2f4 --- /dev/null +++ b/uVote/dbd/qq/UVOTE_GENERATE_VOTELIST.php @@ -0,0 +1,11 @@ + + diff --git a/uVote/page/default_cover/default_cover.php b/uVote/page/default_cover/default_cover.php new file mode 100644 index 0000000..7cd5c90 --- /dev/null +++ b/uVote/page/default_cover/default_cover.php @@ -0,0 +1,14 @@ +js(); $vars['css'] = $this->css(); - $vars['votelist'] = $this->generate_votelist(); + $vars['votelist'] = \SYSTEM\SECURITY\Security::isLoggedIn() ? $this->generate_votelist() : $this->get_coverpage() ; $vars['vote'] = $this->generate_vote(); $vars['registerform'] = \SYSTEM\SECURITY\Security::isLoggedIn() ? $this->getloggedinform() : $this->exchange_registerform(); $vars['loginform'] = \SYSTEM\SECURITY\Security::isLoggedIn() ? $this->exchange_loginform() : $this->getloginform() ; - $vars['PIC_PATH'] = SYSTEM\WEBPATH(new PPAGE(),'default_page/pics/'); + $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)); + return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/page.html'), $vars); } diff --git a/uVote/page/default_page/loginform.tpl b/uVote/page/default_page/loginform.tpl index d6ef44c..b98d11c 100644 --- a/uVote/page/default_page/loginform.tpl +++ b/uVote/page/default_page/loginform.tpl @@ -6,30 +6,31 @@