← Back to branch summary

~ubuntu-branches/ubuntu/trusty/ldap-account-manager/trusty-proposed

« back to all changes in this revision

Viewing changes to lib/modules/inetLocalMailRecipient.inc

  • Committer: Package Import Robot
  • Author(s): Roland Gruber
  • Date: 2013-07-21 11:15:58 UTC
  • mfrom: (1.2.21)
  • Revision ID: package-import@ubuntu.com-20130721111558-ex49xgcpo71fh0xg
Tags: 4.2.1-2
http://bugs.debian.org/669824
http://bugs.debian.org/711778
* Apache 2.4 support
* Fix "transition towards Apache 2.4" 
  support conf-enabled (Closes: #669824)
* Fix "[ldap-account-manager] Can't install ldap-account-manager"
  support conf-enabled (Closes: #711778)

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/modules/inetLocalMailRecipient.inc
1
1
<?php
2
2
/*
3
 
$Id: inetLocalMailRecipient.inc 4540 2012-07-15 12:05:47Z gruberroland $
 
3
$Id: inetLocalMailRecipient.inc 4897 2013-05-05 18:37:04Z gruberroland $
4
4
 
5
5
  This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
6
 
  Copyright (C) 2004 - 2012  Roland Gruber
 
6
  Copyright (C) 2004 - 2013  Roland Gruber
7
7
 
8
8
  This program is free software; you can redistribute it and/or modify
9
9
  it under the terms of the GNU General Public License as published by
296
296
        */
297
297
        function get_pdfEntries() {
298
298
                $return = array();
299
 
                if (isset($this->attributes['mailRoutingAddress'][0])) {
300
 
                        $return['inetLocalMailRecipient_routingAdr'][0] = '<block><key>' . _('Routing address') . '</key><value>' . $this->attributes['mailRoutingAddress'][0] . '</value></block>';
301
 
                }
302
 
                if (isset($this->attributes['mailLocalAddress'][0])) {
303
 
                        $return['inetLocalMailRecipient_localAdr'][0] = '<block><key>' . _('Local address list') . '</key><value>' . implode(', ', $this->attributes['mailLocalAddress']) . '</value></block>';
304
 
                }
305
 
                if (isset($this->attributes['mailHost'][0])) {
306
 
                        $return['inetLocalMailRecipient_host'][0] = '<block><key>' . _('Mail server') . '</key><value>' . $this->attributes['mailHost'][0] . '</value></block>';
307
 
                }
 
299
                $this->addSimplePDFField($return, 'routingAdr', _('Routing address'), 'mailRoutingAddress');
 
300
                $this->addSimplePDFField($return, 'localAdr', _('Local address list'), 'mailLocalAddress');
 
301
                $this->addSimplePDFField($return, 'host', _('Mail server'), 'mailHost');
308
302
                return $return;
309
303
        }
310
304