Attachment #3817 for bug #22902

(-)debian/control (+1 lines)

Lines 16-21	Link Here

 foomatic-db

 foomatic-db

Standards-Version: 3.8.2

Standards-Version: 3.8.2

Package: univention-printserver

Package: univention-printserver

Architecture: all

Architecture: all

Depends: ${misc:Depends}, ${python:Depends},

Depends: ${misc:Depends}, ${python:Depends},

(-)umc/python/printers/de.po (-3 / +3 lines)

Lines 4-13	Link Here

"Project-Id-Version: univention-management-console-module-printers\n"

"Project-Id-Version: univention-management-console-module-printers\n"

"Report-Msgid-Bugs-To: packages@univention.de\n"

"Report-Msgid-Bugs-To: packages@univention.de\n"

"POT-Creation-Date: 2011-11-07 12:45+0100\n"

"POT-Creation-Date: 2011-11-07 12:45+0100\n"

"PO-Revision-Date: 2011-11-09 20:20+0100\n"

"PO-Revision-Date: 2011-11-17 14:18+0100\n"

"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

"Last-Translator: Frank Greif <fg@it25.de>\n"

"Language-Team: LANGUAGE <LL@li.org>\n"

"Language-Team: LANGUAGE <LL@li.org>\n"

"Language: \n"

"Language: de\n"

"MIME-Version: 1.0\n"

"MIME-Version: 1.0\n"

"Content-Type: text/plain; charset=UTF-8\n"

"Content-Type: text/plain; charset=UTF-8\n"

"Content-Transfer-Encoding: 8bit\n"

"Content-Transfer-Encoding: 8bit\n"




import univention.config_registry

