X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=opac%2Fopac-messaging.pl;h=9e1e4f8129f18a49fc8a26e4514041d2a3f330b5;hb=873a3cb9bc265be3a5f95e5c481403eb311bffbd;hp=3292e4405e85c53cb42254aabaffbedaf6e9cb90;hpb=ca7db466d69eea4c28cd409b09261ad0669cad4f;p=koha_fer

diff --git a/opac/opac-messaging.pl b/opac/opac-messaging.pl
index 3292e4405e..9e1e4f8129 100755
--- a/opac/opac-messaging.pl
+++ b/opac/opac-messaging.pl
@@ -13,9 +13,9 @@
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
 # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 use strict;
 use warnings;
@@ -31,6 +31,7 @@ use C4::Dates qw/format_date/;
 use C4::Members;
 use C4::Members::Messaging;
 use C4::Branch;
+use C4::Form::MessagingPreferences;
 
 my $query = CGI->new();
 
@@ -57,66 +58,14 @@ if ( defined $query->param('modify') && $query->param('modify') eq 'yes' ) {
         $borrower = GetMemberDetails( $borrowernumber );
     }
 
-    # TODO: If a "NONE" box and another are checked somehow (javascript failed), we should pay attention to the "NONE" box
-    
-    # warn( Data::Dumper->Dump( [ $messaging_options ], [ 'messaging_options' ] ) );
-    OPTION: foreach my $option ( @$messaging_options ) {
-        # warn( Data::Dumper->Dump( [ $option ], [ 'option' ] ) );
-        my $updater = { borrowernumber          => $borrower->{'borrowernumber'},
-                        message_attribute_id    => $option->{'message_attribute_id'} };
-        
-        # find the desired transports
-        @{$updater->{'message_transport_types'}} = $query->param( $option->{'message_attribute_id'} );
-        next OPTION unless $updater->{'message_transport_types'};
-
-        if ( $option->{'has_digest'} ) {
-            if ( List::Util::first { $_ == $option->{'message_attribute_id'} } $query->param( 'digest' ) ) {
-                $updater->{'wants_digest'} = 1;
-            }
-        }
-
-        if ( $option->{'takes_days'} ) {
-            if ( defined $query->param( $option->{'message_attribute_id'} . '-DAYS' ) ) {
-                $updater->{'days_in_advance'} = $query->param( $option->{'message_attribute_id'} . '-DAYS' );
-            }
-        }
-
-        # warn( 'calling SetMessaginPreferencse with ' . Data::Dumper->Dump( [ $updater ], [ 'updater' ] ) );
-        C4::Members::Messaging::SetMessagingPreference( $updater );
-    }
-
-    # show the success message
-    $template->param( settings_updated => 1 );
-} 
-
-$messaging_options = C4::Members::Messaging::GetMessagingOptions();
-# walk through the options and update them with these borrower_preferences
-PREF: foreach my $option ( @$messaging_options ) {
-    my $pref = C4::Members::Messaging::GetMessagingPreferences( { borrowernumber     => $borrower->{'borrowernumber'},
-                                                                  message_name       => $option->{'message_name'} } );
-    # warn( Data::Dumper->Dump( [ $pref ], [ 'pref' ] ) );
-    # make a hashref of the days, selecting one.
-    if ( $option->{'takes_days'} ) {
-        foreach my $day ( 0..30 ) { # FIXME: 30 is a magic number.
-            my $dayrow = { day      => $day,
-                           selected => '' };
-            if ( defined $pref->{'days_in_advance'} && $pref->{'days_in_advance'} == $day ) {
-                $dayrow->{'selected'} = 'SELECTED';
-            }
-            push @{$option->{'select_days'}}, $dayrow
-        }
-    }
-    foreach my $transport ( @{$pref->{'transports'}} ) {
-        $option->{'transport-'.$transport} = 'checked="checked"';
-    }
-
-    $option->{'digest'} = $pref->{'wants_digest'} ? 'checked="checked"' : '';
+    C4::Form::MessagingPreferences::handle_form_action($query, { borrowernumber => $borrowernumber }, $template);
 }
 
+C4::Form::MessagingPreferences::set_form_values({ borrowernumber     => $borrower->{'borrowernumber'} }, $template);
+
 # warn( Data::Dumper->Dump( [ $messaging_options ], [ 'messaging_options' ] ) );
 $template->param( BORROWER_INFO         => [ $borrower ],
                   messagingview         => 1,
-                  messaging_preferences => $messaging_options,
                   SMSnumber => defined $borrower->{'smsalertnumber'} ? $borrower->{'smsalertnumber'} : $borrower->{'mobile'},
                   SMSSendDriver                =>  C4::Context->preference("SMSSendDriver") );