Attachment #8928 for bug #39239

View | Details | Raw Unified | Return to bug 39239
Collapse All | Expand All

Lines 8-14 footer=/etc/univention/directory/reports/footer.tex Link Here

(-)a/management/univention-directory-reports/conffiles/etc/univention/directory/reports/config.ini (-1 / +1 lines)
8		8
9	# default report name	9	# default report name
10	@!@	10	@!@
11	print 'report=%s' % configRegistry.get('directory/reports/default', 'Standard Report')	11	print 'report=%s' % configRegistry.get('directory/reports/default', 'PDF Document')
12	@!@	12	@!@
13		13
14	[reports]	14	[reports]

Line 0 Link Here

(-)a/management/univention-directory-reports/conffiles/etc/univention/directory/reports/default/de_DE/footer.rml (+2 lines)
	1	</story>
	2	</document>




<?xml version="1.0" encoding="utf-8" standalone="no" ?>
<!DOCTYPE document SYSTEM "../rml_1_0.dtd">
<document filename="univention-directory-report.pdf">
	<template author="Univention Corporate Server" title="Univention Directory Report" showBoundary="0"
		pageSize="(21cm, 29.7cm)" leftMargin="2.5cm" rightMargin="2.5cm" topMargin="2.5cm" bottomMargin="2.5cm">
   <pageTemplate id="main">
     <pageGraphics>
         <image file="@%@directory/reports/logo@%@" y="27.5cm" x="13.5cm" width="5cm"/>
     </pageGraphics>
     <frame id="first" x1="2.5cm" y1="2.5cm" width="16cm" height="24.5cm"/>
   </pageTemplate>
   <pageTemplate id="regularpages">
     <pageGraphics>
         <image file="@%@directory/reports/logo@%@" y="27.5cm" x="13.5cm" width="5cm"/>
         <lines>2.5cm 2.5cm 18.5cm 2.5cm</lines>
         <drawString x="18cm" y="2cm"><pageNumber/></drawString>
     </pageGraphics>
     <setFont name="Times-Roman" size="9"/>
     <frame id="first" x1="2.5cm" y1="2.5cm" width="16cm" height="24.5cm"/>
   </pageTemplate>
</template>
<stylesheet>
  <paraStyle name="content" fontName="Helvetica" fontSize="9" textColor="black"/>
   <blockTableStyle id="mainTableOuter">
       <blockFont name="Times-Roman" size="9"/>
       <blockTextColor colorName="black"/>
       <blockLeftPadding length="0"/>
       <blockValign value="TOP"/>
       <blockAlignment value="LEFT"/>
<!--       <lineStyle kind="GRID" colorName="black"/>-->
  </blockTableStyle>
   <blockTableStyle id="mainTable">
       <blockFont name="Times-Roman" size="9"/>
       <blockTextColor colorName="black"/>
       <blockValign value="TOP"/>
       <blockLeftPadding length="0"/>
       <blockBottomPadding length="0"/>
       <blockTopPadding length="0"/>
       <blockAlignment value="LEFT"/>
<!--       <lineStyle kind="GRID" colorName="black"/>-->
       <blockSpan start="0,0" stop="1,0"/>
  </blockTableStyle>
</stylesheet>
<story>
     <spacer length="1cm"/>
     <title>Auswertung der Verzeichnisdienstobjekte</title>
     <spacer length="3cm"/>
     <title>Erstellt am <@date format="%A %d. %B %Y"@></title>
<setNextTemplate name="regularpages"/>
<nextFrame/>

Line 0 Link Here

(-)a/management/univention-directory-reports/conffiles/etc/univention/directory/reports/default/en_US/footer.rml (+2 lines)
	1	</story>
	2	</document>




<?xml version="1.0" encoding="utf-8" standalone="no" ?>
<!DOCTYPE document SYSTEM "../rml_1_0.dtd">
<document filename="univention-directory-report.pdf">
	<template author="Univention Corporate Server" title="Univention Directory Report" showBoundary="0"
		pageSize="(21cm, 29.7cm)" leftMargin="2.5cm" rightMargin="2.5cm" topMargin="2.5cm" bottomMargin="2.5cm">
   <pageTemplate id="main">
     <pageGraphics>
         <image file="@%@directory/reports/logo@%@" y="27.5cm" x="13.5cm" width="5cm"/>
     </pageGraphics>
     <frame id="first" x1="2.5cm" y1="2.5cm" width="16cm" height="24.5cm"/>
   </pageTemplate>
   <pageTemplate id="regularpages">
     <pageGraphics>
         <image file="@%@directory/reports/logo@%@" y="27.5cm" x="13.5cm" width="5cm"/>
         <lines>2.5cm 2.5cm 18.5cm 2.5cm</lines>
         <drawString x="18cm" y="2cm"><pageNumber/></drawString>
     </pageGraphics>
     <setFont name="Times-Roman" size="9"/>
     <frame id="first" x1="2.5cm" y1="2.5cm" width="16cm" height="24.5cm"/>
   </pageTemplate>
</template>
<stylesheet>
  <paraStyle name="content" fontName="Helvetica" fontSize="9" textColor="black"/>
   <blockTableStyle id="mainTableOuter">
       <blockFont name="Times-Roman" size="9"/>
       <blockTextColor colorName="black"/>
       <blockLeftPadding length="0"/>
       <blockValign value="TOP"/>
       <blockAlignment value="LEFT"/>
<!--       <lineStyle kind="GRID" colorName="black"/>-->
  </blockTableStyle>
   <blockTableStyle id="mainTable">
       <blockFont name="Times-Roman" size="9"/>
       <blockTextColor colorName="black"/>
       <blockValign value="TOP"/>
       <blockLeftPadding length="0"/>
       <blockBottomPadding length="0"/>
       <blockTopPadding length="0"/>
       <blockAlignment value="LEFT"/>
<!--       <lineStyle kind="GRID" colorName="black"/>-->
       <blockSpan start="0,0" stop="1,0"/>
  </blockTableStyle>
</stylesheet>
<story>
     <spacer length="1cm"/>
     <title>Report of directory service objects</title>
     <spacer length="3cm"/>
     <title>Created on <@date@></title>
<setNextTemplate name="regularpages"/>
<nextFrame/>

Lines 1-3 Link Here

(-)a/management/univention-directory-reports/debian/changelog (+6 lines)
		1	univention-directory-reports (9.0.1-1) unstable; urgency=medium
		2
		3	* Bug #39239: remove dependency to latex
		4
		5	-- Florian Best <best@univention.de> Wed, 14 Jun 2017 14:09:00 +0200
		6
1	univention-directory-reports (9.0.0-1) unstable; urgency=medium	7	univention-directory-reports (9.0.0-1) unstable; urgency=medium
2		8
3	* Bug #41963: UCS-4.2 version bump	9	* Bug #41963: UCS-4.2 version bump




Depends: ${misc:Depends},
 python-univention-directory-reports,
 shell-univention-lib,
 python-univention-lib (>= 1.0.25-1),
 texlive-latex-recommended,
 texlive-latex-extra,
 texlive-lang-german,
 python-univention-lib (>= 1.0.25-1)
Description: Creates reports for UCS Directory Manager objects
 UCS Report Generator creates reports in PDF format using
 template files that contain a special template syntax to
 describe LDAP attributes and objects that should replace the patterns.

Package: python-univention-directory-reports

Depends: ${misc:Depends}, ${python:Depends},
 python-univention-directory-manager,
 univention-config,
 python-trml2pdf,
Provides: ${python:Provides}
Description: Creates reports for UCS Directory manager objects
 UCS Report Generator creates reports in PDF format using
 RML template files that contain a special template syntax to
 describe LDAP attributes and objects that should replace the patterns.

Package: univention-directory-reports-latex
Architecture: all
Depends: univention-directory-reports,
 univention-config,
 texlive,
 texlive-latex-recommended,
 texlive-latex-extra,
 texlive-lang-german,
Description: Creates reports for UCS Directory manager objects
 UCS Report Generator creates reports in PDF format using
 LaTeX template files that contain a special template syntax to
 describe LDAP attributes and objects that should replace the patterns.

Lines 1-4 Link Here

(-)a/management/univention-directory-reports/debian/dirs (-4 lines)
1	usr/share/univention-directory-reports
2	etc/univention/directory/reports/default/de_DE
3	etc/univention/directory/reports/default/en_US
4	usr/bin

Lines 30-36 Link Here

(-)a/management/univention-directory-reports/debian/rules (-1 / +5 lines)
30	# /usr/share/common-licenses/AGPL-3; if not, see	30	# /usr/share/common-licenses/AGPL-3; if not, see
31	# <http://www.gnu.org/licenses/>.	31	# <http://www.gnu.org/licenses/>.
32		32
33	TEMPLATE_FILES=$(shell find templates -name '.tex' -o -name '.csv' \| sed 's/^templates\///')	33	TEMPLATE_FILES=$(shell find templates -name '.rml' -o -name '.csv' \| sed 's/^templates\///')
		34	LATEX_TEMPLATE_FILES=$(shell find templates -name '*.tex' \| sed 's/^templates\///')
34		35
35	PO_FILES := $(shell find modules -name '*.po')	36	PO_FILES := $(shell find modules -name '*.po')
36	MO_FILES := $(PO_FILES:%.po=%.mo)	37	MO_FILES := $(PO_FILES:%.po=%.mo)
Lines 52-57 override_dh_auto_install: Link Here
52	@for i in $(TEMPLATE_FILES); do\	53	@for i in $(TEMPLATE_FILES); do\
53	install -m 644 templates/$$i debian/univention-directory-reports/etc/univention/directory/reports/default/$$i;\	54	install -m 644 templates/$$i debian/univention-directory-reports/etc/univention/directory/reports/default/$$i;\
54	done	55	done
		56	@for i in $(LATEX_TEMPLATE_FILES); do\
		57	install -m 644 templates/$$i debian/univention-directory-reports-latex/etc/univention/directory/reports/default/$$i;\
		58	done
55	@for i in $(MO_FILES); do\	59	@for i in $(MO_FILES); do\
56	lang=`basename $$i .mo`;\	60	lang=`basename $$i .mo`;\
57	domain=`dirname $$i \| sed 's,^modules/,,;s,/,-,g'`;\	61	domain=`dirname $$i \| sed 's,^modules/,,;s,/,-,g'`;\

Line 0 Link Here

(-)a/management/univention-directory-reports/debian/univention-directory-reports-latex.dirs (+2 lines)
	1	etc/univention/directory/reports/default/de_DE
	2	etc/univention/directory/reports/default/en_US




#!/bin/bash
#
# Univention Reports LaTex
#  postinst file for the debian package
#
# Copyright 2017 Univention GmbH
#
# http://www.univention.de/
#
# All rights reserved.
#
# The source code of this program is made available
# under the terms of the GNU Affero General Public License version 3
# (GNU AGPL V3) as published by the Free Software Foundation.
#
# Binary versions of this program provided by Univention to you as
# well as other copyrighted, protected or trademarked materials like
# Logos, graphics, fonts, specific documentations and configurations,
# cryptographic keys etc. are subject to a license agreement between
# you and Univention and not subject to the GNU AGPL V3.
#
# In the case you use this program under the terms of the GNU AGPL V3,
# the program is provided 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 with the Debian GNU/Linux or Univention distribution in file
# /usr/share/common-licenses/AGPL-3; if not, see
# <http://www.gnu.org/licenses/>.

. /usr/share/univention-lib/all.sh

#DEBHELPER#

eval "$(univention-config-registry shell)"

univention-config-registry set \
	directory/reports/templates/pdf/user2?'users/user "PDF Latex Document" /etc/univention/directory/reports/default users.tex' \
	directory/reports/templates/pdf/group2?'groups/group "PDF Latex Document" /etc/univention/directory/reports/default groups.tex' \
	directory/reports/templates/pdf/computer2?'computers/computer "PDF Latex Document" /etc/univention/directory/reports/default computers.tex' \

exit 0




Type: file
File: etc/univention/directory/reports/default/en_US/header.tex
Variables: directory/reports/logo

Type: file
File: etc/univention/directory/reports/default/en_US/footer.tex

Type: file
File: etc/univention/directory/reports/default/de_DE/header.tex
Variables: directory/reports/logo

Type: file
File: etc/univention/directory/reports/default/de_DE/footer.tex

Line 0 Link Here

(-)a/management/univention-directory-reports/debian/univention-directory-reports.dirs (+4 lines)
	1	usr/share/univention-directory-reports
	2	etc/univention/directory/reports/default/de_DE
	3	etc/univention/directory/reports/default/en_US
	4	usr/bin





eval "$(univention-config-registry shell)"

if dpkg --compare-versions "$2" lt-nl 9.0.1-1; then
	univention-config-registry unset directory/reports/templates/pdf/user1 directory/reports/templates/pdf/group1 directory/reports/templates/pdf/computer1
	univention-config-registry unset directory/reports/templates/default1
fi
if [ -n "$directory_reports_templates_default2" ]; then
	univention-config-registry unset directory/reports/templates/default2
fi