from fnmatch import *
from time import sleep
import re
import string
import subprocess


		self.finished(request.id,result)

	def get_printer(self,request):
		""" gets detail data for one printer. """
		
		# ----------- DEBUG -----------------

			MODULE.info("   << %s" % s)
		# -----------------------------------
		
		printer = request.options.get('printer','')
		result = self._job_list(printer)
		
		# ---------- DEBUG --------------
		MODULE.info("printers/jobs/query returns:")

	def list_quota(self,request):
		""" lists all quota entries related to this printer. """
		
		# ----------- DEBUG -----------------
		MODULE.info("printers/quota/query invoked with:")
		pp = pprint.PrettyPrinter(indent=4)
		st = pp.pformat(request.options).split("\n")
		for s in st:
			MODULE.info("   << %s" % s)
		# -----------------------------------
		
		printer = request.options.get('printer','')

		result = []

		(stdout,stderr,status) = self._shell_command(['/usr/bin/pkusers','--list'],{'LANG':'C'})
		users = []
		expr = re.compile('^\s*(.*?)\s+\-\s\<')
		if status == 0:
			for line in stdout.split("\n"):
				match = expr.match(line)
				if match:
					users.append(match.group(1))
					
		result = []
		for user in users:
			(stdout,stderr,status) = self._shell_command(['/usr/bin/repykota','-P',printer,user],{'LANG':'C'})
			if status == 0:
				for line in stdout.split("\n"):
					data = line[16:].split()		# ignore possibly truncated user name
					if len(data) >= 7:
						ok = True
						for n in (2,3,4,len(data)-3):
							if not data[n].isdigit():
								ok = False
						if ok:
							MODULE.info("      -> user='%s' used=%s soft=%s hard=%s total=%s" % (user,data[2],data[3],data[4],data[len(data)-3]))
							entry = {
								'user':		user,
								'used':		data[2],
								'soft':		data[3],
								'hard':		data[4],
								'total':	data[len(data)-3]
							}
							result.append(entry)
		
		# ---------- DEBUG --------------
		MODULE.info("printers/quota/query returns:")
		pp = pprint.PrettyPrinter(indent=4)
		st = ''
		if len(result) > 5:
			tmp = result[0:5]
			MODULE.info("   >> %d entries, first 5 are:" % len(result))
			st = pp.pformat(tmp).split("\n")
		else:
			st = pp.pformat(result).split("\n")
		for s in st:
			MODULE.info("   >> %s" % s)
		# --------------------------------

		self.finished(request.id,result)
		
	def list_users(self,request):
		""" convenience function for the username entry. Lists
			all user names. We don't return this as an array of {id,label}
			tuples because:
			
			(1) id and label are always the same here
			(2) at the frontend, we must do some postprocessing, and an array
				is easier to handle.
			(3)	the ComboBox is able to handle a plain array. 
		"""
		
		# ----------- DEBUG -----------------
		MODULE.info("printers/users/query invoked with:")
		pp = pprint.PrettyPrinter(indent=4)
		st = pp.pformat(request.options).split("\n")
		for s in st:
			MODULE.info("   << %s" % s)
		# -----------------------------------
		
		result = []
		expr = re.compile('^\s*username:\s*(.*?)\s*$')
		(stdout,stderr,status) = self._shell_command(['/usr/sbin/univention-directory-manager','users/user','list'],{'LANG':'C'})
		if status == 0:
			for line in stdout.split("\n"):
				match = expr.match(line)
				if match:
					MODULE.warn("  -> %s" % match.group(1))
					result.append(match.group(1))
					
		# simulate 10000 more users
		for g in range(0,100):
			gn = 'group %d' % g
			for u in range(0,100):
				un = 'user %d' % u
				result.append('%s in %s' % (un,gn))

		# ---------- DEBUG --------------
		MODULE.info("printers/users/query returns:")
		pp = pprint.PrettyPrinter(indent=4)
		st = ''
		if len(result) > 5:
			tmp = result[0:5]
			MODULE.info("   >> %d entries, first 5 are:" % len(result))
			st = pp.pformat(tmp).split("\n")
		else:
			st = pp.pformat(result).split("\n")
		for s in st:
			MODULE.info("   >> %s" % s)
		# --------------------------------

		self.finished(request.id,result)
		
	def enable_printer(self,request):
		""" can enable or disable a printer, depending on args.
			returns empty string on success, else error message. 
		"""


		self.finished(request.id, result)
		
	def cancel_jobs(self,request):
		""" cancels one or more print jobs. Job IDs are passed
			as an array that can be directly passed on to the
			_shell_command() method


		self.finished(request.id, result)
		

	def set_quota(self,request):
		""" sets quota limits for a (printer,user) combination.
			optionally tries to create the corresponding user entry.
		"""

		# ----------- DEBUG -----------------
		MODULE.info("printers/quota/set invoked with:")
		pp = pprint.PrettyPrinter(indent=4)
		st = pp.pformat(request.options).split("\n")
		for s in st:
			MODULE.info("   << %s" % s)
		# -----------------------------------

		printer = request.options.get('printer','')
		user = request.options.get('user','')
		soft = request.options.get('soft',0)
		hard = request.options.get('hard',0)
		
		if printer=='' or user=='':
			result = "Required parameter missing"
		else:
			result = self._set_quota(printer,user,soft,hard)
		
		# ---------- DEBUG --------------
		MODULE.info("printers/quota/set returns:")
		pp = pprint.PrettyPrinter(indent=4)
		st = pp.pformat(result).split("\n")
		for s in st:
			MODULE.info("   >> %s" % s)
		# --------------------------------

		self.finished(request.id, result)
		
		
	def reset_quota(self,request):
		""" resets quota for a (printer,user) combination.
		"""

		# ----------- DEBUG -----------------
		MODULE.info("printers/quota/reset invoked with:")
		pp = pprint.PrettyPrinter(indent=4)
		st = pp.pformat(request.options).split("\n")
		for s in st:
			MODULE.info("   << %s" % s)
		# -----------------------------------

		printer = request.options.get('printer','')
		users = request.options.get('users',[])

		result = self._reset_quota(printer,users)
		
		# ---------- DEBUG --------------
		MODULE.info("printers/quota/reset returns:")
		pp = pprint.PrettyPrinter(indent=4)
		st = pp.pformat(result).split("\n")
		for s in st:
			MODULE.info("   >> %s" % s)
		# --------------------------------

		self.finished(request.id, result)
		
		
	# ----------------------- Internal functions -------------------------

	def _job_list(self,printer):

		
		return ''
	
	def _set_quota(self,printer,user,soft,hard):
		""" sets a quota entry. Can also add a user """
		
		# Before we can set quota we have to ensure that the user is
		# already known to PyKota. Fortunately these tools don't complain
		# if we try to create a user that doesn't already exist.
		
		self._shell_command(['/usr/bin/pkusers','--skipexisting','--add',user],{'LANG':'C'})
		
		# Caution! order of args is important!
		
		(stdout,stderr,status) = self._shell_command([
			'/usr/bin/edpykota',
			'--printer',printer,
			'--softlimit',str(soft),
			'--hardlimit',str(hard),
			'--add',user
		],{'LANG':'C'})

		# not all errors are propagated in exit codes...
		# but at least they adhere to the general rule that
		# progress is printed to STDOUT and errors/warnings to STDERR
		if status or len(stderr):
			return stderr
		
		return ''
	
	def _reset_quota(self,printer,users):
		""" resets the 'used' counter on a quota entry. """
		
		cmd = [	'/usr/bin/edpykota','--printer',printer,'--reset' ]
		# appending user names to the args array -> spaces in user names
		# don't confuse edpykota (In 2.4, this was a problem)
		for user in users:
			cmd.append(user)
		(stdout,stderr,status) = self._shell_command(cmd,{'LANG':'C'})
	
		if status or len(stderr):
			return stderr
		
		return ''

	def _quota_enabled(self,printer=None):
		""" returns a dictionary with printer names and their 'quota active' status.
			if printer is specified, returns only quota status for this printer.

		outputs = proc.communicate()
		
		return (outputs[0],outputs[1],proc.returncode)
			





	<command name="printers/query" function="list_printers"/>

	<command name="printers/get" function="get_printer">
		<attribute name="printer" syntax="String"/>
	</command>

	<command name="printers/enable" function="enable_printer">
		<attribute name="printer" syntax="String"/>
		<attribute name="on" syntax="Bool"/>
	</command>

		<attribute name="printer" syntax="String"/>
	</command>

	<command name="printers/jobs/cancel" function="cancel_jobs">
		<attribute name="printer" syntax="String"/>
		<attribute name="jobs" syntax="String"/>
	</command>

		<attribute name="printer" syntax="String"/>
	</command>

	<command name="printers/users/query" function="list_users"/>

	<!-- equally used to add or to edit an entry -->
	<command name="printers/quota/set" function="set_quota">
		<attribute name="printer" syntax="String"/>
		<attribute name="user" syntax="String"/>
		<attribute name="soft" syntax="Integer"/>
		<attribute name="hard" syntax="Integer"/>
	</command>

	<!-- how about deleting an entry? -->

	<!-- seperate call: reset 'used' counter -->
	<command name="printers/quota/reset" function="reset_quota">
		<attribute name="printer" syntax="String"/>
		<attribute name="users" syntax="Array"/>
	</command>

  </module>
