[phpws-comm-commits] modules/rolodex/class RDX_Forms.php, 1.1.1.1, 1.2 Rolodex.php, 1.1.1.1, 1.2

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

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

Modified Files:
	RDX_Forms.php Rolodex.php 
Log Message:
a few tweaks to csv export security

Index: RDX_Forms.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/class/RDX_Forms.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** RDX_Forms.php	4 Feb 2008 03:09:15 -0000	1.1.1.1
--- RDX_Forms.php	4 Feb 2008 04:16:21 -0000	1.2
***************
*** 265,268 ****
--- 265,272 ----
          $form->setMatch('privacy_business', PHPWS_Settings::get('rolodex', 'privacy_business'));
      
+         $form->addRadio('privacy_export', array(0, 1, 2));
+         $form->setLabel('privacy_export', array(dgettext('rolodex', 'Public'), dgettext('rolodex', 'Members only'), dgettext('rolodex', 'Restricted users')));
+         $form->setMatch('privacy_export', PHPWS_Settings::get('rolodex', 'privacy_export'));
+     
          $form->addCheckbox('enable_expiry', 1);
          $form->setMatch('enable_expiry', PHPWS_Settings::get('rolodex', 'enable_expiry'));
***************
*** 345,348 ****
--- 349,353 ----
          $tpl['PRIVACY_HOME_TITLE'] = dgettext('rolodex', 'Home address');
          $tpl['PRIVACY_BUSINESS_TITLE'] = dgettext('rolodex', 'Business address');
+         $tpl['PRIVACY_EXPORT_TITLE'] = dgettext('rolodex', 'CSV Export');
          $tpl['COMMENTS_GROUP_LABEL'] = dgettext('rolodex', 'Comments Settings');
          $tpl['PRIVACY_GROUP_LABEL'] = dgettext('rolodex', 'Privacy Settings');

Index: Rolodex.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/class/Rolodex.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Rolodex.php	4 Feb 2008 03:09:17 -0000	1.1.1.1
--- Rolodex.php	4 Feb 2008 04:16:21 -0000	1.2
***************
*** 240,252 ****
      
              case 'export':
!                 if (!PHPWS_Settings::get('rolodex', 'allow_anon') && !Current_User::getId()) {
!                     $this->title = PHPWS_Settings::get('rolodex', 'module_title');
!                     $this->content = dgettext('rolodex', 'NEED PERM ERROR HERE.');
!                 } else {
! //                    PHPWS_Core::initModClass('rolodex', 'RDX_Forms.php');
! //                    $this->forms = new Rolodex_Forms;
! //                    $this->forms->rolodex = & $this;
! //                    $this->forms->listMembers(1);
                      $this->exportCSV();
                  }
                  break;
--- 240,249 ----
      
              case 'export':
!                 PHPWS_Core::initModClass('rolodex', 'RDX_Member.php');
!                 if (Rolodex_Member::isDataVisible('privacy_export')) {
                      $this->exportCSV();
+                 } else {
+                     $this->title = PHPWS_Settings::get('rolodex', 'module_title');
+                     $this->content = dgettext('rolodex', 'Sorry, your access does not allow CSV exporting.');
                  }
                  break;
***************
*** 452,455 ****
--- 449,453 ----
          PHPWS_Settings::set('rolodex', 'privacy_home', $_POST['privacy_home']);
          PHPWS_Settings::set('rolodex', 'privacy_business', $_POST['privacy_business']);
+         PHPWS_Settings::set('rolodex', 'privacy_export', $_POST['privacy_export']);
  
          isset($_POST['enable_expiry']) ?