diff --git a/pykolab/cli/cmd_add_user_subscription.py b/pykolab/cli/cmd_add_user_subscription.py index 2b463e2..d8a8901 100644 --- a/pykolab/cli/cmd_add_user_subscription.py +++ b/pykolab/cli/cmd_add_user_subscription.py @@ -1,80 +1,85 @@ # -*- coding: utf-8 -*- # Copyright 2010-2013 Kolab Systems AG (http://www.kolabsys.com) # # Jeroen van Meeuwen (Kolab Systems) # # This program 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 3 of the License, or # (at your option) any later version. # This program 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 this program. If not, see . # import sys import commands import pykolab from pykolab.imap import IMAP from pykolab.translate import _ from pykolab import utils log = pykolab.getLogger('pykolab.cli') conf = pykolab.getConf() def __init__(): - commands.register('add_user_subscription', execute, description=description()) + commands.register( + 'add_user_subscription', + execute, + aliases=['aus', 'subscribe'], + description=description() + ) def description(): return _("Subscribe a user to a folder.") def execute(*args, **kw): folder_pattern = "*" try: user = conf.cli_args.pop(0) try: folder_pattern = conf.cli_args.pop(0) except IndexError, errmsg: folder_pattern = utils.ask_question(_("Folder pattern")) except IndexError, errmsg: user = utils.ask_question(_("User ID")) folder_pattern = utils.ask_question(_("Folder pattern")) if len(user.split('@')) > 1: domain = user.split('@')[1] else: domain = conf.get('kolab', 'primary_domain') imap = IMAP() imap.connect(domain=domain, login=False) backend = conf.get(domain, 'imap_backend') if backend == None: backend = conf.get('kolab', 'imap_backend') admin_login = conf.get(backend, 'admin_login') admin_password = conf.get(backend, 'admin_password') imap.login_plain(admin_login, admin_password, user) if not imap.has_folder(folder_pattern): print >> sys.stderr, \ _("Cannot subscribe user to folder %r:") % (folder_pattern), \ _("No such folder") sys.exit(1) _folders = imap.lm(folder_pattern) for _folder in _folders: imap.subscribe(_folder) diff --git a/pykolab/cli/cmd_list_user_subscriptions.py b/pykolab/cli/cmd_list_user_subscriptions.py index aef47db..9095604 100644 --- a/pykolab/cli/cmd_list_user_subscriptions.py +++ b/pykolab/cli/cmd_list_user_subscriptions.py @@ -1,104 +1,104 @@ # -*- coding: utf-8 -*- # Copyright 2010-2013 Kolab Systems AG (http://www.kolabsys.com) # # Jeroen van Meeuwen (Kolab Systems) # # This program 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 3 of the License, or # (at your option) any later version. # This program 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 this program. If not, see . # import commands import pykolab from pykolab import imap_utf7 from pykolab.imap import IMAP from pykolab.translate import _ from pykolab import utils log = pykolab.getLogger('pykolab.cli') conf = pykolab.getConf() def __init__(): - commands.register('list_user_subscriptions', execute, description=description()) + commands.register('list_user_subscriptions', execute, aliases='lus', description=description()) def cli_options(*args, **kw): my_option_group = conf.add_cli_parser_option_group(_("CLI Options")) my_option_group.add_option( '--raw', dest = "raw", action = "store_true", default = False, help = _("Display raw IMAP UTF-7 folder names")) my_option_group.add_option( '--unsubscribed', dest = "unsubscribed", action = "store_true", default = False, help = _("List unsubscribed folders")) def description(): return _("List the folders a user is subscribed to.") def execute(*args, **kw): folder_pattern = "*" try: user = conf.cli_args.pop(0) try: folder_pattern = conf.cli_args.pop(0) except IndexError, errmsg: pass except IndexError, errmsg: user = utils.ask_question(_("User ID")) if len(user.split('@')) > 1: domain = user.split('@')[1] else: domain = conf.get('kolab', 'primary_domain') imap = IMAP() imap.connect(domain=domain, login=False) backend = conf.get(domain, 'imap_backend') if backend == None: backend = conf.get('kolab', 'imap_backend') admin_login = conf.get(backend, 'admin_login') admin_password = conf.get(backend, 'admin_password') imap.login_plain(admin_login, admin_password, user) subscribed_folders = imap.lsub(folder_pattern) if conf.unsubscribed: unsubscribed_folders = [] all_folders = imap.lm(folder_pattern) for folder in all_folders: if not folder in subscribed_folders: unsubscribed_folders.append(folder) if len(unsubscribed_folders) > 0: if not conf.raw: print "\n".join([imap_utf7.decode(x) for x in unsubscribed_folders]) else: print "\n".join(unsubscribed_folders) else: print _("No unsubscribed folders for user %s") % (user) else: if not conf.raw: print "\n".join([imap_utf7.decode(x) for x in subscribed_folders]) else: print "\n".join(subscribed_folders) diff --git a/pykolab/cli/cmd_remove_user_subscription.py b/pykolab/cli/cmd_remove_user_subscription.py index d6ca9e2..59975c8 100644 --- a/pykolab/cli/cmd_remove_user_subscription.py +++ b/pykolab/cli/cmd_remove_user_subscription.py @@ -1,96 +1,101 @@ # -*- coding: utf-8 -*- # Copyright 2010-2013 Kolab Systems AG (http://www.kolabsys.com) # # Jeroen van Meeuwen (Kolab Systems) # # This program 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 3 of the License, or # (at your option) any later version. # This program 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 this program. If not, see . # import sys import commands import pykolab from pykolab.imap import IMAP from pykolab.translate import _ from pykolab import utils log = pykolab.getLogger('pykolab.cli') conf = pykolab.getConf() def __init__(): - commands.register('remove_user_subscription', execute, description=description()) + commands.register( + 'remove_user_subscription', + execute, + aliases=['rus', 'unsubscribe'], + description=description() + ) def description(): return _("Unsubscribe a user from a folder.") def execute(*args, **kw): folder_pattern = "*" try: user = conf.cli_args.pop(0) try: folder_pattern = conf.cli_args.pop(0) except IndexError, errmsg: folder_pattern = utils.ask_question(_("Folder pattern")) except IndexError, errmsg: user = utils.ask_question(_("User ID")) folder_pattern = utils.ask_question(_("Folder pattern")) if len(user.split('@')) > 1: domain = user.split('@')[1] else: domain = conf.get('kolab', 'primary_domain') imap = IMAP() imap.connect(domain=domain, login=False) backend = conf.get(domain, 'imap_backend') if backend == None: backend = conf.get('kolab', 'imap_backend') admin_login = conf.get(backend, 'admin_login') admin_password = conf.get(backend, 'admin_password') imap.login_plain(admin_login, admin_password, user) if not imap.has_folder(folder_pattern): print >> sys.stderr, \ _("Cannot subscribe user to folder %r:") % (folder_pattern), \ _("No such folder") sys.exit(1) _folders = imap.lm(folder_pattern) _subscribed_folders = imap.lsub() unsubscribed_folders = [] for _folder in _folders: if _folder in _subscribed_folders: imap.unsubscribe(_folder) unsubscribed_folders.append(_folder) if len(unsubscribed_folders) > 0: print _("Successfully unsubscribed user %s from the following folders:") % ( user ) print "\n".join(unsubscribed_folders) else: print >> sys.stderr, _("User %s was not unsubscribed from any folders.") % ( user ) sys.exit(1)