[geeklog-cvs] Geeklog-1.x/plugins/polls functions.inc,1.89,1.90

[Dirk Haun]

Update of /cvsroot/geeklog/Geeklog-1.x/plugins/polls
In directory qs1489.pair.com:/tmp/cvs-serv5030/plugins/polls

Modified Files:
	functions.inc 
Log Message:
Fixed display of "Results" link while a poll is open


Index: functions.inc
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/polls/functions.inc,v
retrieving revision 1.89
retrieving revision 1.90
diff -C2 -d -r1.89 -r1.90
*** functions.inc	31 May 2008 07:55:08 -0000	1.89
--- functions.inc	16 Aug 2008 19:43:58 -0000	1.90
***************
*** 497,513 ****
                  $poll->set_var('lang_vote', $LANG_POLLS['vote']);
                  $poll->set_var('lang_votes', $LANG_POLLS['votes']);
-                 $results = "";
  
!                 if (($P['is_open'] == 0) || (
!                         ($P['hideresults'] == 1) && (isset($_USER['uid']) && $_USER['uid'] == $P['owner_id'])
!                     ) || (
!                         ($P['hideresults'] == 1) && (SEC_inGroup('Root'))
!                     )
!                 ) {
                      $results = COM_createLink($LANG_POLLS['results'],
!                         "{$_CONF['site_url']}/polls/index.php?pid="
!                         . "$pid&aid=-1");
                  }
                  $poll->set_var('poll_results', $results);
                  $access = SEC_hasAccess($topic['owner_id'],$topic['group_id'],$topic['perm_owner'],
                      $topic['perm_group'],$topic['perm_members'],$topic['perm_anon']);
--- 497,515 ----
                  $poll->set_var('lang_vote', $LANG_POLLS['vote']);
                  $poll->set_var('lang_votes', $LANG_POLLS['votes']);
  
!                 $results = '';
!                 if (($P['is_open'] == 0) || ($P['hideresults'] == 0) ||
!                     (($P['hideresults'] == 1) &&
!                         (
!                         SEC_inGroup('Root') ||
!                         (isset($_USER['uid'])
!                             && ($_USER['uid'] == $P['owner_id']))
!                         ))) {
                      $results = COM_createLink($LANG_POLLS['results'],
!                         $_CONF['site_url'] . '/polls/index.php?pid=' . $pid
!                         . '&aid=-1');
                  }
                  $poll->set_var('poll_results', $results);
+ 
                  $access = SEC_hasAccess($topic['owner_id'],$topic['group_id'],$topic['perm_owner'],
                      $topic['perm_group'],$topic['perm_members'],$topic['perm_anon']);