# migration from older package version
if dpkg --compare-versions "$2" lt-nl 3.0.1-1; then
	# unset old UCR variables if they have not been changed in the meanwhile
	echo 'directory/reports/templates/csv/computer1 computers/computer "Standard CSV Report" /etc/univention/directory/reports/default/computers.csv
	directory/reports/templates/csv/group1 groups/group "Standard CSV Report" /etc/univention/directory/reports/default/groups.csv
	directory/reports/templates/csv/user1 users/user "Standard CSV Report" /etc/univention/directory/reports/default/users.csv
	directory/reports/templates/pdf/computer1 computers/computer "Standard Report" /etc/univention/directory/reports/default/computers.tex
	directory/reports/templates/pdf/group1 groups/group "Standard Report" /etc/univention/directory/reports/default/groups.tex
	directory/reports/templates/pdf/user1 users/user "Standard Report" /etc/univention/directory/reports/default/users.tex' \
	| (
		keyList=()
		while read key val; do
			[ "$(univention-config-registry get "$key")" = "$val" ] && keyList+=("$key")
		done

		# unset all keys at once
		[ "${#keyList[@]}" -gt 0 ] && univention-config-registry unset "${keyList[@]}"
	)

	# for compatibility reasons, try to set a link to the header.tex and footer.tex 
	# files, so that old reports do not break .. only do this in case the original 
	# template has not been modified
	tmpPath=/etc/univention/directory/reports
	for ifile in header.tex footer.tex; do
		if [ ! -e /etc/univention/templates/files/$tmpPath/$ifile ]; then
			rm -f $tmpPath/$ifile 
			ln -s $tmpPath/default/de_DE/$ifile $tmpPath/$ifile
		fi
	done
fi

# set default values for UCR variables
univention-config-registry set directory/reports/logo?/usr/share/univention-directory-reports/univention_logo.png \
	directory/reports/templates/pdf/user1?'users/user "PDF Document" /etc/univention/directory/reports/default users.rml' \
	directory/reports/templates/pdf/group1?'groups/group "PDF Document" /etc/univention/directory/reports/default groups.rml' \
	directory/reports/templates/pdf/computer1?'computers/computer "PDF Document" /etc/univention/directory/reports/default computers.rml' \
	directory/reports/templates/csv/user1?'users/user "CSV Report" /etc/univention/directory/reports/default users.csv' \
	directory/reports/templates/csv/group1?'groups/group "CSV Report" /etc/univention/directory/reports/default groups.csv' \
	directory/reports/templates/csv/computer1?'computers/computer "CSV Report" /etc/univention/directory/reports/default computers.csv'

exit 0




Variables: directory/reports/default

Type: file
File: etc/univention/directory/reports/default/en_US/header.rml
Variables: directory/reports/logo

Type: file
File: etc/univention/directory/reports/default/en_US/footer.rml

Type: file
File: etc/univention/directory/reports/default/de_DE/header.rml
Variables: directory/reports/logo

Type: file
File: etc/univention/directory/reports/default/de_DE/footer.rml

Type: file
File: etc/logrotate.d/univention-directory-reports




.B univention\-directory\-reports
command.
It is a tool to generate a report over UDM objects stored in the LDAP tree.
Currently supported output formats include Comma Separated Values (CSV) and PDF generated through RML or LaTeX.

.SH OPTIONS
A summary of options is included below.

\fB-l\fP, \fB--list\fP
List names of available modules and reports.
.TP
\fB\-n\fP, \fB\-\-no\-cleanup\fP
Do not remove the temporary LaTeX files (for debugging).
.TP
\fB\-c\fP \fICONFIG\fP, \fB\-\-config=\fP\fICONFIG\fP
Location of an alternative configuration file.
.TP

Lines 30-35 Link Here

(-)a/management/univention-directory-reports/modules/univention/directory/reports/__init__.py (-3 / +8 lines)
30	# /usr/share/common-licenses/AGPL-3; if not, see	30	# /usr/share/common-licenses/AGPL-3; if not, see
31	# <http://www.gnu.org/licenses/>.	31	# <http://www.gnu.org/licenses/>.
32		32
33	from document import *	33
34	from admin import *	34	from univention.directory.reports.error import ReportError
35	from config import *	35	from univention.directory.reports.report import Report
		36	from univention.directory.reports.document import Document
		37	from univention.directory.reports.admin import connect, get_object, cache_object, connected, identify, set_format
		38	from univention.directory.reports.config import Config
		39
		40	__all__ = ['Report', 'ReportError', 'Document', 'connect', 'get_object', 'cache_object', 'connected', 'identify', 'set_format', 'Config']




# /usr/share/common-licenses/AGPL-3; if not, see
# <http://www.gnu.org/licenses/>.

import cgi

import univention.admin.uldap as ua_ldap
import univention.admin.objects as ua_objects
import univention.admin.modules as ua_modules
import univention.admin.mapping as ua_mapping
import univention.admin.syntax as ua_syntax
import univention.admin.config as ua_config
import univention.admin.uexceptions as ua_exceptions
from univention.config_registry import ConfigRegistry

import univention.debug as ud

from univention.directory.reports.filter import filter_get

__all__ = ['connect', 'get_object', 'cache_object', 'connected', 'identify', 'set_format']



class AdminConnection(object):

	def __init__(self, userdn=None, password=None, host='localhost', base=None, start_tls=2, access=None, format=None):
		self._cached = {}
		self._modules = {}
		self._policies = {}

			except:
				pass
		for key, value in new.items():
			from univention.directory.reports.document import Document
			if self._format in (Document.TYPE_LATEX, Document.TYPE_RML):
				i, j = self.format_property(new.descriptions, key, value)
				new.info[i] = j
			else:

				for v in value:
					if isinstance(v, (list, tuple)):
						for i in v:
							result.append(self.escape(str(i)))
					else:
						result.append(self.escape(str(v)))
				value = result
			elif value:
				value = self.escape(value)
			filter = filter_get(prop.syntax)
			if filter:
				return filter(prop, key, value)

		return (key, value)

	def escape(self, value):
		from univention.directory.reports.document import Document
		if self._format == Document.TYPE_LATEX:
			return texClean(value)
		elif self._format == Document.TYPE_RML:
			return cgi.escape(value, quote=True)
		return value

	def _get_policies(self, obj):
		dict = {}
		policies = self._access.getPolicies(obj.dn)

				dict[attr_name] = value_dict['value']

			for key, value in ua_mapping.mapDict(module.mapping, dict).items():
				from univention.directory.reports.document import Document
				if self._format in (Document.TYPE_LATEX, Document.TYPE_RML):
					i, j = self.format_property(module.property_descriptions, key, value)
					obj.info[i] = j
				else:




				return path
		return None

	def get_header(self, module, name=None, suffix='.tex'):
		report = self._get_report_entry(module, name)
		if not report:
			return None
		return self._guess_path(report[1], 'header%s' % (suffix,), self._oldHeader)

	def get_footer(self, module, name=None, suffix='.tex'):
		report = self._get_report_entry(module, name)
		if not report:
			return None
		return self._guess_path(report[1], 'footer%s' % (suffix,), self._oldFooter)

	def get_report_names(self, module):
		reports = self._reports.get(module, [])

Lines 1-7 Link Here

(-)a/management/univention-directory-reports/modules/univention/directory/reports/document.py (-22 / +52 lines)
1	# -- coding: utf-8 --	1	# -- coding: utf-8 --
2	#	2	#
3	# Univention Directory Reports	3	# Univention Directory Reports
4	# creates a report document	4	# creates a report document
5	#	5	#
6	# Copyright 2007-2017 Univention GmbH	6	# Copyright 2007-2017 Univention GmbH
7	#	7	#
Lines 37-65 Link Here
37	import tempfile	37	import tempfile
38	import subprocess	38	import subprocess
39		39
40	from parser import Parser	40	from univention.directory.reports.error import ReportError
41	from output import Output	41	from univention.directory.reports.parser import Parser
42	from interpreter import Interpreter	42	from univention.directory.reports.output import Output
43	import admin	43	from univention.directory.reports.interpreter import Interpreter
		44	from univention.directory.reports import admin
		45
		46	import trml2pdf
		47
		48	from univention.lib.i18n import Translation
		49	_ = Translation('univention-directory-reports').translate
44		50
45		51
46	class Document(object):	52	class Document(object):
47	(TYPE_LATEX, TYPE_CSV, TYPE_UNKNOWN) = range(3)	53	(TYPE_LATEX, TYPE_CSV, TYPE_RML, TYPE_UNKNOWN) = range(4)
		54
		55	@classmethod
		56	def get_type(cls, template):
		57	if template.endswith('.tex'):
		58	return cls.TYPE_LATEX
		59	elif template.endswith('.csv'):
		60	return cls.TYPE_CSV
		61	elif template.endswith('.rml'):
		62	return cls.TYPE_RML
		63	return cls.TYPE_UNKNOWN
48		64
49	def __init__(self, template, header=None, footer=None):	65	def __init__(self, template, header=None, footer=None):
50	self._template = template	66	self._template = template
51	self._header = header	67	self._header = header
52	self._footer = footer	68	self._footer = footer
53	if self._template.endswith('.tex'):	69	self._type = self.get_type(self._template)
54	self._type = Document.TYPE_LATEX
55	elif self._template.endswith('.csv'):
56	self._type = Document.TYPE_CSV
57	else:
58	self._type = Document.TYPE_UNKNOWN
59	self.__check_files()	70	self.__check_files()
60		71
61	def __check_files(self):	72	def __check_files(self):
62	if self._type == Document.TYPE_LATEX:	73	if self._type in (Document.TYPE_LATEX, Document.TYPE_RML):
63	files = (self._header, self._footer, self._template)	74	files = (self._header, self._footer, self._template)
64	elif self._type == Document.TYPE_CSV:	75	elif self._type == Document.TYPE_CSV:
65	files = (self._template, )	76	files = (self._template, )
Lines 67-73 def __check_files(self): Link Here
67	files = tuple()	78	files = tuple()
68	for filename in files:	79	for filename in files:
69	if not os.path.isfile(filename):	80	if not os.path.isfile(filename):
70	raise NameError("error: required file '%s' does not exist or is not readable" % filename)	81	raise ReportError(_("Configuration error: File %r could not be opened.") % (filename,))
71		82
72	def __create_tempfile(self):	83	def __create_tempfile(self):
73	if self._type == Document.TYPE_LATEX:	84	if self._type == Document.TYPE_LATEX:
Lines 82-96 def __create_tempfile(self): Link Here
82		93
83	return filename	94	return filename
84		95
85	def __append_file(self, fd, filename):	96	def __append_file(self, fd, filename, obj=None):
86	tmpfd = open(filename, 'r')	97	parser = Parser(filename=filename)
87	fd.write(tmpfd.read())	98	parser.tokenize()
88	tmpfd.close()	99	tks = copy.deepcopy(parser._tokens)
		100	interpret = Interpreter(obj, tks)
		101	interpret.run()
		102	output = Output(tks, fd=fd)
		103	output.write()
89		104
90	def create_source(self, objects=[]):	105	def create_source(self, objects=[]):
91	"""Create report from objects (list of DNs)."""	106	"""Create report from objects (list of DNs)."""
92	tmpfile = self.__create_tempfile()	107	tmpfile = self.__create_tempfile()
93	admin.set_format(self._type == Document.TYPE_LATEX)	108	admin.set_format(self._type)
94	parser = Parser(filename=self._template)	109	parser = Parser(filename=self._template)
95	parser.tokenize()	110	parser.tokenize()
96	tokens = parser._tokens	111	tokens = parser._tokens
Lines 106-112 def create_source(self, objects=[]): Link Here
106	else:	121	else:
107	obj = admin.cache_object(dn)	122	obj = admin.cache_object(dn)
108	if obj is None:	123	if obj is None:
109	print >>sys.stderr, "warning: dn '%s' not found, skipped." % dn	124	print >> sys.stderr, "warning: dn '%s' not found, skipped." % dn
110	continue	125	continue
111	tks = copy.deepcopy(tokens)	126	tks = copy.deepcopy(tokens)
112	interpret = Interpreter(obj, tks)	127	interpret = Interpreter(obj, tks)
Lines 130-136 def create_pdf(self, latex_file): Link Here
130	if not subprocess.call(cmd, stdout=devnull, stderr=devnull, env=env_vars):	145	if not subprocess.call(cmd, stdout=devnull, stderr=devnull, env=env_vars):
131	if not subprocess.call(cmd, stdout=devnull, stderr=devnull, env=env_vars):	146	if not subprocess.call(cmd, stdout=devnull, stderr=devnull, env=env_vars):
132	return '%s.pdf' % latex_file.rsplit('.', 1)[0]	147	return '%s.pdf' % latex_file.rsplit('.', 1)[0]
133	print >>sys.stderr, "error: failed to create PDF file"	148	raise ReportError(_('Failed creating PDF file.'))
134	return None
135	finally:	149	finally:
136	devnull.close()	150	devnull.close()
		151	basefile = latex_file.rsplit('.', 1)[0] # strip suffix
		152	for file_ in [latex_file] + ['%s.%s' % (basefile, suffix) for suffix in ('aux', 'log')]:
		153	try:
		154	os.unlink(file_)
		155	except EnvironmentError:
		156	pass
		157
		158	def create_rml_pdf(self, rml_file):
		159	output = '%s.pdf' % (os.path.splitext(rml_file)[0],)
		160	with open(rml_file, 'rb') as fd:
		161	outputfile = trml2pdf.parseString(fd.read(), output)
		162	try:
		163	os.unlink(rml_file)
		164	except EnvironmentError:
		165	pass
		166	return outputfile




# -*- coding: utf-8 -*-
#
# Univention Directory Reports
#
# Copyright 2017 Univention GmbH
#
# http://www.univention.de/
#
# All rights reserved.
#
# The source code of this program is made available
# under the terms of the GNU Affero General Public License version 3
# (GNU AGPL V3) as published by the Free Software Foundation.
#
# Binary versions of this program provided by Univention to you as
# well as other copyrighted, protected or trademarked materials like
# Logos, graphics, fonts, specific documentations and configurations,
# cryptographic keys etc. are subject to a license agreement between
# you and Univention and not subject to the GNU AGPL V3.
#
# In the case you use this program under the terms of the GNU AGPL V3,
# the program is provided 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 with the Debian GNU/Linux or Univention distribution in file
# /usr/share/common-licenses/AGPL-3; if not, see
# <http://www.gnu.org/licenses/>.


