code cleanup: removed obsolete parameter from get_pdfentries() and updated PHPDoc comments

This commit is contained in:
Roland Gruber 2005-10-09 18:05:32 +00:00
parent 1d92229650
commit bdb5cff592
14 changed files with 62 additions and 50 deletions

View File

@ -1599,7 +1599,7 @@ class accountContainer {
function get_pdfEntries() { function get_pdfEntries() {
$return = array(); $return = array();
while(($current = current($this->module)) != null) { while(($current = current($this->module)) != null) {
$return = array_merge($return,$current->get_pdfEntries($this->type)); $return = array_merge($return,$current->get_pdfEntries());
next($this->module); next($this->module);
} }
$return = array_merge($return,array('main_dn' => array('<block><key>' . _('DN') . '</key><value>' . $this->dn . '</value></block>'))); $return = array_merge($return,array('main_dn' => array('<block><key>' . _('DN') . '</key><value>' . $this->dn . '</value></block>')));

View File

@ -215,11 +215,12 @@ class account extends baseModule {
return $return; return $return;
} }
/* /**
* (non-PHPDoc) * Returns the PDF entries for this module.
* @see baseModule#get_pdfEntries *
* @return array list of possible PDF entries
*/ */
function get_pdfEntries($account_type = "user") { function get_pdfEntries() {
$return = array(); $return = array();
$return['account_description'] = array('<block><key>' . _('Description') . '</key><value>' . $this->attributes['description'][0] . '</value></block>'); $return['account_description'] = array('<block><key>' . _('Description') . '</key><value>' . $this->attributes['description'][0] . '</value></block>');
$return['account_uid'] = array('<block><key>' . _('User name') . '</key><value>' . $this->attributes['uid'][0] . '</value></block>'); $return['account_uid'] = array('<block><key>' . _('User name') . '</key><value>' . $this->attributes['uid'][0] . '</value></block>');

View File

@ -244,7 +244,9 @@ class ieee802Device extends baseModule {
} }
/** /**
* Returns a list of PDF entries * Returns the PDF entries for this module.
*
* @return array list of possible PDF entries
*/ */
function get_pdfEntries() { function get_pdfEntries() {
$return = array(); $return = array();

View File

@ -348,7 +348,9 @@ class inetLocalMailRecipient extends baseModule {
} }
/** /**
* Returns a list of PDF entries * Returns the PDF entries for this module.
*
* @return array list of possible PDF entries
*/ */
function get_pdfEntries() { function get_pdfEntries() {
$return = array(); $return = array();

View File

@ -672,11 +672,12 @@ class inetOrgPerson extends baseModule {
return $return; return $return;
} }
/* /**
* (non-PHPDoc) * Returns the PDF entries for this module.
* @see baseModule#get_pdfEntries *
* @return array list of possible PDF entries
*/ */
function get_pdfEntries($account_type = "user") { function get_pdfEntries() {
return array( return array(
'inetOrgPerson_description' => array('<block><key>' . _('Description') . '</key><value>' . $this->attributes['description'][0] . '</value></block>'), 'inetOrgPerson_description' => array('<block><key>' . _('Description') . '</key><value>' . $this->attributes['description'][0] . '</value></block>'),
'inetOrgPerson_host' => array('<block><key>' . _('Unix workstations') . '</key><value>' . $this->attributes['host'][0] . '</value></block>'), 'inetOrgPerson_host' => array('<block><key>' . _('Unix workstations') . '</key><value>' . $this->attributes['host'][0] . '</value></block>'),

View File

@ -768,9 +768,9 @@ class kolabUser extends baseModule {
} }
/** /**
* Returns a list of PDF entries * Returns the PDF entries for this module.
* *
* @return array PDF entries * @return array list of possible PDF entries
*/ */
function get_pdfEntries() { function get_pdfEntries() {
$return = array(); $return = array();

View File

@ -313,7 +313,9 @@ class nisMailAlias extends baseModule {
} }
/** /**
* Returns a list of PDF entries * Returns the PDF entries for this module.
*
* @return array list of possible PDF entries
*/ */
function get_pdfEntries() { function get_pdfEntries() {
$return = array(); $return = array();

View File

@ -1113,11 +1113,12 @@ class posixAccount extends baseModule {
} }
} }
/* /**
* (non-PHPDoc) * Returns the PDF entries for this module.
* @see baseModule#get_pdfEntries *
* @return array list of possible PDF entries
*/ */
function get_pdfEntries($account_type = "user") { function get_pdfEntries() {
return array( return array(
'posixAccount_uid' => array('<block><key>' . _('User name') . '</key><value>' . $this->attributes['uid'][0] . '</value></block>'), 'posixAccount_uid' => array('<block><key>' . _('User name') . '</key><value>' . $this->attributes['uid'][0] . '</value></block>'),
'posixAccount_cn' => array('<block><key>' . _('Common name') . '</key><value>' . $this->attributes['cn'][0] . '</value></block>'), 'posixAccount_cn' => array('<block><key>' . _('Common name') . '</key><value>' . $this->attributes['cn'][0] . '</value></block>'),

View File

@ -441,11 +441,12 @@ class posixGroup extends baseModule {
} }
/* /**
* (non-PHPDoc) * Returns the PDF entries for this module.
* @see baseModule#get_pdfEntries *
* @return array list of possible PDF entries
*/ */
function get_pdfEntries($account_type = "group") { function get_pdfEntries() {
return array( return array(
'posixGroup_cn' => array('<block><key>' . _('Group name') . '</key><value>' . $this->attributes['cn'][0] . '</value></block>'), 'posixGroup_cn' => array('<block><key>' . _('Group name') . '</key><value>' . $this->attributes['cn'][0] . '</value></block>'),
'posixGroup_gidNumber' => array('<block><key>' . _('GID number') . '</key><value>' . $this->attributes['gidNumber'][0] . '</value></block>'), 'posixGroup_gidNumber' => array('<block><key>' . _('GID number') . '</key><value>' . $this->attributes['gidNumber'][0] . '</value></block>'),

View File

@ -425,13 +425,12 @@ class quota extends baseModule {
} }
} }
/** Returns the PDF entries for this module. /**
* * Returns the PDF entries for this module.
* @see baseModule#get_pdfEntries
* *
* @return array list of possible PDF entries * @return array list of possible PDF entries
*/ */
function get_pdfEntries($account_type = "user") { function get_pdfEntries() {
if (sizeof($this->quota) > 0) { if (sizeof($this->quota) > 0) {
$quotas = array(); $quotas = array();
$quotas[] = '<block><tr>' . $quotas[] = '<block><tr>' .

View File

@ -840,11 +840,12 @@ class sambaAccount extends baseModule {
return $return; return $return;
} }
/* /**
* (non-PHPDoc) * Returns the PDF entries for this module.
* @see baseModule#get_pdfEntries *
* @return array list of possible PDF entries
*/ */
function get_pdfEntries($account_type = "user") { function get_pdfEntries() {
return array( 'sambaAccount_displayName' => array('<block><key>' . _('Display name') . '</key><value' . $this->attributes['displayName'][0] . '</value></block>'), return array( 'sambaAccount_displayName' => array('<block><key>' . _('Display name') . '</key><value' . $this->attributes['displayName'][0] . '</value></block>'),
'sambaAccount_smbHome' => array('<block><key>' . _('Home path') . '</key><value>' . $this->attributes['smbHome'][0] . '</value></block>'), 'sambaAccount_smbHome' => array('<block><key>' . _('Home path') . '</key><value>' . $this->attributes['smbHome'][0] . '</value></block>'),
'sambaAccount_homeDrive' => array('<block><key>' . _('Home drive') . '</key><value>' . $this->attributes['homePath'][0] . '</value></block>'), 'sambaAccount_homeDrive' => array('<block><key>' . _('Home drive') . '</key><value>' . $this->attributes['homePath'][0] . '</value></block>'),

View File

@ -305,11 +305,12 @@ class sambaGroupMapping extends baseModule {
} }
/* /**
* (non-PHPDoc) * Returns the PDF entries for this module.
* @see baseModule#get_pdfEntries *
* @return array list of possible PDF entries
*/ */
function get_pdfEntries($account_type = "User") { function get_pdfEntries() {
return array( 'sambaGroupMapping_gidNumber' => array('<block><key>' . _('GID number') . '</key><value>' . $this->attributes['gidNumber'][0] . '</value></block>'), return array( 'sambaGroupMapping_gidNumber' => array('<block><key>' . _('GID number') . '</key><value>' . $this->attributes['gidNumber'][0] . '</value></block>'),
'sambaGroupMapping_sambaSID' => array('<block><key>' . _('Windows group') . '</key><value>' . $this->attributes['sambaSID'][0] . '</value></block>'), 'sambaGroupMapping_sambaSID' => array('<block><key>' . _('Windows group') . '</key><value>' . $this->attributes['sambaSID'][0] . '</value></block>'),
'sambaGroupMapping_displayName' => array('<block><key>' . _('Display name') . '</key><value>' . $this->attributes['displayName'][0] . '</value></block>'), 'sambaGroupMapping_displayName' => array('<block><key>' . _('Display name') . '</key><value>' . $this->attributes['displayName'][0] . '</value></block>'),

View File

@ -1191,11 +1191,12 @@ class sambaSamAccount extends baseModule {
} }
} }
/* /**
* (non-PHPDoc) * Returns the PDF entries for this module.
* @see baseModule#get_pdfEntries *
* @return array list of possible PDF entries
*/ */
function get_pdfEntries($account_type = "user") { function get_pdfEntries() {
return array( 'sambaSamAccount_displayName' => array('<block><key>' . _('Display name') . '</key><value' . $this->attributes['displayName'][0] . '</value></block>'), return array( 'sambaSamAccount_displayName' => array('<block><key>' . _('Display name') . '</key><value' . $this->attributes['displayName'][0] . '</value></block>'),
'sambaSamAccount_uid' => array('<block><key>' . _('User name') . '</key><value>' . $this->attributes['uid'][0] . '</value></block>'), 'sambaSamAccount_uid' => array('<block><key>' . _('User name') . '</key><value>' . $this->attributes['uid'][0] . '</value></block>'),
'sambaSamAccount_sambaHomePath' => array('<block><key>' . _('Home path') . '</key><value>' . $this->attributes['sambaHomeDrive'][0] . '</value></block>'), 'sambaSamAccount_sambaHomePath' => array('<block><key>' . _('Home path') . '</key><value>' . $this->attributes['sambaHomeDrive'][0] . '</value></block>'),

View File

@ -299,9 +299,9 @@ class shadowAccount extends baseModule {
} }
/** /**
* Returns a list of PDF entries * Returns the PDF entries for this module.
* *
* @return array PDF entries * @return array list of possible PDF entries
*/ */
function get_pdfEntries() { function get_pdfEntries() {
return array('shadowAccount_shadowLastChange' => array('<block><key>' . _('Last password change') . '</key><value>' . $this->attributes['shadowLastChange'][0] . '</value></block>'), return array('shadowAccount_shadowLastChange' => array('<block><key>' . _('Last password change') . '</key><value>' . $this->attributes['shadowLastChange'][0] . '</value></block>'),