phpwebsite-comm-cvs-commits

[Verdon V. <ve...@us...>]

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

Modified Files:
	RDX_Forms.php RDX_Mypage.php 
Log Message:
0.9.0 updates

Index: RDX_Forms.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/class/RDX_Forms.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** RDX_Forms.php	24 Jun 2008 11:23:27 -0000	1.13
--- RDX_Forms.php	25 Jun 2008 02:48:43 -0000	1.14
***************
*** 244,250 ****
          } 
          
!         /* unset the browseLetter if a search is being done */
          if (isset($_REQUEST['search'])) {
              unset($_REQUEST['browseLetter']);
          }
  
--- 244,254 ----
          } 
          
!         /* unset the filters if a search is being done */
! //        if (isset($_REQUEST['search']) && $_REQUEST['clearFilters']) {
          if (isset($_REQUEST['search'])) {
              unset($_REQUEST['browseLetter']);
+             unset($_REQUEST['locations']);
+             unset($_REQUEST['features']);
+             unset($_REQUEST['categories']);
          }
  
***************
*** 303,306 ****
--- 307,315 ----
              }
          }
+ 
+ //        $ptags['CLEAR_FILTERS'] = '<input type="radio" name="clearFilters" value="1" checked="checked" />' . dgettext('rolodex', 'Clear filters or');
+ //        $ptags['CLEAR_FILTERS'] .= ' <input type="radio" name="clearFilters" value="0" />' . dgettext('rolodex', 'Search within results');
+         $ptags['CLEAR_FILTERS'] = dgettext('rolodex', 'Clears filters and searches all records.');
+ 
          $pager->addPageTags($ptags);
          $pager->addToggle('class="toggle1"');
***************
*** 453,456 ****
--- 462,466 ----
          $form = new PHPWS_Form('rolodex_adv_search');
  
+         $form->setMethod('get');
          $form->addHidden('module', 'rolodex');
          $form->addHidden('uop', 'adv_search');

Index: RDX_Mypage.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/class/RDX_Mypage.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** RDX_Mypage.php	17 Jun 2008 13:27:34 -0000	1.7
--- RDX_Mypage.php	25 Jun 2008 02:48:43 -0000	1.8
***************
*** 90,93 ****
--- 90,94 ----
      {
          $form = new PHPWS_Form('rolodex_search');
+         $form->setMethod('get');
          $form->addHidden('module', 'rolodex');
          $form->addHidden('uop', 'list');