class ReportError(Exception):
	pass

Lines 77-85 def _email_address(prop, key, value): Link Here

(-)a/management/univention-directory-reports/modules/univention/directory/reports/filter.py (-3 / +5 lines)
77		77
78	def _samba_group_type(prop, key, value):	78	def _samba_group_type(prop, key, value):
79	# need to call str() directly in order to force a correct translation	79	# need to call str() directly in order to force a correct translation
80	types = {'2': str(_('Domain Group')),	80	types = {
81	'3': str(_('Local Group')),	81	'2': str(_('Domain Group')),
82	'5': str(_('Well-Known Group'))}	82	'3': str(_('Local Group')),
		83	'5': str(_('Well-Known Group'))
		84	}
83	if value in types.keys():	85	if value in types.keys():
84	value = types[value]	86	value = types[value]
85	return (key, value)	87	return (key, value)




# /usr/share/common-licenses/AGPL-3; if not, see
# <http://www.gnu.org/licenses/>.

import re
import copy
import fnmatch
import datetime

import univention.admin.objects as ua_objects
import univention.admin.uldap as ua_ldap

from univention.directory.reports.tokens import QueryToken, ResolveToken, TextToken, AttributeToken, PolicyToken, DateToken
from univention.directory.reports import admin

import univention.admin.localization
translation = univention.admin.localization.translation('univention-directory-reports')
_ = translation.translate

import copy
import fnmatch
import re


class Interpreter(object):


						token.value = token.attrs['prepend'] + token.value
			elif isinstance(token, PolicyToken):
				self.policy(token, base_objects[0])
			elif isinstance(token, DateToken):
				token.value = datetime.datetime.today().strftime(token.attrs.get('format', "%A %B %d, %Y"))

	def resolve(self, token, base):
		if 'module' in token.attrs:

Lines 33-39 Link Here

(-)a/management/univention-directory-reports/modules/univention/directory/reports/output.py (-2 / +2 lines)
33	import codecs	33	import codecs
34	import os	34	import os
35		35
36	from tokens import TextToken, ResolveToken, QueryToken, AttributeToken, PolicyToken	36	from tokens import TextToken, ResolveToken, QueryToken, AttributeToken, PolicyToken, DateToken
37		37
38		38
39	class Output(object):	39	class Output(object):
Lines 69-73 def write(self, tokens=[]): Link Here
69	elif isinstance(token, (ResolveToken, QueryToken)):	69	elif isinstance(token, (ResolveToken, QueryToken)):
70	if len(token):	70	if len(token):
71	self.write(token)	71	self.write(token)
72	elif isinstance(token, (AttributeToken, PolicyToken)):	72	elif isinstance(token, (DateToken, AttributeToken, PolicyToken)):
73	self._fd.write(token.value)	73	self._fd.write(token.value)




import re
import shlex

from tokens import Token, TextToken, AttributeToken, PolicyToken, QueryToken, HeaderToken, FooterToken, IContextToken, ResolveToken, DateToken


class Parser(object):

			return HeaderToken(attrs, closing)
		elif name == 'footer':
			return FooterToken(attrs, closing)
		elif name == 'date':
			return DateToken(attrs)
		else:
			raise SyntaxError('Unknown tag: %s' % name)

	def tokenize(self):
		token = self.next_token()
		while token:
			if isinstance(token, (TextToken, AttributeToken, PolicyToken, DateToken)):
				if isinstance(token, TextToken):
					if token.data == '\n' and len(self._context) and isinstance(self._context[-1], HeaderToken):
						# ignore line feed after header




# -*- coding: utf-8 -*-
#
# Univention Directory Reports
#
# Copyright 2017 Univention GmbH
#
# http://www.univention.de/
#
# All rights reserved.
#
# The source code of this program is made available
# under the terms of the GNU Affero General Public License version 3
# (GNU AGPL V3) as published by the Free Software Foundation.
#
# Binary versions of this program provided by Univention to you as
# well as other copyrighted, protected or trademarked materials like
# Logos, graphics, fonts, specific documentations and configurations,
# cryptographic keys etc. are subject to a license agreement between
# you and Univention and not subject to the GNU AGPL V3.
#
# In the case you use this program under the terms of the GNU AGPL V3,
# the program is provided 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 with the Debian GNU/Linux or Univention distribution in file
# /usr/share/common-licenses/AGPL-3; if not, see
# <http://www.gnu.org/licenses/>.

import os

from univention.directory.reports.error import ReportError
from univention.directory.reports.document import Document
from univention.directory.reports.admin import connect, clear_cache
from univention.directory.reports.config import Config

from univention.lib.i18n import Translation
_ = Translation('univention-directory-reports').translate


class Report(object):

	def __init__(self, lo, config=None):
		self.lo = lo
		self.config = config or Config()

	def create(self, module, report, objects):
		"""Create a report of objects for the specified module in the specified report type format"""
		connect(access=self.lo)
		clear_cache()

		template = self.config.get_report(module, report)
		if template is None:
			if not module:
				raise ReportError(_('Please specify a module.'))
			if module not in self.config._reports:
				raise ReportError(_('No report for the specified module %r exists.') % (module,))
			if report:
				raise ReportError(_('The report %r does not exists or is misconfigured.') % (report,))
			raise ReportError(_('No %r report exists for the module %r.') % (report, module))

		suffix = '.rml' if Document.get_type(template) == Document.TYPE_RML else '.tex'
		header = self.config.get_header(module, report, suffix)
		footer = self.config.get_footer(module, report, suffix)
		doc = Document(template, header=header, footer=footer)

		tmpfile = doc.create_source(objects)
		pdffile = tmpfile
		func = {Document.TYPE_RML: doc.create_rml_pdf, Document.TYPE_LATEX: doc.create_pdf}.get(doc._type)
		if func:
			pdffile = func(tmpfile)
		if not pdffile or not os.path.exists(pdffile):
			raise ReportError(_('The report could not be created.'))
		return pdffile

Lines 118-120 class PolicyToken(TemplateToken): Link Here

(-)a/management/univention-directory-reports/modules/univention/directory/reports/tokens.py (+7 lines)
118	def __init__(self, attrs={}, value=''):	118	def __init__(self, attrs={}, value=''):
119	TemplateToken.__init__(self, 'policy', attrs)	119	TemplateToken.__init__(self, 'policy', attrs)
120	self.value = value	120	self.value = value
		121
		122
		123	class DateToken(TemplateToken):
		124
		125	def __init__(self, attrs={}, value=''):
		126	TemplateToken.__init__(self, 'date', attrs)
		127	self.value = value

Line 0 Link Here

(-)a/management/univention-directory-reports/templates/de_DE/computers.rml (+11 lines)
	1	<!--<para><h1>Rechner-Report</h1></para>
	2	<spacer length="1cm"/>
	3	-->
	4	<blockTable style="mainTable">
	5	<tr><td><h3>Rechner <@attribute name="name"@></h3></td> </tr>
	6	<tr><td><para style="content">IP-Adresse:</para></td><td><para style="content"><@attribute name="ip"@></para></td> </tr>
	7	<tr><td><para style="content">MAC-Adresse:</para></td><td><para style="content"><@attribute name="mac"@></para></td></tr>
	8	<tr><td><para style="content">Network:</para></td><td><para style="content"><@resolve module="networks/network" dn-attribute="network" alternative="nicht zugewiesen"@><@attribute name="name"@><@/resolve@></para></td></tr>
	9	<tr><td><para style="content">Inventarnummer:</para></td><td><para style="content"><@attribute name="inventoryNumber"@></para></td></tr>
	10	</blockTable>
	11	<spacer length="1cm"/>




<para><h1>Gruppen-Report: <@attribute name="name"@></h1></para>
<spacer length="1cm"/>

<blockTable style="mainTable">
<tr><td><h3>Gruppeneinzelnachweis: <@attribute name="name"@></h3></td></tr>
<tr><td><para style="content">Name:</para></td><td><para style="content"><@attribute name="name"@></para></td></tr>
<tr><td><para style="content">Beschreibung:</para></td><td><para style="content"><@attribute name="description" default="-"@></para></td></tr>
<tr><td><para style="content">Gruppen ID:</para></td><td><para style="content"><@attribute name="gidNumber"@></para></td></tr>
<tr><td><para style="content">Relative ID:</para></td><td><para style="content"><@attribute name="sambaRID"@></para></td></tr>
<tr><td><para style="content">Gruppentyp:</para></td><td><para style="content"><@attribute name="sambaGroupType"@></para></td></tr>
<tr><td><para style="content">E-Mail-Adresse:</para></td><td><para style="content"><@attribute name="mailAddress" default="-"@></para></td></tr>
</blockTable>

<spacer length="0.5cm"/>

<h3>Mitglied folgender Gruppen</h3>

<@resolve module="groups/group" dn-attribute="memberOf" alternative="<para>Diese Gruppe ist in keiner anderen Gruppe Mitglied.</para>"@>
  <para bulletFontSize="5" bulletText="&#x25cf;"><@attribute name="name"@> (<@attribute name="description"@>)</para>
<@/resolve@>


<h3>Gruppen in dieser Gruppe</h3>

<@query module="groups/group" start="nestedGroup" next="nestedGroup" alternative="<para>Keine Gruppe ist Mitglied dieser Gruppe.</para>"@>
  <para bulletFontSize="5" bulletText="&#x25cf;"><@attribute name="name"@> (<@attribute name="description"@>)</para>
<@/query@>

<h3>Benutzer in dieser Gruppe</h3>

<@resolve module="users/user" dn-attribute="users" alternative="<para>Kein Benutzer ist Mitglied dieser Gruppe.</para>"@>
  <para bulletFontSize="5" bulletText="&#x25cf;"><@attribute name="username"@> (<@attribute name="lastname"@>, <@attribute name="firstname"@>)</para>
<@/resolve@>

<@query module="groups/group" start="nestedGroup" next="nestedGroup" alternative="<para>Keine indirekten Gruppenmitgliedschaften.</para>"@>
  <h2>Gruppe: <@attribute name="name"@> (<@attribute name="description"@>)</h2>
  <@resolve module="users/user" dn-attribute="users" alternative="<para>Keine Mitglieder in dieser Gruppe</para>"@>
    <para bulletFontSize="4" bulletText="&#x25cf;"><@attribute name="username"@> (<@attribute name="lastname"@>)</para>
  <@/resolve@>
<@/query@>

<nextFrame/>




<para><h1>Benutzer-Report: <@attribute name="lastname"@><@attribute name="firstname" prepend=", "@></h1></para>
<spacer length="1cm"/>

<blockTable style="mainTableOuter" colWidths="7.8cm,7.8cm">
<tr><td>

<blockTable style="mainTable" colWidths="3.5cm,4cm">
<tr><td><h3>Benutzereinzelnachweis: <@attribute name="lastname"@>, <@attribute name="firstname"@></h3></td> </tr>
<tr><td><para style="content">Name:</para></td><td><para style="content"><@attribute name="lastname"@><@attribute name="firstname" prepend=", "@></para></td> </tr>
<tr><td><para style="content">Benutzer:</para></td><td><para style="content"><@attribute name="username"@></para></td></tr>
<tr><td><para style="content">Beschreibung:</para></td><td><para style="content"><@attribute name="description"@></para></td></tr>
<tr><td><para style="content">Organisation:</para></td><td><para style="content"><@attribute name="organisation"@></para></td></tr>
<tr><td><para style="content">Mitarbeiternummer:</para></td><td><para style="content"><@attribute name="employeeNumber"@></para></td></tr>
<tr><td><para style="content">Mitarbeitertyp:</para></td><td><para style="content"><@attribute name="employeeType"@></para></td></tr>
<tr><td><para style="content">Raumnummer:</para></td><td><para style="content"><@attribute name="roomNumber"@></para></td></tr>
<tr><td><para style="content">Vorgesetzter:</para></td><td><para style="content">
<@resolve module="users/user" dn-attribute="secretary" alternative=""@>
    <@attribute name="lastname"@><@attribute name="firstname" prepend=", "@>
<@/resolve@></para></td></tr>
</blockTable>
<spacer length="1cm"/>


<blockTable style="mainTable" colWidths="3.5cm,4cm">
<tr><td><h3>Kontakt</h3></td></tr>
<tr><td></td></tr>
<tr><td><para style="content">Telefon:</para></td><td><para style="content"><@attribute name="phone"@> </para></td></tr>
<tr><td><para style="content">Mobiltelefon:</para></td><td><para style="content"><@attribute name="mobileTelephoneNumber"@></para></td></tr>
<tr><td><para style="content">Straße:</para></td><td><para style="content"><@attribute name="street"@></para></td></tr>
<tr><td></td></tr>
</blockTable>
<spacer length="1cm"/>

<blockTable style="mainTable" colWidths="3.5cm,4cm">
<tr><td><h3>Kontoeinstellungen</h3></td></tr>
<tr><td><para style="content">Deaktiviert:</para></td><td><para style="content"><@attribute name="disabled" default="Nein"@> </para></td></tr>
<tr><td><para style="content">Gesperrt:</para></td><td><para style="content"><@attribute name="locked" default="Nein"@> </para></td></tr>
<tr><td><para style="content">Kontoablaufdatum:</para></td><td><para style="content"><@attribute name="userexpiry" default="Nicht gesetzt"@> </para></td></tr>
<tr><td><para style="content">Passwortablaufdatum:</para></td><td><para style="content"><@attribute name="passwordexpiry" default="Nicht gesetzt"@> </para></td></tr>
<tr><td><para style="content">Passwortänderung:</para></td><td><para style="content"><@attribute name="pwdChangeNextLogin" default="Nein"@> </para></td></tr>
</blockTable>
<spacer length="1cm"/>

