diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
index e174c99f67..defe58ef2e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
@@ -61,6 +61,9 @@
+
+
+
+
+
+
+
+
+
Userid / Password update failed
+
Insufficient privileges.
+
Other fields updated.
+
+
+
Unable to delete staff user
+
Insufficient privileges.
+
+
+
Unable to delete patrons from other libraries with current settings
+
Insufficient privileges.
+
+
+
Unable to delete patron:
+
Insufficient privileges.
+
+
+
+
+
+
+ This patron does not exist.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/members/messaging.pl b/members/messaging.pl
new file mode 100755
index 0000000000..d7dd5bbe11
--- /dev/null
+++ b/members/messaging.pl
@@ -0,0 +1,150 @@
+#!/usr/bin/perl
+
+# Copyright 2008 LibLime
+#
+# This file is part of Koha.
+#
+# Koha is free software; you can redistribute it and/or modify it under the
+# terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+# 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
+
+
+use strict;
+use CGI;
+use C4::Context;
+use C4::Auth;
+use C4::Output;
+use C4::Members;
+use C4::Members::Messaging;
+use C4::Dates;
+use C4::Reserves;
+use C4::Circulation;
+use C4::Koha;
+use C4::Letters;
+use C4::Biblio;
+use C4::Reserves;
+use C4::Branch; # GetBranchName
+
+use Data::Dumper;
+
+use vars qw($debug);
+
+BEGIN {
+ $debug = $ENV{DEBUG} || 0;
+}
+
+my $dbh = C4::Context->dbh;
+
+my $query = CGI->new();
+
+my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+ {
+ template_name => 'members/messaging.tmpl',
+ query => $query,
+ type => "intranet",
+ authnotrequired => 0,
+ flagsrequired => { borrowers => 1 },
+ debug => 1,
+ }
+);
+my $borrowernumber = $query->param('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 );
+ }
+
+ # 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'};
+}
+
+
+# get some recent messages sent to this borrower for display:
+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,
+ branch => $branch,
+ dateformat => C4::Context->preference("dateformat"),
+ categoryname => $borrower->{'description'},
+ $borrower->{'categorycode'} => 1,
+);
+
+$messaging_preferences->{'SMSnumber'}{'value'} = defined $borrower->{'smsalertnumber'}
+ ? $borrower->{'smsalertnumber'} : $borrower->{'mobile'};
+
+$template->param( BORROWER_INFO => [ $borrower ],
+ messagingview => 1,
+ messaging_preferences => $messaging_options,
+ SMSnumber => defined $borrower->{'smsalertnumber'} ? $borrower->{'smsalertnumber'} : $borrower->{'mobile'} );
+
+output_html_with_http_headers $query, $cookie, $template->output;