[phpws-comm-commits] modules/poll/class admin.php, 1.9, 1.10 poll.php, 1.10, 1.11

[Greg M. <bli...@us...>]

Update of /cvsroot/phpwebsite-comm/modules/poll/class
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9517/class

Modified Files:
	admin.php poll.php 
Log Message:
Now using mod_rewrite, added cacheQueries and addSortHeader, and saving a poll now sets manage tab.

Index: poll.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/poll/class/poll.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** poll.php	15 Oct 2007 02:50:40 -0000	1.10
--- poll.php	12 Jul 2008 02:45:15 -0000	1.11
***************
*** 413,424 ****
              $template['TITLE']    = $this->getTitle();
              $template['QUESTION'] = $this->getQuestion();
!             $template['VOTES']    = PHPWS_Text::moduleLink($this->getTotalNumberVotes(TRUE), 'poll',
!                                                            array('user'=>'results', 'poll_id'=>$this->getId()));
              if ($this->allow_comments)
              {
                  PHPWS_Core::initModClass('comments', 'Comments.php');
                  $comments = Comments::getThread($this->key_id);
!                 $template['COMMENTS'] = PHPWS_Text::moduleLink($comments->countComments(TRUE), 'poll',
!                                                                array('user'=>'results', 'poll_id'=>$this->getId()));
              }
              return PHPWS_Template::process($template, 'poll', 'poll/boxstyles/default.tpl');
--- 413,441 ----
              $template['TITLE']    = $this->getTitle();
              $template['QUESTION'] = $this->getQuestion();
! 
!             if (MOD_REWRITE_ENABLED)
!             {
!                 $template['VOTES'] = sprintf('<a href="poll/%d">%s</a>', $this->getId(), $this->getTotalNumberVotes(TRUE));
!             }
!             else
!             {
!                 $template['VOTES'] = PHPWS_Text::moduleLink($this->getTotalNumberVotes(TRUE), 'poll',
!                                                             array('user'=>'results', 'poll_id'=>$this->getId()));
!             }
! 
              if ($this->allow_comments)
              {
                  PHPWS_Core::initModClass('comments', 'Comments.php');
                  $comments = Comments::getThread($this->key_id);
! 
!                 if (MOD_REWRITE_ENABLED)
!                 {
!                     $template['COMMENTS'] = sprintf('<a href="poll/%d#comments">%s</a>', $this->getId(), $comments->countComments(TRUE));
!                 }
!                 else
!                 {
!                     $template['COMMENTS'] = PHPWS_Text::moduleLink($comments->countComments(TRUE), 'poll',
!                                                                    array('user'=>'results', 'poll_id'=>$this->getId()));
!                 }
              }
              return PHPWS_Template::process($template, 'poll', 'poll/boxstyles/default.tpl');

Index: admin.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/poll/class/admin.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** admin.php	12 Jul 2008 00:24:45 -0000	1.9
--- admin.php	12 Jul 2008 02:45:15 -0000	1.10
***************
*** 51,55 ****
          }
  
!         $panel->setContent(Poll_Admin::route($action));
          Layout::add(PHPWS_ControlPanel::display($panel->display()));
      }
--- 51,55 ----
          }
  
!         $panel->setContent(Poll_Admin::route($action, $panel));
          Layout::add(PHPWS_ControlPanel::display($panel->display()));
      }
***************
*** 73,77 ****
      }
  
!     function route($action)
      {
          $title   = NULL;
--- 73,77 ----
      }
  
!     function route($action, &$panel)
      {
          $title   = NULL;
***************
*** 191,194 ****
--- 191,196 ----
  
              case 'managePolls':
+                 /* Need to set tab in case we got here from another action. */
+                 $panel->setCurrentTab('managePolls');
                  $title = dgettext('poll', 'Manage Polls');
                  $content = Poll_Admin::listPolls();
***************
*** 384,394 ****
          PHPWS_Core::initCoreClass('DBPager.php');
  
!         $pageTags['TITLE']          = dgettext('poll', 'Title');
!         $pageTags['QUESTION']       = dgettext('poll', 'Question');
!         $pageTags['CREATED']        = dgettext('poll', 'Created');
!         $pageTags['USERS_ONLY']     = dgettext('poll', 'Users Only');
!         $pageTags['ALLOW_COMMENTS'] = dgettext('poll', 'Comments');
!         $pageTags['ACTIVE']         = dgettext('poll', 'Active');
!         $pageTags['ACTION']         = dgettext('poll', 'Action');
          $pager = new DBPager('poll', 'Poll');
          $pager->setModule('poll');
--- 386,390 ----
          PHPWS_Core::initCoreClass('DBPager.php');
  
!         $pageTags['ACTION'] = dgettext('poll', 'Action');
          $pager = new DBPager('poll', 'Poll');
          $pager->setModule('poll');
***************
*** 399,403 ****
--- 395,406 ----
          $pager->setSearch('title', 'question');
          $pager->setDefaultOrder('title', 'asc');
+         $pager->addSortHeader('title', dgettext('poll', 'Title'));
+         $pager->addSortHeader('question', dgettext('poll', 'Question'));
+         $pager->addSortHeader('created', dgettext('poll', 'Created'));
+         $pager->addSortHeader('users_only', dgettext('poll', 'Users Only'));
+         $pager->addSortHeader('allow_comments', dgettext('poll', 'Comments'));
+         $pager->addSortHeader('active', dgettext('poll', 'Active'));
          $pager->setEmptyMessage(dgettext('poll', 'No polls found.'));
+         $pager->cacheQueries();
  
          return $pager->get();