</umc>




msgstr ""
"Project-Id-Version: univention-management-console-module-printers\n"
"Report-Msgid-Bugs-To: packages@univention.de\n"
"POT-Creation-Date: 2011-11-17 12:15+0100\n"
"PO-Revision-Date: 2011-11-17 14:28+0100\n"
"Last-Translator: Frank Greif <fg@it25.de>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"

#: umc/js/_printers/DetailPage.js:59
#: umc/js/_printers/OverviewPage.js:133
msgid "Activate"
msgstr "Aktivieren"


msgid "Activate this printer"
msgstr "diesen Drucker aktivieren"

#: umc/js/_printers/QuotaPage.js:108
msgid "Add new record"
msgstr "Eintrag hinzufügen"

#: umc/js/_printers/QuotaPage.js:227
msgid "Add quota entry"
msgstr "Quota-Eintrag hinzufügen"

#: umc/js/_printers/QuotaPage.js:92
msgid "Back"
msgstr "zurück"


msgstr "Zurück zur Übersicht"

#: umc/js/_printers/DetailPage.js:129
#: umc/js/_printers/QuotaDialog.js:36
msgid "Cancel"
msgstr "Abbrechen"


msgid "Cancel this job/these jobs"
msgstr "Diesen Druckauftrag (oder mehrere) abbrechen"

