diff options
| -rw-r--r-- | MANIFEST | 1 | ||||
| -rw-r--r-- | Makefile.PL | 2 | ||||
| -rw-r--r-- | debian/control | 7 | ||||
| -rw-r--r-- | debian/rhrd-utils-ws.install | 1 | ||||
| -rwxr-xr-x | utils/rhrd-show | 10 | ||||
| -rwxr-xr-x | utils/rhrd-ws-login | 70 |
6 files changed, 9 insertions, 82 deletions
@@ -12,4 +12,3 @@ utils/rhrd-group utils/rhrd-show utils/rhrd-user utils/rhrd-sanity-check -utils/rhrd-ws-login diff --git a/Makefile.PL b/Makefile.PL index 7a1b2de..a919bae 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -1,7 +1,7 @@ use ExtUtils::MakeMaker; use 5.004; -my @utils = qw(get-rd-token get-rd-week update-rd-tokens rhrd-user rhrd-group rhrd-show rhrd-ws-login rhrd-sanity-check); +my @utils = qw(get-rd-token get-rd-week update-rd-tokens rhrd-user rhrd-group rhrd-show rhrd-sanity-check); WriteMakefile( NAME => 'RHRD', diff --git a/debian/control b/debian/control index b8ae9a5..1b96d65 100644 --- a/debian/control +++ b/debian/control @@ -25,10 +25,3 @@ Description: Radio Helsinki Rivendell Utilities * rhrd-show * rhrd-user * rhrd-sanity-check - -Package: rhrd-utils-ws -Architecture: all -Depends: ${misc:Depends}, ${perl:Depends}, librhrd-perl -Description: Radio Helsinki Rivendell Utilities for Workstations - This package contains the following tools - * rhrd-ws-login diff --git a/debian/rhrd-utils-ws.install b/debian/rhrd-utils-ws.install deleted file mode 100644 index da3ee4e..0000000 --- a/debian/rhrd-utils-ws.install +++ /dev/null @@ -1 +0,0 @@ -usr/bin/rhrd-ws-login diff --git a/utils/rhrd-show b/utils/rhrd-show index 60a322c..8360c5c 100755 --- a/utils/rhrd-show +++ b/utils/rhrd-show @@ -72,7 +72,13 @@ sub show sub add__check_arguments { - my ($name, $title, $num_carts, $rhythm, $dow, $starttime, $len) = @_; + my ($groupname, $name, $title, $num_carts, $rhythm, $dow, $starttime, $len) = @_; + + if($groupname !~ m/^[-a-zA-Z0-9_]{1,10}$/) { + print STDERR "name '" . $groupname . "' contains illegal characters or is too long/short\n"; + print STDERR " only a-z, A-Z, 0-9 and _,- are allowed and the length must be between 1 and 10\n"; + return 1; + } if($name !~ m/^[a-zA-Z0-9_]{1,10}$/) { print STDERR "name '" . $name . "' contains illegal characters or is too long/short\n"; @@ -116,7 +122,7 @@ sub add { my ($ctx, $groupname, $name, $title, $num_carts, $rhythm, $dow, $starttime, $len) = @_; - my $ret = add__check_arguments($name, $title, $num_carts, $rhythm, $dow, $starttime, $len); + my $ret = add__check_arguments($groupname, $name, $title, $num_carts, $rhythm, $dow, $starttime, $len); if($ret) { return $ret; } diff --git a/utils/rhrd-ws-login b/utils/rhrd-ws-login deleted file mode 100755 index b9f4a81..0000000 --- a/utils/rhrd-ws-login +++ /dev/null @@ -1,70 +0,0 @@ -#!/usr/bin/perl -w -# -# rhrdlibs -# -# Copyright (C) 2015-2016 Christian Pointner <equinox@helsinki.at> -# -# This file is part of rhrdlibs. -# -# rhrdlibs is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# any later version. -# -# rhrdlibs 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 Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with rhrdlibs. If not, see <http://www.gnu.org/licenses/>. -# - -use strict; -use RHRD::rddb; - -sub print_usage -{ - print STDERR "Usage: rhrd-ws-login (login|logout)\n"; -} - -my $num_args = $#ARGV + 1; -if($num_args != 1) { - print_usage(); - exit 1; -} -my $cmd = $ARGV[0]; -my $username = $ENV{'USER'}; - -my $ret = 0; - -my ($ctx, undef, $errorstring) = RHRD::rddb::init(); -if(defined $ctx) { - my $macro = ''; - if($cmd eq "logout") { - $macro = "LO!"; - } - elsif($cmd eq "login") { - (my $token, undef, $errorstring) = RHRD::rddb::get_token($ctx, $username); - if($token) { - $token =~ s/([ !'"\\])/\\$1/g; - $macro = "LO $username $token!"; - } else { - print STDERR "$errorstring\n"; - $macro = "LO!"; - } - } - else { - print_usage(); - $ret = 1; - } - RHRD::rddb::destroy($ctx); - unless ($macro eq '') { - system('/usr/bin/rmlsend', $macro) == 0 or die "system(/usr/bin/rmlsend, $macro) failed: $?"; - } -} else { - print STDERR "$errorstring\n"; - $ret = 1; -} - -exit $ret; |