</td><td>

<blockTable style="mainTable" colWidths="3.5cm,4cm">
<tr><td><h3>Linux/UNIX</h3></td></tr>
<tr><td><para style="content">Benutzer-ID:</para></td><td><para style="content"><@attribute name="uidNumber"@> </para></td></tr>
<tr><td><para style="content">Gruppen-ID:</para></td><td><para style="content"><@attribute name="gidNumber"@></para></td></tr>
<tr><td><para style="content">Login-Shell:</para></td><td><para style="content"><@attribute name="shell"@> </para></td></tr>
<tr><td><para style="content">Heimatverzeichnis:</para></td><td><para style="content"><@attribute name="unixhome"@> </para></td></tr>
<tr><td><para style="content">Freigabepfad:</para></td><td><para style="content"><@attribute name="homeSharePath"@> </para></td></tr>
<tr><td><para style="content">Freigabe:</para></td><td><para style="content"><@resolve module="shares/share" dn-attribute="homeShare"@>
    <@attribute name="printablename"@>
<@/resolve@></para></td></tr>
</blockTable>

<spacer length="1cm"/>

<blockTable style="mainTable" colWidths="3.5cm,4cm">
<tr><td><h3>Passwort-Richtlinie</h3></td></tr>
<tr><td><para style="content">Ererbt:</para></td><td><@policy module="policies/pwdhistory" inherited=""@> </td></tr>
<tr><td><para style="content">History Länge:</para></td><td><para style="content"><@attribute name="length"@></para></td></tr>
<tr><td><para style="content">Passwort Länge:</para></td><td><para style="content"><@attribute name="pwLength"@></para></td></tr>
<tr><td><para style="content">Ablaufintervall:</para></td><td><para style="content"><@attribute name="expiryInterval" default="-"@></para></td></tr>
</blockTable>
<spacer length="1cm"/>

<blockTable style="mainTable" colWidths="3.5cm,4cm">
<tr><td><h3>Mail</h3></td></tr>
<tr><td><para style="content">E-Mail-Adresse:</para></td><td><para style="content"><@attribute name="mailPrimaryAddress" default="Keine"@> </para></td></tr>
<tr><td><para style="content">weitere Adressen:</para></td><td><para style="content"><@attribute name="mailAlternativeAddress" default="Keine"@> </para></td></tr>
<tr><td><para style="content">Globaler SPAM-Ordner:</para></td><td><para style="content"><@attribute name="mailGlobalSpamFolder" default="-"@> </para></td></tr>
</blockTable>
<spacer length="1cm"/>

<blockTable style="mainTable" colWidths="3.5cm,4cm">
<tr><td><h3>Windows</h3></td></tr>
<tr><td><para style="content">Heimatverzeichnis:</para></td><td><para style="content"><@attribute name="sambahome"@> </para></td></tr>
<tr><td><para style="content">Laufwerk für Heimatverzeichnis:</para></td><td><para style="content"><@attribute name="homedrive"@> </para></td></tr>
<tr><td><para style="content">Profilverzeichnis:</para></td><td><para style="content"><@attribute name="profilepath"@> </para></td></tr>
<tr><td><para style="content">Anmeldeskript:</para></td><td><para style="content"><@attribute name="scriptpath"@> </para></td></tr>
<tr><td><para style="content">Relative ID:</para></td><td><para style="content"><@attribute name="sambaRID"@> </para></td></tr>
</blockTable>

</td></tr>
</blockTable>


<h3>Mitglied in folgenden Gruppen</h3>

<@query module="groups/group" start="groups" next="memberOf" regex="name=^[^(s\-)([a\-)(i\-)(h\-)]" alternative="<para>Der Benutzer ist in keiner weiteren Gruppen enthalten</para>"@>
	<para bulletFontSize="5" bulletText="&#x25cf;"><b><@attribute name="name"@></b> (<@attribute name="description"@>)</para>
<@/query@>

<nextFrame/>




<!--<para><h1>Hostname report</h1></para>
<spacer length="1cm"/>
-->
<blockTable style="mainTable">
<tr><td><h3>Hostname <@attribute name="name"@></h3></td> </tr>
<tr><td><para style="content">IP address:</para></td><td><para style="content"><@attribute name="ip"@></para></td> </tr>
<tr><td><para style="content">MAC address:</para></td><td><para style="content"><@attribute name="mac"@></para></td></tr>
<tr><td><para style="content">Network:</para></td><td><para style="content"><@resolve module="networks/network" dn-attribute="network" alternative="nicht zugewiesen"@><@attribute name="name"@><@/resolve@></para></td></tr>
<tr><td><para style="content">Inventory number:</para></td><td><para style="content"><@attribute name="inventoryNumber"@></para></td></tr>
</blockTable>
<spacer length="1cm"/>
\ihead{Hostname report}




<para><h1>Group report: <@attribute name="name"@></h1></para>
<spacer length="1cm"/>

<blockTable style="mainTable">
<tr><td><h3>Group record: <@attribute name="name"@></h3></td></tr>
<tr><td><para style="content">Name:</para></td><td><para style="content"><@attribute name="name"@></para></td></tr>
<tr><td><para style="content">Description:</para></td><td><para style="content"><@attribute name="description" default="-"@></para></td></tr>
<tr><td><para style="content">Group ID:</para></td><td><para style="content"><@attribute name="gidNumber"@></para></td></tr>
<tr><td><para style="content">Relative ID:</para></td><td><para style="content"><@attribute name="sambaRID"@></para></td></tr>
<tr><td><para style="content">Group type:</para></td><td><para style="content"><@attribute name="sambaGroupType"@></para></td></tr>
<tr><td><para style="content">E-Mail address:</para></td><td><para style="content"><@attribute name="mailAddress" default="-"@></para></td></tr>
</blockTable>

<spacer length="0.5cm"/>

<h3>Member of the following groups</h3>

<@resolve module="groups/group" dn-attribute="memberOf" alternative="<para>This group is no member of any other group.</para>"@>
  <para bulletFontSize="5" bulletText="&#x25cf;"><@attribute name="name"@> (<@attribute name="description"@>)</para>
<@/resolve@>


<h3>Group members of this group</h3>

<@query module="groups/group" start="nestedGroup" next="nestedGroup" alternative="<para>No group is member of this group.</para>"@>
  <para bulletFontSize="5" bulletText="&#x25cf;"><@attribute name="name"@> (<@attribute name="description"@>)</para>
<@/query@>

<h3>User members of this group</h3>

<@resolve module="users/user" dn-attribute="users" alternative="<para>No user is member of this group.</para>"@>
  <para bulletFontSize="5" bulletText="&#x25cf;"><@attribute name="username"@> (<@attribute name="lastname"@>, <@attribute name="firstname"@>)</para>
<@/resolve@>

<@query module="groups/group" start="nestedGroup" next="nestedGroup" alternative="<para>No indirect group members.</para>"@>
  <h2>Group: <@attribute name="name"@> (<@attribute name="description"@>)</h2>
  <@resolve module="users/user" dn-attribute="users" alternative="<para>No members of this group.</para>"@>
    <para bulletFontSize="4" bulletText="&#x25cf;"><@attribute name="username"@> (<@attribute name="lastname"@>)</para>
  <@/resolve@>
<@/query@>

<nextFrame/>




<para><h1>User report: <@attribute name="lastname"@><@attribute name="firstname" prepend=", "@></h1></para>
<spacer length="1cm"/>

<blockTable style="mainTableOuter" colWidths="7.8cm,7.8cm">
<tr><td>

<blockTable style="mainTable" colWidths="3.5cm,4cm">
<tr><td><h3>User record: <@attribute name="lastname"@>, <@attribute name="firstname"@></h3></td> </tr>
<tr><td><para style="content">Name:</para></td><td><para style="content"><@attribute name="lastname"@><@attribute name="firstname" prepend=", "@></para></td> </tr>
<tr><td><para style="content">User name:</para></td><td><para style="content"><@attribute name="username"@></para></td></tr>
<tr><td><para style="content">Description:</para></td><td><para style="content"><@attribute name="description"@></para></td></tr>
<tr><td><para style="content">Organisation:</para></td><td><para style="content"><@attribute name="organisation"@></para></td></tr>
<tr><td><para style="content">Employee number:</para></td><td><para style="content"><@attribute name="employeeNumber"@></para></td></tr>
<tr><td><para style="content">Employee type:</para></td><td><para style="content"><@attribute name="employeeType"@></para></td></tr>
<tr><td><para style="content">Room number:</para></td><td><para style="content"><@attribute name="roomNumber"@></para></td></tr>
<tr><td><para style="content">Superior:</para></td><td><para style="content">
<@resolve module="users/user" dn-attribute="secretary" alternative=""@>
    <@attribute name="lastname"@><@attribute name="firstname" prepend=", "@>
<@/resolve@></para></td></tr>
</blockTable>
<spacer length="1cm"/>


<blockTable style="mainTable" colWidths="3.5cm,4cm">
<tr><td><h3>Contact</h3></td></tr>
<tr><td></td></tr>
<tr><td><para style="content">Phone:</para></td><td><para style="content"><@attribute name="phone"@> </para></td></tr>
<tr><td><para style="content">Mobile phone:</para></td><td><para style="content"><@attribute name="mobileTelephoneNumber"@></para></td></tr>
<tr><td><para style="content">Street:</para></td><td><para style="content"><@attribute name="street"@></para></td></tr>
<tr><td></td></tr>
</blockTable>
<spacer length="1cm"/>

<blockTable style="mainTable" colWidths="3.5cm,4cm">
<tr><td><h3>Account settings</h3></td></tr>
<tr><td><para style="content">Disabled:</para></td><td><para style="content"><@attribute name="disabled" default="No"@> </para></td></tr>
<tr><td><para style="content">Locked:</para></td><td><para style="content"><@attribute name="locked" default="No"@> </para></td></tr>
<tr><td><para style="content">Account expiry date:</para></td><td><para style="content"><@attribute name="userexpiry" default="Not set"@> </para></td></tr>
<tr><td><para style="content">Password expiry date:</para></td><td><para style="content"><@attribute name="passwordexpiry" default="Not set"@> </para></td></tr>
<tr><td><para style="content">Change password:</para></td><td><para style="content"><@attribute name="pwdChangeNextLogin" default="No"@> </para></td></tr>
</blockTable>
<spacer length="1cm"/>

</td><td>

<blockTable style="mainTable" colWidths="3.5cm,4cm">
<tr><td><h3>Linux/UNIX</h3></td></tr>
<tr><td><para style="content">User ID:</para></td><td><para style="content"><@attribute name="uidNumber"@> </para></td></tr>
<tr><td><para style="content">Group ID:</para></td><td><para style="content"><@attribute name="gidNumber"@></para></td></tr>
<tr><td><para style="content">Login shell:</para></td><td><para style="content"><@attribute name="shell"@> </para></td></tr>
<tr><td><para style="content">Home directory:</para></td><td><para style="content"><@attribute name="unixhome"@> </para></td></tr>
<tr><td><para style="content">Share path:</para></td><td><para style="content"><@attribute name="homeSharePath"@> </para></td></tr>
<tr><td><para style="content">Share:</para></td><td><para style="content"><@resolve module="shares/share" dn-attribute="homeShare"@>
    <@attribute name="printablename"@>
<@/resolve@></para></td></tr>
</blockTable>

<spacer length="1cm"/>

<blockTable style="mainTable" colWidths="3.5cm,4cm">
<tr><td><h3>Password policy</h3></td></tr>
<tr><td><para style="content">Inherited:</para></td><td><@policy module="policies/pwdhistory" inherited=""@> </td></tr>
<tr><td><para style="content">History length:</para></td><td><para style="content"><@attribute name="length"@></para></td></tr>
<tr><td><para style="content">Password length:</para></td><td><para style="content"><@attribute name="pwLength"@></para></td></tr>
<tr><td><para style="content">Expiry interval:</para></td><td><para style="content"><@attribute name="expiryInterval" default="-"@></para></td></tr>
</blockTable>
<spacer length="1cm"/>

<blockTable style="mainTable" colWidths="3.5cm,4cm">
<tr><td><h3>Mail</h3></td></tr>
<tr><td><para style="content">E-mail address:</para></td><td><para style="content"><@attribute name="mailPrimaryAddress" default="None"@> </para></td></tr>
<tr><td><para style="content">Alternative address:</para></td><td><para style="content"><@attribute name="mailAlternativeAddress" default="None"@> </para></td></tr>
<tr><td><para style="content">Global SPAM folder:</para></td><td><para style="content"><@attribute name="mailGlobalSpamFolder" default="-"@> </para></td></tr>
</blockTable>
<spacer length="1cm"/>

<blockTable style="mainTable" colWidths="3.5cm,4cm">
<tr><td><h3>Windows</h3></td></tr>
<tr><td><para style="content">Home directory:</para></td><td><para style="content"><@attribute name="sambahome"@> </para></td></tr>
<tr><td><para style="content">Home drive:</para></td><td><para style="content"><@attribute name="homedrive"@> </para></td></tr>
<tr><td><para style="content">Profile path:</para></td><td><para style="content"><@attribute name="profilepath"@> </para></td></tr>
<tr><td><para style="content">Logon script:</para></td><td><para style="content"><@attribute name="scriptpath"@> </para></td></tr>
<tr><td><para style="content">Relative ID:</para></td><td><para style="content"><@attribute name="sambaRID"@> </para></td></tr>
</blockTable>