#: umc/js/_printers/QuotaPage.js:27
msgid "Current quota records for printer"
msgstr "Aktuelle Quota-Einträge für diesen Drucker"

#: umc/js/_printers/DetailPage.js:71
#: umc/js/_printers/OverviewPage.js:151
msgid "Deactivate"
msgstr "Deaktivieren"


msgid "Deactivate this printer"
msgstr "diesen Drucker deaktivieren"

#: umc/js/_printers/DetailPage.js:232
#: umc/js/_printers/OverviewPage.js:53
#: umc/js/_printers/OverviewPage.js:118
msgid "Description"
msgstr "Beschreibung"

msgid "Details for printer <b>{printer}</b>"
msgstr "Details für Drucker <b>{printer}</b>"

#: umc/js/_printers/QuotaPage.js:84
msgid "Edit"
msgstr "Bearbeiten"

#: umc/js/_printers/DetailPage.js:83
#: umc/js/_printers/OverviewPage.js:169
msgid "Edit quota"
msgstr "Quota bearbeiten"

#: umc/js/_printers/QuotaPage.js:240
msgid "Edit quota entry"
msgstr "Quota bearbeiten"

#: umc/js/_printers/DetailPage.js:84
msgid "Edit quota related to this printer"
msgstr "Quota-Einträge für diesen Drucker bearbeiten"

#: umc/js/_printers/QuotaPage.js:65
#: umc/js/_printers/QuotaDialog.js:71
msgid "Hard limit"
msgstr "Hard limit"


msgid "Job"
msgstr "Druckauftrag"

#: umc/js/_printers/QuotaPage.js:69
msgid "Lifetime page counter"
msgstr "Seitenzähler"

#: umc/js/_printers/DetailPage.js:231
#: umc/js/_printers/OverviewPage.js:54
#: umc/js/_printers/OverviewPage.js:114
msgid "Location"
msgstr "Ort"

msgid "Owner"
msgstr "Eigentümer"

#: umc/js/_printers/QuotaPage.js:57
msgid "Pages used"
msgstr "gedruckte Seiten"


msgid "Printer"
msgstr "Drucker"

#: umc/js/_printers/OverviewPage.js:29
#: umc/js/_printers/OverviewPage.js:40
msgid "Printer administration"
msgstr "Druckerverwaltung"

#: umc/js/_printers/DetailPage.js:27
#: umc/js/_printers/DetailPage.js:38
msgid "Printer details"
msgstr "Druckerdetails"

#: umc/js/_printers/OverviewPage.js:52
#: umc/js/_printers/QuotaDialog.js:49
msgid "Printer name"
msgstr "Druckername"

#: umc/js/_printers/QuotaPage.js:28
#: umc/js/_printers/QuotaPage.js:39
msgid "Printer quota"
msgstr "Druckername"

#: umc/js/_printers/DetailPage.js:229
#: umc/js/_printers/OverviewPage.js:103
msgid "Quota"
msgstr "Quota"

#: umc/js/_printers/QuotaPage.js:174
msgid "Quota entries for printer <b>{printer}</b>"
msgstr "Quota-Einträge für Drucker <b>{printer}</b>"

#: umc/js/_printers/QuotaPage.js:100
msgid "Refresh"
msgstr "Aktualisieren"


msgid "Refresh printer list"
msgstr "Drucker-Liste aktualisieren"

#: umc/js/_printers/QuotaPage.js:76
msgid "Reset user quota"
msgstr "Quota für diesen Nutzer zurücksetzen"

#: umc/js/_printers/QuotaDialog.js:29
msgid "Save changes"
msgstr "Eintrag speichern"

#: umc/js/_printers/OverviewPage.js:50
msgid "Search key"
msgstr "Suchbegriff"

#: umc/js/_printers/DetailPage.js:224
#: umc/js/_printers/OverviewPage.js:80
msgid "Server"
msgstr "Server"


