Merge branch 'translation' of git://git.workbuffer.org/git/koha into master

[koha_gimpoz] / members / messaging.pl

diff --git a/members/messaging.pl b/members/messaging.pl
index eff6ee4..ef9cfa4 100755 (executable)
--- a/members/messaging.pl
+++ b/members/messaging.pl
@@ -13,12 +13,14 @@
 # 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;
+
 use CGI;
 use C4::Context;
 use C4::Auth;
@@ -57,72 +59,13 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     }
 );
 my $borrowernumber = $query->param('borrowernumber');
-my $borrower       = GetMember( $borrowernumber ,'borrowernumber');
+my $borrower       = GetMember( 'borrowernumber' => $borrowernumber );
 my $branch         = C4::Context->userenv->{'branch'};
 
 $template->param( $borrower );
 
-my $borrower = GetMemberDetails( $borrowernumber );
-
-my $messaging_options = C4::Members::Messaging::GetMessagingOptions();
-my $messaging_preferences;
-
-if ( defined $query->param('modify') && $query->param('modify') eq 'yes' ) {
-
-    # If they've modified the SMS number, record it.
-    if ( ( defined $query->param('SMSnumber') ) && ( $query->param('SMSnumber') ne $borrower->{'mobile'} ) ) {
-        ModMember( borrowernumber => $borrowernumber,
-                   smsalertnumber => $query->param('SMSnumber') );
-        $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 );
-    }
+$borrower = GetMemberDetails( $borrowernumber );
 
-    # show the success message
-    $template->param( settings_updated => 1 );
-} 
-
-# 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'} ) {
-        @{$option->{'select_days'}} = map {; { day        => $_,
-                                               selected   => $_ == $pref->{'days_in_advance'} ? 'SELECTED' :'' } } ( 0..30 ); # FIXME: 30 is a magic number.
-    }
-    foreach my $transport ( @{$pref->{'transports'}} ) {
-        $option->{'transport-'.$transport} = 'CHECKED';
-    }
-    $option->{'digest'} = 'CHECKED' if $pref->{'wants_digest'};
-}
 
     if ( $borrower->{'category_type'} eq 'C') {
         my  ( $catcodes, $labels ) =  GetborCatFromCatType( 'A', 'WHERE category_type = ?' );
@@ -138,24 +81,22 @@ $template->param( picture => 1 ) if $picture;
 my $message_queue = C4::Letters::GetQueuedMessages( { borrowernumber => $query->param('borrowernumber') } );
 
 $template->param( messagingview               => 1,
-                  messaging_preferences       => [ $messaging_preferences ],
                   message_queue               => $message_queue,
                   DHTMLcalendar_dateformat    => C4::Dates->DHTMLcalendar(), 
                   borrowernumber              => $borrowernumber,
                   branchcode                  => $borrower->{'branchcode'},
-                 branchname                  => GetBranchName($borrower->{'branchcode'}),
+                  branchname                 => GetBranchName($borrower->{'branchcode'}),
                   dateformat                  => C4::Context->preference("dateformat"),
                   categoryname                => $borrower->{'description'},
                   $borrower->{'categorycode'} => 1,
 );
 
-$messaging_preferences->{'SMSnumber'}{'value'} = defined $borrower->{'smsalertnumber'}
-  ? $borrower->{'smsalertnumber'} : $borrower->{'mobile'};
+#$messaging_preferences->{'SMSnumber'}{'value'} = defined $borrower->{'smsalertnumber'}
+#  ? $borrower->{'smsalertnumber'} : $borrower->{'mobile'};
 
 $template->param( BORROWER_INFO         => [ $borrower ],
                   messagingview         => 1,
-                  messaging_preferences => $messaging_options,
                                  is_child        => ($borrower->{'category_type'} eq 'C'),
-                  SMSnumber             => defined $borrower->{'smsalertnumber'} ? $borrower->{'smsalertnumber'} : $borrower->{'mobile'} );
+                );
 
 output_html_with_http_headers $query, $cookie, $template->output;