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 90d1542..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;
@@ -33,7 +35,6 @@ use C4::Letters;
 use C4::Biblio;
 use C4::Reserves;
 use C4::Branch; # GetBranchName
-use C4::Form::MessagingPreferences;
 
 use Data::Dumper;
 
@@ -58,25 +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 );
-
-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 );
-    }
-    C4::Form::MessagingPreferences::handle_form_action($query, { borrowernumber => $borrowernumber }, $template);
-} 
+$borrower = GetMemberDetails( $borrowernumber );
 
-C4::Form::MessagingPreferences::set_form_values({ borrowernumber => $borrowernumber }, $template);
 
     if ( $borrower->{'category_type'} eq 'C') {
         my  ( $catcodes, $labels ) =  GetborCatFromCatType( 'A', 'WHERE category_type = ?' );
@@ -100,7 +89,6 @@ $template->param( messagingview               => 1,
                   dateformat                  => C4::Context->preference("dateformat"),
                   categoryname                => $borrower->{'description'},
                   $borrower->{'categorycode'} => 1,
-                  SMSSendDriver                =>  C4::Context->preference("SMSSendDriver")
 );
 
 #$messaging_preferences->{'SMSnumber'}{'value'} = defined $borrower->{'smsalertnumber'}
@@ -109,6 +97,6 @@ $template->param( messagingview               => 1,
 $template->param( BORROWER_INFO         => [ $borrower ],
                   messagingview         => 1,
                                  is_child        => ($borrower->{'category_type'} eq 'C'),
-                  SMSnumber             => defined $borrower->{'smsalertnumber'} ? $borrower->{'smsalertnumber'} : $borrower->{'mobile'} );
+                );
 
 output_html_with_http_headers $query, $cookie, $template->output;