msgid "Size"
msgstr "Größe"

#: umc/js/_printers/QuotaPage.js:61
#: umc/js/_printers/QuotaDialog.js:64
msgid "Soft limit"
msgstr "Soft limit"

#: umc/js/_printers/DetailPage.js:225
#: umc/js/_printers/OverviewPage.js:88
msgid "Status"
msgstr "Status"



#: umc/js/_printers/OverviewPage.js:28
msgid "This module lets you manage the printers defined on your machine"
msgstr "In diesem Modul können Sie die Drucker verwalten, die auf Ihrer Maschine "
"In diesem Modul können Sie die Drucker verwalten, die auf Ihrer Maschine "
"definiert sind."

#: umc/js/_printers/QuotaPage.js:53
msgid "User"
msgstr "Nutzer"

#: umc/js/_printers/QuotaDialog.js:55
msgid "User name"
msgstr "Nutzername"

#: umc/js/_printers/OverviewPage.js:125
msgid "View details"
msgstr "Details ansehen"

"You see the details of this printer and its print jobs. You can activate/"
"deactivate the printer, edit its quota definitions if quota is enabled, and "
"cancel print jobs."
msgstr "Sie sehen die Details des Druckers sowie seine aktuellen Druckaufträge. Sie "
"Sie sehen die Details des Druckers sowie seine aktuellen Druckaufträge. Sie "
"können den Drucker aktivieren/deaktivieren, Quota-Einträge verwalten und "
"Druckaufträge abbrechen."

#: umc/js/_printers/DetailPage.js:218
#: umc/js/_printers/DetailPage.js:229
#: umc/js/_printers/OverviewPage.js:95
#: umc/js/_printers/OverviewPage.js:107
msgid "active"
msgstr "aktiv"

#: umc/js/_printers/DetailPage.js:219
#: umc/js/_printers/OverviewPage.js:96
#: umc/js/_printers/OverviewPage.js:109
msgid "inactive"
msgstr "inaktiv"

#: umc/js/_printers/DetailPage.js:215
#: umc/js/_printers/OverviewPage.js:98
msgid "unknown"
msgstr "unbekannt"





dojo.require("umc.widgets.Grid");
dojo.require("umc.widgets.Form");

dojo.require("umc.modules._printers.QuotaDialog");

