Julian/phpbb_board3-portal_tlw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[feature/module_services] Fix minor issues in portal_poll

Browse Source
This commit is contained in:
Marc Alexander
2013-11-12 14:59:01 +01:00
parent c37da45612
commit fd12ba4b8e
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
portal/modules/portal_poll.php
View File

@@ -214,10 +214,10 @@ class portal_poll_module extends \board3\portal\modules\module_base
if($s_can_up_vote) if($s_can_up_vote)
{ {
$redirect_url = append_sid("{$phpbb_root_path}app.$phpEx/portal");
if (!sizeof($voted_id) || sizeof($voted_id) > $topic_data['poll_max_options'] || in_array(VOTE_CONVERTED, $cur_voted_id)) if (!sizeof($voted_id) || sizeof($voted_id) > $topic_data['poll_max_options'] || in_array(VOTE_CONVERTED, $cur_voted_id))
{ {
$redirect_url = append_sid("{$phpbb_root_path}portal.$phpEx");
meta_refresh(5, $redirect_url); meta_refresh(5, $redirect_url);
if (!sizeof($voted_id)) if (!sizeof($voted_id))
{ {
@@ -295,8 +295,6 @@ class portal_poll_module extends \board3\portal\modules\module_base
//, topic_last_post_time = ' . time() . " -- for bumping topics with new votes, ignore for now //, topic_last_post_time = ' . time() . " -- for bumping topics with new votes, ignore for now
$db->sql_query($sql); $db->sql_query($sql);
$redirect_url = append_sid("{$phpbb_root_path}portal.$phpEx");
meta_refresh(5, $redirect_url); meta_refresh(5, $redirect_url);
trigger_error($user->lang['VOTE_SUBMITTED'] . '<br /><br />' . sprintf($user->lang['RETURN_PORTAL'], '<a href="' . $redirect_url . '">', '</a>')); trigger_error($user->lang['VOTE_SUBMITTED'] . '<br /><br />' . sprintf($user->lang['RETURN_PORTAL'], '<a href="' . $redirect_url . '">', '</a>'));
} }
@@ -437,8 +435,8 @@ class portal_poll_module extends \board3\portal\modules\module_base
} }
$poll_view_str = urlencode(implode(',', $make_poll_view)); $poll_view_str = urlencode(implode(',', $make_poll_view));
$portalpoll_url= append_sid("{$phpbb_root_path}portal.$phpEx", "polls=$poll_view_str"); $portalpoll_url= append_sid("{$phpbb_root_path}app.$phpEx/portal", "polls=$poll_view_str");
$portalvote_url= append_sid("{$phpbb_root_path}portal.$phpEx", "f=$forum_id&amp;t=$topic_id"); $portalvote_url= append_sid("{$phpbb_root_path}app.$phpEx/portal", "f=$forum_id&amp;t=$topic_id");
$viewtopic_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$forum_id&amp;t=$topic_id"); $viewtopic_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$forum_id&amp;t=$topic_id");
$poll_end = $data['poll_length'] + $data['poll_start']; $poll_end = $data['poll_length'] + $data['poll_start'];

2
styles/prosilver/template/portal/modules/poll_side.html
View File

@@ -46,7 +46,7 @@
</div> </div>
<!-- IF poll_side.S_CAN_VOTE -->{poll_side.S_HIDDEN_FIELDS}<!-- ENDIF --> <!-- IF poll_side.S_CAN_VOTE -->{poll_side.S_HIDDEN_FIELDS}<!-- ENDIF -->
<!-- IF poll_side.S_CAN_VOTE --></form><!-- ENDIF --> <!-- IF poll_side.S_CAN_VOTE --></form><!-- ENDIF -->
<!-- END poll --> <!-- END poll_side -->
</div> </div>
<!-- ELSE --> <!-- ELSE -->
<div class="panel bg1" style="margin-bottom: 0px"> <div class="panel bg1" style="margin-bottom: 0px">