From 779048bdf3ebfc5965ada319284a1e59f7b7a7f4 Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Tue, 27 Sep 2005 12:54:44 +0000 Subject: [PATCH] fixed mobile telephone number --- lam/HISTORY | 1 + lam/lib/modules/inetOrgPerson.inc | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/lam/HISTORY b/lam/HISTORY index 13c95637..0c62fd81 100644 --- a/lam/HISTORY +++ b/lam/HISTORY @@ -2,6 +2,7 @@ - fixed bugs: -> automatic UID/GID assignment did not fully work -> PDF: additional groups for Unix users + -> inetOrgPerson: fixed mobile number 28.09.2005 0.5.0 diff --git a/lam/lib/modules/inetOrgPerson.inc b/lam/lib/modules/inetOrgPerson.inc index f2a068ca..2967e80b 100644 --- a/lam/lib/modules/inetOrgPerson.inc +++ b/lam/lib/modules/inetOrgPerson.inc @@ -419,7 +419,7 @@ class inetOrgPerson extends baseModule { $this->attributes['title'][0] = $post['title']; $this->attributes['mail'][0] = $post['mail']; $this->attributes['telephoneNumber'][0] = $post['telephoneNumber']; - $this->attributes['mobileTelephoneNumber'][0] = $post['mobileTelephoneNumber']; + $this->attributes['mobile'][0] = $post['mobileTelephoneNumber']; $this->attributes['facsimileTelephoneNumber'][0] = $post['facsimileTelephoneNumber']; $this->attributes['street'][0] = $post['street']; $this->attributes['postOfficeBox'][0] = $post['postOfficeBox']; @@ -473,7 +473,7 @@ class inetOrgPerson extends baseModule { if (($this->attributes['givenName'][0] != '') && !get_preg($this->attributes['givenName'][0], 'realname')) $triggered_messages['givenName'][] = $this->messages['givenName'][0]; if ( !get_preg($this->attributes['sn'][0], 'realname')) $triggered_messages['sn'][] = $this->messages['lastname'][0]; if ( !get_preg($this->attributes['telephoneNumber'][0], 'telephone')) $triggered_messages['telephoneNumber'][] = $this->messages['telephoneNumber'][0]; - if ( !get_preg($this->attributes['mobileTelephoneNumber'][0], 'telephone')) $triggered_messages['mobileTelephoneNumber'][] = $this->messages['mobileTelephone'][0]; + if ( !get_preg($this->attributes['mobile'][0], 'telephone')) $triggered_messages['mobileTelephoneNumber'][] = $this->messages['mobileTelephone'][0]; if ( !get_preg($this->attributes['facsimileTelephoneNumber'][0], 'telephone')) $triggered_messages['facsimileTelephoneNumber'][] = $this->messages['facsimileNumber'][0]; if (($this->attributes['mail'][0] != '') && !get_preg($this->attributes['mail'][0], 'email')) $triggered_messages['mail'][] = $this->messages['email'][0]; if ( !get_preg($this->attributes['street'][0], 'street')) $triggered_messages['street'][] = $this->messages['street'][0]; @@ -576,7 +576,7 @@ class inetOrgPerson extends baseModule { 2 => array ('kind' => 'help', 'value' => 'telephoneNumber')); $return[] = array ( 0 => array ( 'kind' => 'text', 'text' => _('Mobile number') ), 1 => array ( 'kind' => 'input', 'name' => 'mobileTelephoneNumber', 'type' => 'text', 'size' => '30', - 'maxlength' => '255', 'value' => $this->attributes['mobileTelephoneNumber'][0] ), + 'maxlength' => '255', 'value' => $this->attributes['mobile'][0] ), 2 => array ('kind' => 'help', 'value' => 'mobileTelephoneNumber')); $return[] = array ( 0 => array ( 'kind' => 'text', 'text' => _('Fax number') ), 1 => array ( 'kind' => 'input', 'name' => 'facsimileTelephoneNumber', 'type' => 'text', 'size' => '30', @@ -690,7 +690,7 @@ class inetOrgPerson extends baseModule { 'inetOrgPerson_postalCode' => array('' . _('Postal code') . '' . $this->attributes['postalCode'][0] . ''), 'inetOrgPerson_postalAddress' => array('' . _('Postal address') . '' . $this->attributes['postalAddress'][0] . ''), 'inetOrgPerson_telephoneNumber' => array('' . _('Telephone number') . '' . $this->attributes['telephoneNumber'][0] . ''), - 'inetOrgPerson_mobileTelephoneNumber' => array('' . _('Mobile number') . '' . $this->attributes['mobileTelephoneNumber'][0] . ''), + 'inetOrgPerson_mobileTelephoneNumber' => array('' . _('Mobile number') . '' . $this->attributes['mobile'][0] . ''), 'inetOrgPerson_facimileTelephoneNumber' => array('' . _('Fax number') . '' . $this->attributes['facsimileTelephoneNumber'][0] . ''), 'inetOrgPerson_mail' => array('' . _('eMail address') . '' . $this->attributes['mail'][0] . ''), 'inetOrgPerson_cn' => array('' . _('Common name') . '' . $this->attributes['cn'][0] . ''), @@ -825,7 +825,7 @@ class inetOrgPerson extends baseModule { // mobile if ($rawAccounts[$i][$ids['inetOrgPerson_mobile']] != "") { if (get_preg($rawAccounts[$i][$ids['inetOrgPerson_mobile']], 'telephone')) { - $partialAccounts[$i]['mobiletelephoneNumber'] = $rawAccounts[$i][$ids['inetOrgPerson_mobile']]; + $partialAccounts[$i]['mobile'] = $rawAccounts[$i][$ids['inetOrgPerson_mobile']]; } else { $errMsg = $this->messages['mobileTelephone'][1];