dojo.declare("umc.modules._printers.QuotaPage",
[
	umc.widgets.Page,

			{
				name:				'clear',
				label:				this._("Reset user quota"),
				isMultiAction:		true,
				callback: dojo.hitch(this, function(ids,values) {
					this._reset_quota_entries(values);
				})
			},
			{
				name:				'edit',
				label:				this._("Edit"),
				callback: dojo.hitch(this, function(ids,values) {
					// always use the first value since multiselect doesn't make sense.
					this._edit_quota_entry(values[0]);
				})
			},
			{

				callback: dojo.hitch(this, function() {
					this._refresh_view();
				})
			},
			{
				name:				'add',
				label:				this._("Add new record"),
				isContextAction:	false,
				callback: dojo.hitch(this, function(ids) {
					this._add_quota_entry();
				})
			}
        ];
        

        pane.addChild(this._grid);
        
	},
	
	startup: function() {
		
		this.inherited(arguments);
		
        // fetch the userlist
		umc.tools.umcpCommand('printers/users/query').then(
			dojo.hitch(this, function(data) {
				if (data.result.length)
				{
					// we keep this list unchanged; it will be fetched only once.
					// on open of 'add quota' dialog, we pass a userlist that
					// is cleaned up from users already having a quota entry.
					this._userlist = data.result;
				}
			}),
			dojo.hitch(this, function(data) {
				umc.dialog.alert('Error fetching userlist: ' + data.message);
			})
		);
	},
    
	// Calling page passes args here. Arg is here the printer ID.
	setArgs: function(args) {

	},
	
	onHide: function() {
		
		this.inherited(arguments);		// do I need this?
		
		// on next show(), the previous content
		// should not be visible anymore.
		this._head.set('content','');		// clear header text
		this._grid.filter();				// clear grid data
	},
	
	onShow: function() {
		
		this.inherited(arguments);		// do I need this?

	},
	
	// called when the page is shown, but can equally be called
	// on a manual or automatic refresh.
	_refresh_view: function() {

		
		// read current quota list
		this._grid.filter({printer:this._printer_id});

		// on first open: create the child dialog where we can edit one quota entry.
		if (! this._dialog)
		{
			this._dialog = new umc.modules._printers.QuotaDialog();

			// listen to the events of the dialog
	        dojo.connect(this._dialog,'onSubmit',dojo.hitch(this, function(values) {
	        	this._set_quota_entry(values);
	        }));
//	        dojo.connect(this._dialog,'onCancel',dojo.hitch(this, function() {
//	        	// nothing to do here.
//	        }));

		}
		
	},
	
	// called from different places: the function that sets
	// a quota entry. When called with soft=0 and hard=0 this
	// would effectively forbid the user from printing...
	_set_quota_entry: function(values) {
    	umc.tools.umcpCommand('printers/quota/set',values).then(
    		dojo.hitch(this,function(data) {
    			if (data.result)
    			{
    				// an error message from the edpykota tool
    				umc.dialog.alert(data.result);
    			}
    			else
    			{
    				// success -> refresh view.
    				this._refresh_view();
    			}
    		}),
    		dojo.hitch(this,function(data) {
    			// error message from framework
    			umc.dialog.alert(data.message);
    		})
		);
	},
	
	// prepares everything to add a new quota entry.
	_add_quota_entry: function() {
		this._dialog.setValues({
			printer: 		this._printer_id,
			soft:			null,
			hard:			null,
			users:			this._cleaned_userlist(),
			title:			this._("Add quota entry")
		});
		this._dialog.show();
	},
	
	// prepares the edit dialog and shows it.
	// values is here a tuple of fields; this is always a single action.
	_edit_quota_entry: function(values) {

		try
		{
			var val = {
				printer:	this._printer_id,
				title:		this._("Edit quota entry")
			};
			this._dialog.setValues(dojo.mixin(val,values));
			this._dialog.show();
		}
		catch(ex)
		{
			console.error('edit_quota_entry(): ' + ex.message);
		}
	},
	
	// resets the 'used' counter on a list of users.
	// values is the array of field tuples of those users.
	_reset_quota_entries: function(values) {
		
		// if nothing is selected... why does the grid call the callback?
		if (values.length == 0)
		{
			return;
		}
		
		// ** NOTE ** we transfer the user names as an array since
		//			we can't know if some of them contain spaces or
		//			any other separator chars.
		var users = [];
		for (var u in values)
		{
			users.push(values[u]['user']);
		}

		umc.tools.umcpCommand('printers/quota/reset',{
			printer:			this._printer_id,
			users:				users
		}).then(
    		dojo.hitch(this,function(data) {
    			if (data.result)
    			{
    				// an error message from the edpykota tool
    				umc.dialog.alert(data.result);
    			}
    			else
    			{
    				// success -> refresh view.
    				this._refresh_view();
    			}
    		}),
    		dojo.hitch(this,function(data) {
    			// error message from framework
    			umc.dialog.alert(data.message);
    		})
		);
	},

	// prepares the list of users eligible for adding a quota entry:
	// this is the list of all users minus those that already have
	// a quota entry for this printer.
	//
	// Will be called only directly before a 'add quota entry' dialog
	// will be shown.
	_cleaned_userlist: function() {
		
		var result = [];
		var src = this._userlist;
		
		var usr = {};	// not an array: i want to to check for containedness!
		var items = this._grid.getAllItems();
		for (var i in items)
		{
			var u = items[i]['user'];
			usr[u] = u;
		}
		
		for (var s in src)
		{
			var sitem = src[s];
			
			// take this source item only if it is not contained
			// in the 'usr' dict.
			if (typeof(usr[sitem]) == 'undefined')
			{
				result.push(sitem);
			}
		}
		
		return result;
	},
	
    // main module listens here to return to the detail page
    closeQuota: function(args) {
    }

Return to bug 22902