</td></tr>
</blockTable>


<h3>Member of the following groups</h3>

<@query module="groups/group" start="groups" next="memberOf" regex="name=^[^(s\-)([a\-)(i\-)(h\-)]" alternative="<para>The user is not member of any other group</para>"@>
	<para bulletFontSize="5" bulletText="&#x25cf;"><b><@attribute name="name"@></b> (<@attribute name="description"@>)</para>
<@/query@>

<nextFrame/>

Lines 126-132 Relative ID & <@attribute name="sambaRID"@> \\ Link Here

(-)a/management/univention-directory-reports/templates/en_US/users.tex (-1 / +1 lines)
126		126
127	\section*{Member of the following groups}	127	\section*{Member of the following groups}
128		128
129	<@query module="groups/group" start="groups" next="memberOf" regex="name=^[^(s\-)([a\-)(i\-)(h\-)]" header="\begin{description}" footer="\end{description}" alternative="The user is not member of any other gropu"@>	129	<@query module="groups/group" start="groups" next="memberOf" regex="name=^[^(s\-)([a\-)(i\-)(h\-)]" header="\begin{description}" footer="\end{description}" alternative="The user is not member of any other group"@>
130	\item[<@attribute name="name"@>] (<@attribute name="description"@>)	130	\item[<@attribute name="name"@>] (<@attribute name="description"@>)
131	<@/query@>	131	<@/query@>
132		132




# /usr/share/common-licenses/AGPL-3; if not, see
# <http://www.gnu.org/licenses/>.

import sys
import locale
from optparse import OptionParser

import univention.debug as ud
import univention.admin.uldap

from univention.directory.reports import Report, ReportError, Config
from univention.config_registry import ConfigRegistry

from univention.lib.i18n import Translation
_ = Translation('univention-directory-reports').translate

ucr = ConfigRegistry()
ucr.load()


def dump_modules(cfg, module=None, out=sys.stdout):

	else:
		modules = [module]
	for module in modules:
		print >> out, 'Reports for module: %s' % module
		for name in cfg.get_report_names(module):
			print >> out, ' - %s' % name


def main():
	cfg = Config()

	parser = OptionParser(usage='usage: %prog -m <module> [options] dn1 dn2 ...')
	parser.add_option(

		help='file containing the footer for the report')
	parser.add_option(
		'-s', '--server', action='store',
		dest='server', default=ucr.get('ldap/server/name', 'localhost'),
		help='LDAP server [%default]')
	parser.add_option(
		'-b', '--base', action='store',
		dest='base', default=ucr.get('ldap/base', ''),
		help='LDAP base [%default]')
	parser.add_option(
		'-m', '--module', action='store',

		dest='list_reports', default=False,
		help='List names of available reports')
	parser.add_option(
		'-n', '--no-cleanup', action='store_true',
		dest='no_cleanup', default=False,
		help='do not remove the temporary LaTeX files (for debugging)')
	parser.add_option(
		'-c', '--config', action='store',
		dest='config', default='/etc/univention/directory/reports/config.ini',
		help='location of the configuration file [%default]')


	(options, args) = parser.parse_args()

	ud.init('/var/log/univention/directory-reports.log', ud.FLUSH, ud.FUNCTION)
		try:
			pwdfile = '/etc/machine.secret'
			options.user = baseConfig['ldap/hostdn']
			if baseConfig['server/role'] == 'domaincontroller_master':
				pwdfile = '/etc/ldap.secret'
				options.user = 'cn=admin,%s' % baseConfig['ldap/base']
			fd = open(pwdfile, 'r')
			options.password = fd.readline()[: -1]
			fd.close()
		except:
			print >>sys.stderr, "error: user and/or password not specified"
			parser.print_help(sys.stderr)
			sys.exit(1)

	ud.init('/var/log/univention/directory-reports.log', 1, 1)
	ud.set_level(ud.ADMIN, options.debug)

	locale.setlocale(locale.LC_ALL, locale.getdefaultlocale())

	cfg = Config(options.config)

	if options.list_reports:
		dump_modules(cfg, options.module)
		sys.exit(0)

	template = cfg.get_report(options.module, options.report)
	if template is None:
		parser.print_usage(sys.stderr)
		if options.module is None:
			print >>sys.stderr, "error: module not specified (use -m)"
		elif options.module not in cfg._reports:
			print >>sys.stderr, "error: specified module '%s' does not exist" % options.module
			options.module = None
		elif options.report is not None:
			report_entry = cfg._get_report_entry(options.module, options.report)
			if report_entry is None:
				print >>sys.stderr, "error: specified report '%s' does not exist" % options.report
			else:
				print >>sys.stderr, "error: specified report '%s' is unavailable" % options.report
				name, dir, filename = report_entry
				if not os.path.exists(filename):
					print >>sys.stderr, "Template file '%s' seems to be missing." % filename
				else:
					print >>sys.stderr, "Check settings in file '%s'." % cfg._filename
				sys.exit(2)
		else:
			print >>sys.stderr, "error: no report found for module '%s'" % options.module
		dump_modules(cfg, options.module, sys.stderr)
		sys.exit(2)

	if not args:
		parser.print_usage(sys.stderr)
		print >> sys.stderr, _("Error: no DNs specified on command line")
		sys.exit(2)

	# FIXME: why is start_tls=0 used here?
	if options.user and options.password:
		lo = univention.admin.uldap.access(host=options.server, base=options.base, binddn=options.user, bindpw=options.password, start_tls=0)
	else:
		try:
			if ucr['server/role'] == 'domaincontroller_master':
				lo, po = univention.admin.uldap.getAdminConnection(start_tls=0)
			else:
				lo, po = univention.admin.uldap.getMachineConnection(start_tls=0)
		except IOError:
			print >> sys.stderr, _("Error: user and/or password not specified")
			parser.print_help(sys.stderr)
			sys.exit(1)

	report = Report(lo, config=cfg)
	try:
		filename = report.create(options.module, options.report, args)
	except ReportError as exc:
		print >> sys.stderr, _("Error: The %s report could not be created: %s") % (options.report, exc)
			options.footer = cfg.get_footer(options.module, options.report)
		doc = udr.Document(template, header=options.header, footer=options.footer)
	except NameError as e:  # missing file
		print >>sys.stderr, e
		sys.exit(1)
	tmpfile = doc.create_source(args)
	if doc._type == udr.Document.TYPE_LATEX:
		type = 'PDF'
		outfile = doc.create_pdf(tmpfile)
		if options.no_cleanup:
			print >>sys.stderr, 'kept temporary source file at %s' % tmpfile
		else:
			basefile = tmpfile.rsplit('.', 1)[0]  # strip suffix
			for file in [tmpfile] + ['%s.%s' % (basefile, suffix) for suffix in ('aux', 'log')]:
				try:
					os.unlink(file)
				except OSError as e:
					pass
	elif doc._type == udr.Document.TYPE_CSV:
		type = 'CSV'
		outfile = tmpfile
	else:
		type = ''
		outfile = tmpfile

	print _('The %s has been created: %s') % (options.report, filename)
		print 'created %s file: %s' % (type, outfile)
	else:
		print >>sys.stderr, "error: report could not be created"
		sys.exit(1)


if __name__ == "__main__":





			this.set('title', _('Creating the report ...'));

			this.standbyDuring(this.umcpCommand('udm/reports/create', {objects: this.objects, report: options.report}, this._form)).then(lang.hitch(this, function(data) {
			this.standbyDuring(this.umcpCommand('udm/reports/create', request_data, this._form)).then(lang.hitch(this, function(data) {
				var title = '';
				var message = '';

				this._container.removeChild(this._form);
				this._container.removeChild(waiting);
				waiting.destroy();

				var message = lang.replace('<p>{0}</p>', [_standbyDuringSuccessText(options.report, data.result.URL)]);
				this.set('title', _('Report has been created'));
					title = _('Report has been created');
				} else {
					title = _('Report creation has failed');
					message = _('The report could not be created. Details for the problems can be found in the log files.');
				}
				this.set('title', title);
				this._container.addChild(new Text({content: message}));

				var btnContainer = new ContainerWidget({




from univention.management.console.modules.decorators import simple_response, sanitize, multi_response, prevent_xsrf_check
from univention.management.console.modules.sanitizers import (
	Sanitizer, LDAPSearchSanitizer, EmailSanitizer, ChoicesSanitizer,
	ListSanitizer, StringSanitizer, DictSanitizer, BooleanSanitizer,
	DNSanitizer
)
from univention.management.console.modules.mixins import ProgressMixin
from univention.management.console.log import MODULE


	def reports_query(self, request):
		"""Returns a list of reports for the given object type"""
		self.finished(request.id, sorted(self.reports_cfg.get_report_names(request.flavor)))

	def sanitize_reports_create(self, request):
		choices = self.reports_cfg.get_report_names(request.flavor)
		return dict(
			report=ChoicesSanitizer(choices=choices, required=True),
			objects=ListSanitizer(DNSanitizer(minimum=1), required=True, min_elements=1)
		)

	@sanitize_func(sanitize_reports_create)
	def reports_create(self, request):
		"""Creates a report for the given LDAP DNs and returns the URL to access the file"""

		requests.options = {}
			'report' -- name of the report
			'objects' -- list of LDAP DNs to include in the report

		return: report file
		"""

		@LDAP_Connection
		def _thread(request, ldap_connection=None, ldap_position=None):
			report = udr.Report(ldap_connection)
			udr.admin.clear_cache()
			cfg = udr.Config()
			template = cfg.get_report(request.flavor, request.options['report'])
			doc = udr.Document(template, header=cfg.get_header(request.flavor, request.options['report']), footer=cfg.get_footer(request.flavor, request.options['report']))
			tmpfile = doc.create_source(request.options['objects'])
			if doc._type == udr.Document.TYPE_LATEX:
				doc_type = _('PDF document')
				pdffile = doc.create_pdf(tmpfile)
				os.unlink(tmpfile)
			else:
				doc_type = _('text file')
				pdffile = tmpfile
			try:
				report_file = report.create(request.flavor, request.options['report'], request.options['objects'])
			except udr.ReportError as exc:
				raise UMC_Error(str(exc))

			www_data_user = pwd.getpwnam('www-data')
			www_data_grp = grp.getgrnam('www-data')
			path = '/var/www/univention-directory-reports/'
			filename = os.path.join(path, os.path.basename(report_file))

			shutil.move(report_file, path)
			os.chown(filename, www_data_user.pw_uid, www_data_grp.gr_gid)
			os.chmod(filename, 0o644)
			url = '/univention-directory-reports/%s' % os.path.basename(report_file)
			return {'URL': url}
				url = '/univention-directory-reports/%s' % os.path.basename(pdffile)
				# link = '<a target="_blank" href="%s">%s (%s)</a>' % ( url, module.name, request.options[ 'report' ] )

				return {'success': True, 'count': len(request.options['objects']), 'URL': url, 'docType': doc_type}
			else:
				return {'success': False, 'count': 0, 'URL': None, 'docType': doc_type}

		thread = notifier.threads.Simple('ReportsCreate', notifier.Callback(_thread, request), notifier.Callback(self.thread_finished_callback, request))
		thread.run()

Return to bug 39239

Lines 224-246 define([ Link Here

(-)a/management/univention-management-console-module-udm/umc/js/udm/CreateReportDialog.js (-13 / +3 lines)
224		224
225	this.set('title', _('Creating the report ...'));	225	this.set('title', _('Creating the report ...'));
226		226
227	var request_data = {objects: this.objects, report: options.report};	227	this.standbyDuring(this.umcpCommand('udm/reports/create', {objects: this.objects, report: options.report}, this._form)).then(lang.hitch(this, function(data) {
228	this.standbyDuring(this.umcpCommand('udm/reports/create', request_data, this._form)).then(lang.hitch(this, function(data) {
229	var title = '';
230	var message = '';
231
232	this._container.removeChild(this._form);	228	this._container.removeChild(this._form);
233	this._container.removeChild(waiting);	229	this._container.removeChild(waiting);
234	waiting.destroy();	230	waiting.destroy();
235		231
236	if (true === data.result.success) {	232	var message = lang.replace('<p>{0}</p>', [_standbyDuringSuccessText(options.report, data.result.URL)]);
237	message = lang.replace('<p>{0}</p>', [_standbyDuringSuccessText(data.result.docType, data.result.URL)]);	233	this.set('title', _('Report has been created'));
238	title = _('Report has been created');
239	} else {
240	title = _('Report creation has failed');
241	message = _('The report could not be created. Details for the problems can be found in the log files.');
242	}
243	this.set('title', title);
244	this._container.addChild(new Text({content: message}));	234	this._container.addChild(new Text({content: message}));
245		235
246	var btnContainer = new ContainerWidget({	236	var btnContainer = new ContainerWidget({

Lines 51-57 Link Here

(-)a/management/univention-management-console-module-udm/umc/python/udm/__init__.py (-44 / +20 lines)
51	from univention.management.console.modules.decorators import simple_response, sanitize, multi_response, prevent_xsrf_check	51	from univention.management.console.modules.decorators import simple_response, sanitize, multi_response, prevent_xsrf_check
52	from univention.management.console.modules.sanitizers import (	52	from univention.management.console.modules.sanitizers import (
53	Sanitizer, LDAPSearchSanitizer, EmailSanitizer, ChoicesSanitizer,	53	Sanitizer, LDAPSearchSanitizer, EmailSanitizer, ChoicesSanitizer,
54	ListSanitizer, StringSanitizer, DictSanitizer, BooleanSanitizer	54	ListSanitizer, StringSanitizer, DictSanitizer, BooleanSanitizer,
		55	DNSanitizer
55	)	56	)
56	from univention.management.console.modules.mixins import ProgressMixin	57	from univention.management.console.modules.mixins import ProgressMixin
57	from univention.management.console.log import MODULE	58	from univention.management.console.log import MODULE
Lines 579-640 def _thread(request): Link Here
579		580
580	def reports_query(self, request):	581	def reports_query(self, request):
581	"""Returns a list of reports for the given object type"""	582	"""Returns a list of reports for the given object type"""
582	self.finished(request.id, self.reports_cfg.get_report_names(request.flavor))	583	self.finished(request.id, sorted(self.reports_cfg.get_report_names(request.flavor)))
583		584
584	def sanitize_reports_create(self, request):	585	def sanitize_reports_create(self, request):
585	choices = self.reports_cfg.get_report_names(request.flavor)	586	choices = self.reports_cfg.get_report_names(request.flavor)
586	return dict(	587	return dict(
587	report=ChoicesSanitizer(choices=choices, required=True),	588	report=ChoicesSanitizer(choices=choices, required=True),
588	objects=ListSanitizer(StringSanitizer(minimum=1), required=True, min_elements=1)	589	objects=ListSanitizer(DNSanitizer(minimum=1), required=True, min_elements=1)
589	)	590	)
590		591
591	@sanitize_func(sanitize_reports_create)	592	@sanitize_func(sanitize_reports_create)
592	def reports_create(self, request):	593	def reports_create(self, request):
593	"""Creates a report for the given LDAP DNs and returns the file	594	"""Creates a report for the given LDAP DNs and returns the URL to access the file"""
594
595	requests.options = {}
596	'report' -- name of the report
597	'objects' -- list of LDAP DNs to include in the report
598
599	return: report file
600	"""
601		595
602	@LDAP_Connection	596	@LDAP_Connection
603	def _thread(request, ldap_connection=None, ldap_position=None):	597	def _thread(request, ldap_connection=None, ldap_position=None):
604	udr.admin.connect(access=ldap_connection)	598	report = udr.Report(ldap_connection)
605	udr.admin.clear_cache()
606	cfg = udr.Config()
607	template = cfg.get_report(request.flavor, request.options['report'])
608	doc = udr.Document(template, header=cfg.get_header(request.flavor, request.options['report']), footer=cfg.get_footer(request.flavor, request.options['report']))
609	tmpfile = doc.create_source(request.options['objects'])
610	if doc._type == udr.Document.TYPE_LATEX:
611	doc_type = _('PDF document')
612	pdffile = doc.create_pdf(tmpfile)
613	os.unlink(tmpfile)
614	else:
615	doc_type = _('text file')
616	pdffile = tmpfile
617	try:	599	try:
618	os.unlink(tmpfile[: -4] + 'aux')	600	report_file = report.create(request.flavor, request.options['report'], request.options['objects'])
619	os.unlink(tmpfile[: -4] + 'log')	601	except udr.ReportError as exc:
620	except:	602	raise UMC_Error(str(exc))
621	pass	603
622	if pdffile:	604	www_data_user = pwd.getpwnam('www-data')
623	path = '/var/www/univention-directory-reports'	605	www_data_grp = grp.getgrnam('www-data')
624	shutil.copy(pdffile, path)	606	path = '/var/www/univention-directory-reports/'
625	os.unlink(pdffile)	607	filename = os.path.join(path, os.path.basename(report_file))
626		608
627	www_data_user = pwd.getpwnam('www-data')	609	shutil.move(report_file, path)
628	www_data_grp = grp.getgrnam('www-data')	610	os.chown(filename, www_data_user.pw_uid, www_data_grp.gr_gid)
629	filename = os.path.join(path, os.path.basename(pdffile))	611	os.chmod(filename, 0o644)
630	os.chown(filename, www_data_user.pw_uid, www_data_grp.gr_gid)	612	url = '/univention-directory-reports/%s' % os.path.basename(report_file)
631	os.chmod(filename, 0o644)	613	return {'URL': url}
632	url = '/univention-directory-reports/%s' % os.path.basename(pdffile)
633	# link = '<a target="_blank" href="%s">%s (%s)</a>' % ( url, module.name, request.options[ 'report' ] )
634
635	return {'success': True, 'count': len(request.options['objects']), 'URL': url, 'docType': doc_type}
636	else:
637	return {'success': False, 'count': 0, 'URL': None, 'docType': doc_type}
638		614
639	thread = notifier.threads.Simple('ReportsCreate', notifier.Callback(_thread, request), notifier.Callback(self.thread_finished_callback, request))	615	thread = notifier.threads.Simple('ReportsCreate', notifier.Callback(_thread, request), notifier.Callback(self.thread_finished_callback, request))
640	thread.run()	616	thread.run()

Line 0 Link Here

(-)a/management/univention-directory-reports/conffiles/etc/univention/directory/reports/default/de_DE/header.rml (+50 lines)
	1	<?xml version="1.0" encoding="utf-8" standalone="no" ?>
	2	<!DOCTYPE document SYSTEM "../rml_1_0.dtd">
	3	<document filename="univention-directory-report.pdf">
	4	<template author="Univention Corporate Server" title="Univention Directory Report" showBoundary="0"
	5	pageSize="(21cm, 29.7cm)" leftMargin="2.5cm" rightMargin="2.5cm" topMargin="2.5cm" bottomMargin="2.5cm">
	6	<pageTemplate id="main">
	7	<pageGraphics>
	8	<image file="@%@directory/reports/logo@%@" y="27.5cm" x="13.5cm" width="5cm"/>
	9	</pageGraphics>
	10	<frame id="first" x1="2.5cm" y1="2.5cm" width="16cm" height="24.5cm"/>
	11	</pageTemplate>
	12	<pageTemplate id="regularpages">
	13	<pageGraphics>
	14	<image file="@%@directory/reports/logo@%@" y="27.5cm" x="13.5cm" width="5cm"/>
	15	<lines>2.5cm 2.5cm 18.5cm 2.5cm</lines>
	16	<drawString x="18cm" y="2cm"><pageNumber/></drawString>
	17	</pageGraphics>
	18	<setFont name="Times-Roman" size="9"/>
	19	<frame id="first" x1="2.5cm" y1="2.5cm" width="16cm" height="24.5cm"/>
	20	</pageTemplate>
	21	</template>
	22	<stylesheet>
	23	<paraStyle name="content" fontName="Helvetica" fontSize="9" textColor="black"/>
	24	<blockTableStyle id="mainTableOuter">
	25	<blockFont name="Times-Roman" size="9"/>
	26	<blockTextColor colorName="black"/>
	27	<blockLeftPadding length="0"/>
	28	<blockValign value="TOP"/>
	29	<blockAlignment value="LEFT"/>
	30	<!-- <lineStyle kind="GRID" colorName="black"/>-->
	31	</blockTableStyle>
	32	<blockTableStyle id="mainTable">
	33	<blockFont name="Times-Roman" size="9"/>
	34	<blockTextColor colorName="black"/>
	35	<blockValign value="TOP"/>
	36	<blockLeftPadding length="0"/>
	37	<blockBottomPadding length="0"/>
	38	<blockTopPadding length="0"/>
	39	<blockAlignment value="LEFT"/>
	40	<!-- <lineStyle kind="GRID" colorName="black"/>-->
	41	<blockSpan start="0,0" stop="1,0"/>
	42	</blockTableStyle>
	43	</stylesheet>
	44	<story>
	45	<spacer length="1cm"/>
	46	<title>Auswertung der Verzeichnisdienstobjekte</title>
	47	<spacer length="3cm"/>
	48	<title>Erstellt am <@date format="%A %d. %B %Y"@></title>
	49	<setNextTemplate name="regularpages"/>
	50	<nextFrame/>

Lines 15-28 Architecture: all Link Here

(-)a/management/univention-directory-reports/debian/control (-6 / +16 lines)
15	Depends: ${misc:Depends},	15	Depends: ${misc:Depends},
16	python-univention-directory-reports,	16	python-univention-directory-reports,
17	shell-univention-lib,	17	shell-univention-lib,
18	texlive,	18	python-univention-lib (>= 1.0.25-1),
19	texlive-latex-recommended,
20	texlive-latex-extra,
21	texlive-lang-german,
22	python-univention-lib (>= 1.0.25-1)
23	Description: Creates reports for UCS Directory Manager objects	19	Description: Creates reports for UCS Directory Manager objects
24	UCS Report Generator creates reports in PDF format using	20	UCS Report Generator creates reports in PDF format using
25	LaTeX template files that contain a special template syntax to	21	template files that contain a special template syntax to
26	describe LDAP attributes and objects that should replace the patterns.	22	describe LDAP attributes and objects that should replace the patterns.
27		23
28	Package: python-univention-directory-reports	24	Package: python-univention-directory-reports
Lines 30-37 Architecture: all Link Here
30	Depends: ${misc:Depends}, ${python:Depends},	26	Depends: ${misc:Depends}, ${python:Depends},
31	python-univention-directory-manager,	27	python-univention-directory-manager,
32	univention-config,	28	univention-config,
		29	python-trml2pdf,
33	Provides: ${python:Provides}	30	Provides: ${python:Provides}
34	Description: Creates reports for UCS Directory manager objects	31	Description: Creates reports for UCS Directory manager objects
35	UCS Report Generator creates reports in PDF format using	32	UCS Report Generator creates reports in PDF format using
		33	RML template files that contain a special template syntax to
		34	describe LDAP attributes and objects that should replace the patterns.
		35
		36	Package: univention-directory-reports-latex
		37	Architecture: all
		38	Depends: univention-directory-reports,
		39	univention-config,
		40	texlive,
		41	texlive-latex-recommended,
		42	texlive-latex-extra,
		43	texlive-lang-german,
		44	Description: Creates reports for UCS Directory manager objects
		45	UCS Report Generator creates reports in PDF format using
36	LaTeX template files that contain a special template syntax to	46	LaTeX template files that contain a special template syntax to
37	describe LDAP attributes and objects that should replace the patterns.	47	describe LDAP attributes and objects that should replace the patterns.

Line 0 Link Here

(-)a/management/univention-directory-reports/debian/univention-directory-reports-latex.postinst (+44 lines)
	1	#!/bin/bash
	2	#
	3	# Univention Reports LaTex
	4	# postinst file for the debian package
	5	#
	6	# Copyright 2017 Univention GmbH
	7	#
	8	# http://www.univention.de/
	9	#
	10	# All rights reserved.
	11	#
	12	# The source code of this program is made available
	13	# under the terms of the GNU Affero General Public License version 3
	14	# (GNU AGPL V3) as published by the Free Software Foundation.
	15	#
	16	# Binary versions of this program provided by Univention to you as
	17	# well as other copyrighted, protected or trademarked materials like
	18	# Logos, graphics, fonts, specific documentations and configurations,
	19	# cryptographic keys etc. are subject to a license agreement between
	20	# you and Univention and not subject to the GNU AGPL V3.
	21	#
	22	# In the case you use this program under the terms of the GNU AGPL V3,
	23	# the program is provided in the hope that it will be useful,
	24	# but WITHOUT ANY WARRANTY; without even the implied warranty of
	25	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	26	# GNU Affero General Public License for more details.
	27	#
	28	# You should have received a copy of the GNU Affero General Public
	29	# License with the Debian GNU/Linux or Univention distribution in file
	30	# /usr/share/common-licenses/AGPL-3; if not, see
	31	# <http://www.gnu.org/licenses/>.
	32
	33	. /usr/share/univention-lib/all.sh
	34
	35	#DEBHELPER#
	36
	37	eval "$(univention-config-registry shell)"
	38
	39	univention-config-registry set \
	40	directory/reports/templates/pdf/user2?'users/user "PDF Latex Document" /etc/univention/directory/reports/default users.tex' \
	41	directory/reports/templates/pdf/group2?'groups/group "PDF Latex Document" /etc/univention/directory/reports/default groups.tex' \
	42	directory/reports/templates/pdf/computer2?'computers/computer "PDF Latex Document" /etc/univention/directory/reports/default computers.tex' \
	43
	44	exit 0

Line 0 Link Here

(-)a/management/univention-directory-reports/debian/univention-directory-reports-latex.univention-config-registry (+13 lines)
	1	Type: file
	2	File: etc/univention/directory/reports/default/en_US/header.tex
	3	Variables: directory/reports/logo
	4
	5	Type: file
	6	File: etc/univention/directory/reports/default/en_US/footer.tex
	7
	8	Type: file
	9	File: etc/univention/directory/reports/default/de_DE/header.tex
	10	Variables: directory/reports/logo
	11
	12	Type: file
	13	File: etc/univention/directory/reports/default/de_DE/footer.tex

Lines 4-21 Variables: directory/reports/templates/.* Link Here

(-)a/management/univention-directory-reports/debian/univention-directory-reports.univention-config-registry (-4 / +4 lines)
4	Variables: directory/reports/default	4	Variables: directory/reports/default
5		5
6	Type: file	6	Type: file
7	File: etc/univention/directory/reports/default/en_US/header.tex	7	File: etc/univention/directory/reports/default/en_US/header.rml
8	Variables: directory/reports/logo	8	Variables: directory/reports/logo
9		9
10	Type: file	10	Type: file
11	File: etc/univention/directory/reports/default/en_US/footer.tex	11	File: etc/univention/directory/reports/default/en_US/footer.rml
12		12
13	Type: file	13	Type: file
14	File: etc/univention/directory/reports/default/de_DE/header.tex	14	File: etc/univention/directory/reports/default/de_DE/header.rml
15	Variables: directory/reports/logo	15	Variables: directory/reports/logo
16		16
17	Type: file	17	Type: file
18	File: etc/univention/directory/reports/default/de_DE/footer.tex	18	File: etc/univention/directory/reports/default/de_DE/footer.rml
19		19
20	Type: file	20	Type: file
21	File: etc/logrotate.d/univention-directory-reports	21	File: etc/logrotate.d/univention-directory-reports

Lines 15-21 This manual page documents briefly the Link Here

(-)a/management/univention-directory-reports/man/univention-directory-reports.1 (-4 / +1 lines)
15	.B univention\-directory\-reports	15	.B univention\-directory\-reports
16	command.	16	command.
17	It is a tool to generate a report over UDM objects stored in the LDAP tree.	17	It is a tool to generate a report over UDM objects stored in the LDAP tree.
18	Currently supported output formats include Comma Separated Values (CSV) and PDF generated through LaTeX.	18	Currently supported output formats include Comma Separated Values (CSV) and PDF generated through RML or LaTeX.
19		19
20	.SH OPTIONS	20	.SH OPTIONS
21	A summary of options is included below.	21	A summary of options is included below.
Lines 52-60 Use \fB-l\fP to list the available reports. Link Here
52	\fB-l\fP, \fB--list\fP	52	\fB-l\fP, \fB--list\fP
53	List names of available modules and reports.	53	List names of available modules and reports.
54	.TP	54	.TP
55	\fB\-n\fP, \fB\-\-no\-cleanup\fP
56	Do not remove the temporary LaTeX files (for debugging).
57	.TP
58	\fB\-c\fP \fICONFIG\fP, \fB\-\-config=\fP\fICONFIG\fP	55	\fB\-c\fP \fICONFIG\fP, \fB\-\-config=\fP\fICONFIG\fP
59	Location of an alternative configuration file.	56	Location of an alternative configuration file.
60	.TP	57	.TP

Lines 115-131 def _guess_path(self, directory, fileName, alternativePath=''): Link Here

(-)a/management/univention-directory-reports/modules/univention/directory/reports/config.py (-4 / +4 lines)
115	return path	115	return path
116	return None	116	return None
117		117
118	def get_header(self, module, name=None):	118	def get_header(self, module, name=None, suffix='.tex'):
119	report = self._get_report_entry(module, name)	119	report = self._get_report_entry(module, name)
120	if not report:	120	if not report:
121	return None	121	return None
122	return self._guess_path(report[1], 'header.tex', self._oldHeader)	122	return self._guess_path(report[1], 'header%s' % (suffix,), self._oldHeader)
123		123
124	def get_footer(self, module, name=None):	124	def get_footer(self, module, name=None, suffix='.tex'):
125	report = self._get_report_entry(module, name)	125	report = self._get_report_entry(module, name)
126	if not report:	126	if not report:
127	return None	127	return None
128	return self._guess_path(report[1], 'footer.tex', self._oldFooter)	128	return self._guess_path(report[1], 'footer%s' % (suffix,), self._oldFooter)
129		129
130	def get_report_names(self, module):	130	def get_report_names(self, module):
131	reports = self._reports.get(module, [])	131	reports = self._reports.get(module, [])

Lines 33-39 Link Here

(-)a/management/univention-directory-reports/modules/univention/directory/reports/parser.py (-2 / +4 lines)
33	import re	33	import re
34	import shlex	34	import shlex
35		35
36	from tokens import Token, TextToken, AttributeToken, PolicyToken, QueryToken, HeaderToken, FooterToken, IContextToken, ResolveToken	36	from tokens import Token, TextToken, AttributeToken, PolicyToken, QueryToken, HeaderToken, FooterToken, IContextToken, ResolveToken, DateToken
37		37
38		38
39	class Parser(object):	39	class Parser(object):
Lines 109-121 def next_token(self): Link Here
109	return HeaderToken(attrs, closing)	109	return HeaderToken(attrs, closing)
110	elif name == 'footer':	110	elif name == 'footer':
111	return FooterToken(attrs, closing)	111	return FooterToken(attrs, closing)
		112	elif name == 'date':
		113	return DateToken(attrs)
112	else:	114	else:
113	raise SyntaxError('Unknown tag: %s' % name)	115	raise SyntaxError('Unknown tag: %s' % name)
114		116
115	def tokenize(self):	117	def tokenize(self):
116	token = self.next_token()	118	token = self.next_token()
117	while token:	119	while token:
118	if isinstance(token, (TextToken, AttributeToken, PolicyToken)):	120	if isinstance(token, (TextToken, AttributeToken, PolicyToken, DateToken)):
119	if isinstance(token, TextToken):	121	if isinstance(token, TextToken):
120	if token.data == '\n' and len(self._context) and isinstance(self._context[-1], HeaderToken):	122	if token.data == '\n' and len(self._context) and isinstance(self._context[-1], HeaderToken):
121	# ignore line feed after header	123	# ignore line feed after header

Line 0 Link Here

(-)a/management/univention-directory-reports/templates/de_DE/groups.rml (+42 lines)
	1	<para><h1>Gruppen-Report: <@attribute name="name"@></h1></para>
	2	<spacer length="1cm"/>
	3
	4	<blockTable style="mainTable">
	5	<tr><td><h3>Gruppeneinzelnachweis: <@attribute name="name"@></h3></td></tr>
	6	<tr><td><para style="content">Name:</para></td><td><para style="content"><@attribute name="name"@></para></td></tr>
	7	<tr><td><para style="content">Beschreibung:</para></td><td><para style="content"><@attribute name="description" default="-"@></para></td></tr>
	8	<tr><td><para style="content">Gruppen ID:</para></td><td><para style="content"><@attribute name="gidNumber"@></para></td></tr>
	9	<tr><td><para style="content">Relative ID:</para></td><td><para style="content"><@attribute name="sambaRID"@></para></td></tr>
	10	<tr><td><para style="content">Gruppentyp:</para></td><td><para style="content"><@attribute name="sambaGroupType"@></para></td></tr>
	11	<tr><td><para style="content">E-Mail-Adresse:</para></td><td><para style="content"><@attribute name="mailAddress" default="-"@></para></td></tr>
	12	</blockTable>
	13
	14	<spacer length="0.5cm"/>
	15
	16	<h3>Mitglied folgender Gruppen</h3>
	17
	18	<@resolve module="groups/group" dn-attribute="memberOf" alternative="<para>Diese Gruppe ist in keiner anderen Gruppe Mitglied.</para>"@>
	19	<para bulletFontSize="5" bulletText="●"><@attribute name="name"@> (<@attribute name="description"@>)</para>
	20	<@/resolve@>
	21
	22
	23	<h3>Gruppen in dieser Gruppe</h3>
	24
	25	<@query module="groups/group" start="nestedGroup" next="nestedGroup" alternative="<para>Keine Gruppe ist Mitglied dieser Gruppe.</para>"@>
	26	<para bulletFontSize="5" bulletText="●"><@attribute name="name"@> (<@attribute name="description"@>)</para>
	27	<@/query@>
	28
	29	<h3>Benutzer in dieser Gruppe</h3>
	30
	31	<@resolve module="users/user" dn-attribute="users" alternative="<para>Kein Benutzer ist Mitglied dieser Gruppe.</para>"@>
	32	<para bulletFontSize="5" bulletText="●"><@attribute name="username"@> (<@attribute name="lastname"@>, <@attribute name="firstname"@>)</para>
	33	<@/resolve@>
	34
	35	<@query module="groups/group" start="nestedGroup" next="nestedGroup" alternative="<para>Keine indirekten Gruppenmitgliedschaften.</para>"@>
	36	<h2>Gruppe: <@attribute name="name"@> (<@attribute name="description"@>)</h2>
	37	<@resolve module="users/user" dn-attribute="users" alternative="<para>Keine Mitglieder in dieser Gruppe</para>"@>
	38	<para bulletFontSize="4" bulletText="●"><@attribute name="username"@> (<@attribute name="lastname"@>)</para>
	39	<@/resolve@>
	40	<@/query@>
	41
	42	<nextFrame/>

Line 0 Link Here

(-)a/management/univention-directory-reports/templates/de_DE/users.rml (+96 lines)
		1	<para><h1>Benutzer-Report: <@attribute name="lastname"@><@attribute name="firstname" prepend=", "@></h1></para>
		2	<spacer length="1cm"/>
		3
		4	<blockTable style="mainTableOuter" colWidths="7.8cm,7.8cm">
		5	<tr><td>
		6
		7	<blockTable style="mainTable" colWidths="3.5cm,4cm">
		8	<tr><td><h3>Benutzereinzelnachweis: <@attribute name="lastname"@>, <@attribute name="firstname"@></h3></td> </tr>
		9	<tr><td><para style="content">Name:</para></td><td><para style="content"><@attribute name="lastname"@><@attribute name="firstname" prepend=", "@></para></td> </tr>
		10	<tr><td><para style="content">Benutzer:</para></td><td><para style="content"><@attribute name="username"@></para></td></tr>
		11	<tr><td><para style="content">Beschreibung:</para></td><td><para style="content"><@attribute name="description"@></para></td></tr>
		12	<tr><td><para style="content">Organisation:</para></td><td><para style="content"><@attribute name="organisation"@></para></td></tr>
		13	<tr><td><para style="content">Mitarbeiternummer:</para></td><td><para style="content"><@attribute name="employeeNumber"@></para></td></tr>
		14	<tr><td><para style="content">Mitarbeitertyp:</para></td><td><para style="content"><@attribute name="employeeType"@></para></td></tr>
		15	<tr><td><para style="content">Raumnummer:</para></td><td><para style="content"><@attribute name="roomNumber"@></para></td></tr>
		16	<tr><td><para style="content">Vorgesetzter:</para></td><td><para style="content">
		17	<@resolve module="users/user" dn-attribute="secretary" alternative=""@>
		18	<@attribute name="lastname"@><@attribute name="firstname" prepend=", "@>
		19	<@/resolve@></para></td></tr>
		20	</blockTable>
		21	<spacer length="1cm"/>
		22
		23
		24	<blockTable style="mainTable" colWidths="3.5cm,4cm">
		25	<tr><td><h3>Kontakt</h3></td></tr>
		26	<tr><td></td></tr>
		27	<tr><td><para style="content">Telefon:</para></td><td><para style="content"><@attribute name="phone"@> </para></td></tr>
		28	<tr><td><para style="content">Mobiltelefon:</para></td><td><para style="content"><@attribute name="mobileTelephoneNumber"@></para></td></tr>
		29	<tr><td><para style="content">Straße:</para></td><td><para style="content"><@attribute name="street"@></para></td></tr>
		30	<tr><td></td></tr>
		31	</blockTable>
		32	<spacer length="1cm"/>
		33
		34	<blockTable style="mainTable" colWidths="3.5cm,4cm">
		35	<tr><td><h3>Kontoeinstellungen</h3></td></tr>
		36	<tr><td><para style="content">Deaktiviert:</para></td><td><para style="content"><@attribute name="disabled" default="Nein"@> </para></td></tr>
		37	<tr><td><para style="content">Gesperrt:</para></td><td><para style="content"><@attribute name="locked" default="Nein"@> </para></td></tr>
		38	<tr><td><para style="content">Kontoablaufdatum:</para></td><td><para style="content"><@attribute name="userexpiry" default="Nicht gesetzt"@> </para></td></tr>
		39	<tr><td><para style="content">Passwortablaufdatum:</para></td><td><para style="content"><@attribute name="passwordexpiry" default="Nicht gesetzt"@> </para></td></tr>
		40	<tr><td><para style="content">Passwortänderung:</para></td><td><para style="content"><@attribute name="pwdChangeNextLogin" default="Nein"@> </para></td></tr>
		41	</blockTable>
		42	<spacer length="1cm"/>
		43
		44	</td><td>
		45
		46	<blockTable style="mainTable" colWidths="3.5cm,4cm">
		47	<tr><td><h3>Linux/UNIX</h3></td></tr>
		48	<tr><td><para style="content">Benutzer-ID:</para></td><td><para style="content"><@attribute name="uidNumber"@> </para></td></tr>
		49	<tr><td><para style="content">Gruppen-ID:</para></td><td><para style="content"><@attribute name="gidNumber"@></para></td></tr>
		50	<tr><td><para style="content">Login-Shell:</para></td><td><para style="content"><@attribute name="shell"@> </para></td></tr>
		51	<tr><td><para style="content">Heimatverzeichnis:</para></td><td><para style="content"><@attribute name="unixhome"@> </para></td></tr>
		52	<tr><td><para style="content">Freigabepfad:</para></td><td><para style="content"><@attribute name="homeSharePath"@> </para></td></tr>
		53	<tr><td><para style="content">Freigabe:</para></td><td><para style="content"><@resolve module="shares/share" dn-attribute="homeShare"@>
		54	<@attribute name="printablename"@>
		55	<@/resolve@></para></td></tr>
		56	</blockTable>
		57
		58	<spacer length="1cm"/>
		59
		60	<blockTable style="mainTable" colWidths="3.5cm,4cm">
		61	<tr><td><h3>Passwort-Richtlinie</h3></td></tr>
		62	<tr><td><para style="content">Ererbt:</para></td><td><@policy module="policies/pwdhistory" inherited=""@> </td></tr>
		63	<tr><td><para style="content">History Länge:</para></td><td><para style="content"><@attribute name="length"@></para></td></tr>
		64	<tr><td><para style="content">Passwort Länge:</para></td><td><para style="content"><@attribute name="pwLength"@></para></td></tr>
65	<tr><td><para style="content">Ablaufintervall:</para></td><td><para style="content"><@attribute name="expiryInterval" default="-"@></para></td></tr>
66	</blockTable>
67	<spacer length="1cm"/>
68
69	<blockTable style="mainTable" colWidths="3.5cm,4cm">
70	<tr><td><h3>Mail</h3></td></tr>
71	<tr><td><para style="content">E-Mail-Adresse:</para></td><td><para style="content"><@attribute name="mailPrimaryAddress" default="Keine"@> </para></td></tr>
72	<tr><td><para style="content">weitere Adressen:</para></td><td><para style="content"><@attribute name="mailAlternativeAddress" default="Keine"@> </para></td></tr>
73	<tr><td><para style="content">Globaler SPAM-Ordner:</para></td><td><para style="content"><@attribute name="mailGlobalSpamFolder" default="-"@> </para></td></tr>
74	</blockTable>
75	<spacer length="1cm"/>
76
77	<blockTable style="mainTable" colWidths="3.5cm,4cm">
78	<tr><td><h3>Windows</h3></td></tr>
79	<tr><td><para style="content">Heimatverzeichnis:</para></td><td><para style="content"><@attribute name="sambahome"@> </para></td></tr>
80	<tr><td><para style="content">Laufwerk für Heimatverzeichnis:</para></td><td><para style="content"><@attribute name="homedrive"@> </para></td></tr>
81	<tr><td><para style="content">Profilverzeichnis:</para></td><td><para style="content"><@attribute name="profilepath"@> </para></td></tr>
82	<tr><td><para style="content">Anmeldeskript:</para></td><td><para style="content"><@attribute name="scriptpath"@> </para></td></tr>
83	<tr><td><para style="content">Relative ID:</para></td><td><para style="content"><@attribute name="sambaRID"@> </para></td></tr>
84	</blockTable>
85
86	</td></tr>
87	</blockTable>
88
89
90	<h3>Mitglied in folgenden Gruppen</h3>
91
92	<@query module="groups/group" start="groups" next="memberOf" regex="name=^[^(s\-)([a\-)(i\-)(h\-)]" alternative="<para>Der Benutzer ist in keiner weiteren Gruppen enthalten</para>"@>
93	<para bulletFontSize="5" bulletText="●"><b><@attribute name="name"@></b> (<@attribute name="description"@>)</para>
94	<@/query@>
95
96	<nextFrame/>

Line 0 Link Here

(-)a/management/univention-directory-reports/templates/en_US/computers.rml (+12 lines)
	1	<!--<para><h1>Hostname report</h1></para>
	2	<spacer length="1cm"/>
	3	-->
	4	<blockTable style="mainTable">
	5	<tr><td><h3>Hostname <@attribute name="name"@></h3></td> </tr>
	6	<tr><td><para style="content">IP address:</para></td><td><para style="content"><@attribute name="ip"@></para></td> </tr>
	7	<tr><td><para style="content">MAC address:</para></td><td><para style="content"><@attribute name="mac"@></para></td></tr>
	8	<tr><td><para style="content">Network:</para></td><td><para style="content"><@resolve module="networks/network" dn-attribute="network" alternative="nicht zugewiesen"@><@attribute name="name"@><@/resolve@></para></td></tr>
	9	<tr><td><para style="content">Inventory number:</para></td><td><para style="content"><@attribute name="inventoryNumber"@></para></td></tr>
	10	</blockTable>
	11	<spacer length="1cm"/>
	12	\ihead{Hostname report}

Line 0 Link Here

(-)a/management/univention-directory-reports/templates/en_US/groups.rml (+42 lines)
	1	<para><h1>Group report: <@attribute name="name"@></h1></para>
	2	<spacer length="1cm"/>
	3
	4	<blockTable style="mainTable">
	5	<tr><td><h3>Group record: <@attribute name="name"@></h3></td></tr>
	6	<tr><td><para style="content">Name:</para></td><td><para style="content"><@attribute name="name"@></para></td></tr>
	7	<tr><td><para style="content">Description:</para></td><td><para style="content"><@attribute name="description" default="-"@></para></td></tr>
	8	<tr><td><para style="content">Group ID:</para></td><td><para style="content"><@attribute name="gidNumber"@></para></td></tr>
	9	<tr><td><para style="content">Relative ID:</para></td><td><para style="content"><@attribute name="sambaRID"@></para></td></tr>
	10	<tr><td><para style="content">Group type:</para></td><td><para style="content"><@attribute name="sambaGroupType"@></para></td></tr>
	11	<tr><td><para style="content">E-Mail address:</para></td><td><para style="content"><@attribute name="mailAddress" default="-"@></para></td></tr>
	12	</blockTable>
	13
	14	<spacer length="0.5cm"/>
	15
	16	<h3>Member of the following groups</h3>
	17
	18	<@resolve module="groups/group" dn-attribute="memberOf" alternative="<para>This group is no member of any other group.</para>"@>
	19	<para bulletFontSize="5" bulletText="●"><@attribute name="name"@> (<@attribute name="description"@>)</para>
	20	<@/resolve@>
	21
	22
	23	<h3>Group members of this group</h3>
	24
	25	<@query module="groups/group" start="nestedGroup" next="nestedGroup" alternative="<para>No group is member of this group.</para>"@>
	26	<para bulletFontSize="5" bulletText="●"><@attribute name="name"@> (<@attribute name="description"@>)</para>
	27	<@/query@>
	28
	29	<h3>User members of this group</h3>
	30
	31	<@resolve module="users/user" dn-attribute="users" alternative="<para>No user is member of this group.</para>"@>
	32	<para bulletFontSize="5" bulletText="●"><@attribute name="username"@> (<@attribute name="lastname"@>, <@attribute name="firstname"@>)</para>
	33	<@/resolve@>
	34
	35	<@query module="groups/group" start="nestedGroup" next="nestedGroup" alternative="<para>No indirect group members.</para>"@>
	36	<h2>Group: <@attribute name="name"@> (<@attribute name="description"@>)</h2>
	37	<@resolve module="users/user" dn-attribute="users" alternative="<para>No members of this group.</para>"@>
	38	<para bulletFontSize="4" bulletText="●"><@attribute name="username"@> (<@attribute name="lastname"@>)</para>
	39	<@/resolve@>
	40	<@/query@>
	41
	42	<nextFrame/>

Line 0 Link Here

(-)a/management/univention-directory-reports/templates/en_US/users.rml (+96 lines)
		1	<para><h1>User report: <@attribute name="lastname"@><@attribute name="firstname" prepend=", "@></h1></para>
		2	<spacer length="1cm"/>
		3
		4	<blockTable style="mainTableOuter" colWidths="7.8cm,7.8cm">
		5	<tr><td>
		6
		7	<blockTable style="mainTable" colWidths="3.5cm,4cm">
		8	<tr><td><h3>User record: <@attribute name="lastname"@>, <@attribute name="firstname"@></h3></td> </tr>
		9	<tr><td><para style="content">Name:</para></td><td><para style="content"><@attribute name="lastname"@><@attribute name="firstname" prepend=", "@></para></td> </tr>
		10	<tr><td><para style="content">User name:</para></td><td><para style="content"><@attribute name="username"@></para></td></tr>
		11	<tr><td><para style="content">Description:</para></td><td><para style="content"><@attribute name="description"@></para></td></tr>
		12	<tr><td><para style="content">Organisation:</para></td><td><para style="content"><@attribute name="organisation"@></para></td></tr>
		13	<tr><td><para style="content">Employee number:</para></td><td><para style="content"><@attribute name="employeeNumber"@></para></td></tr>
		14	<tr><td><para style="content">Employee type:</para></td><td><para style="content"><@attribute name="employeeType"@></para></td></tr>
		15	<tr><td><para style="content">Room number:</para></td><td><para style="content"><@attribute name="roomNumber"@></para></td></tr>
		16	<tr><td><para style="content">Superior:</para></td><td><para style="content">
		17	<@resolve module="users/user" dn-attribute="secretary" alternative=""@>
		18	<@attribute name="lastname"@><@attribute name="firstname" prepend=", "@>
		19	<@/resolve@></para></td></tr>
		20	</blockTable>
		21	<spacer length="1cm"/>
		22
		23
		24	<blockTable style="mainTable" colWidths="3.5cm,4cm">
		25	<tr><td><h3>Contact</h3></td></tr>
		26	<tr><td></td></tr>
		27	<tr><td><para style="content">Phone:</para></td><td><para style="content"><@attribute name="phone"@> </para></td></tr>
		28	<tr><td><para style="content">Mobile phone:</para></td><td><para style="content"><@attribute name="mobileTelephoneNumber"@></para></td></tr>
		29	<tr><td><para style="content">Street:</para></td><td><para style="content"><@attribute name="street"@></para></td></tr>
		30	<tr><td></td></tr>
		31	</blockTable>
		32	<spacer length="1cm"/>
		33
		34	<blockTable style="mainTable" colWidths="3.5cm,4cm">
		35	<tr><td><h3>Account settings</h3></td></tr>
		36	<tr><td><para style="content">Disabled:</para></td><td><para style="content"><@attribute name="disabled" default="No"@> </para></td></tr>
		37	<tr><td><para style="content">Locked:</para></td><td><para style="content"><@attribute name="locked" default="No"@> </para></td></tr>
		38	<tr><td><para style="content">Account expiry date:</para></td><td><para style="content"><@attribute name="userexpiry" default="Not set"@> </para></td></tr>
		39	<tr><td><para style="content">Password expiry date:</para></td><td><para style="content"><@attribute name="passwordexpiry" default="Not set"@> </para></td></tr>
		40	<tr><td><para style="content">Change password:</para></td><td><para style="content"><@attribute name="pwdChangeNextLogin" default="No"@> </para></td></tr>
		41	</blockTable>
		42	<spacer length="1cm"/>
		43
		44	</td><td>
		45
		46	<blockTable style="mainTable" colWidths="3.5cm,4cm">
		47	<tr><td><h3>Linux/UNIX</h3></td></tr>
		48	<tr><td><para style="content">User ID:</para></td><td><para style="content"><@attribute name="uidNumber"@> </para></td></tr>
		49	<tr><td><para style="content">Group ID:</para></td><td><para style="content"><@attribute name="gidNumber"@></para></td></tr>
		50	<tr><td><para style="content">Login shell:</para></td><td><para style="content"><@attribute name="shell"@> </para></td></tr>
		51	<tr><td><para style="content">Home directory:</para></td><td><para style="content"><@attribute name="unixhome"@> </para></td></tr>
		52	<tr><td><para style="content">Share path:</para></td><td><para style="content"><@attribute name="homeSharePath"@> </para></td></tr>
		53	<tr><td><para style="content">Share:</para></td><td><para style="content"><@resolve module="shares/share" dn-attribute="homeShare"@>
		54	<@attribute name="printablename"@>
		55	<@/resolve@></para></td></tr>
		56	</blockTable>
		57
		58	<spacer length="1cm"/>
		59
		60	<blockTable style="mainTable" colWidths="3.5cm,4cm">
		61	<tr><td><h3>Password policy</h3></td></tr>
		62	<tr><td><para style="content">Inherited:</para></td><td><@policy module="policies/pwdhistory" inherited=""@> </td></tr>
		63	<tr><td><para style="content">History length:</para></td><td><para style="content"><@attribute name="length"@></para></td></tr>
		64	<tr><td><para style="content">Password length:</para></td><td><para style="content"><@attribute name="pwLength"@></para></td></tr>
65	<tr><td><para style="content">Expiry interval:</para></td><td><para style="content"><@attribute name="expiryInterval" default="-"@></para></td></tr>
66	</blockTable>
67	<spacer length="1cm"/>
68
69	<blockTable style="mainTable" colWidths="3.5cm,4cm">
70	<tr><td><h3>Mail</h3></td></tr>
71	<tr><td><para style="content">E-mail address:</para></td><td><para style="content"><@attribute name="mailPrimaryAddress" default="None"@> </para></td></tr>
72	<tr><td><para style="content">Alternative address:</para></td><td><para style="content"><@attribute name="mailAlternativeAddress" default="None"@> </para></td></tr>
73	<tr><td><para style="content">Global SPAM folder:</para></td><td><para style="content"><@attribute name="mailGlobalSpamFolder" default="-"@> </para></td></tr>
74	</blockTable>
75	<spacer length="1cm"/>
76
77	<blockTable style="mainTable" colWidths="3.5cm,4cm">
78	<tr><td><h3>Windows</h3></td></tr>
79	<tr><td><para style="content">Home directory:</para></td><td><para style="content"><@attribute name="sambahome"@> </para></td></tr>
80	<tr><td><para style="content">Home drive:</para></td><td><para style="content"><@attribute name="homedrive"@> </para></td></tr>
81	<tr><td><para style="content">Profile path:</para></td><td><para style="content"><@attribute name="profilepath"@> </para></td></tr>
82	<tr><td><para style="content">Logon script:</para></td><td><para style="content"><@attribute name="scriptpath"@> </para></td></tr>
83	<tr><td><para style="content">Relative ID:</para></td><td><para style="content"><@attribute name="sambaRID"@> </para></td></tr>
84	</blockTable>
85
86	</td></tr>
87	</blockTable>
88
89
90	<h3>Member of the following groups</h3>
91
92	<@query module="groups/group" start="groups" next="memberOf" regex="name=^[^(s\-)([a\-)(i\-)(h\-)]" alternative="<para>The user is not member of any other group</para>"@>
93	<para bulletFontSize="5" bulletText="●"><b><@attribute name="name"@></b> (<@attribute name="description"@>)</para>
94	<@/query@>
95
96	<nextFrame/>