diff --git a/datamodels/2.x/authent-local/model.authent-local.php b/datamodels/2.x/authent-local/model.authent-local.php index bc4d83ff2..82722d96d 100755 --- a/datamodels/2.x/authent-local/model.authent-local.php +++ b/datamodels/2.x/authent-local/model.authent-local.php @@ -100,7 +100,7 @@ class UserLocal extends UserInternal array( 'col:col1' => array( - 'contactid', 'org_id', 'email', 'login', 'password', 'language', 'status', 'profile_list', 'allowed_org_list', + 'fieldset:UserLocal:info' => array('contactid', 'org_id', 'email', 'login', 'password', 'language', 'status', 'profile_list', 'allowed_org_list',) ), 'col:col2' => array( @@ -169,14 +169,30 @@ class UserLocal extends UserInternal if ('password' == $sAttCode) { - $sNow = date(\AttributeDate::GetInternalFormat()); - $this->Set('password_renewed_date', $sNow); $this->ValidatePassword($value); } return $result; } + protected function OnUpdate() + { + parent::OnUpdate(); // TODO: Change the autogenerated stub + + if (empty($this->m_oPasswordValidity)) + { + return; + } + + if (array_key_exists('password_renewed_date', $this->ListChanges())) + { + return; + } + + $sNow = date(\AttributeDate::GetInternalFormat()); + $this->Set('password_renewed_date', $sNow); + } + public function IsPasswordValid() { if (ContextTag::Check(ContextTag::TAG_SETUP)) diff --git a/datamodels/2.x/itop-config-mgmt/cs.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/cs.dict.itop-config-mgmt.php index cbaddfb66..a0cd5eb74 100755 --- a/datamodels/2.x/itop-config-mgmt/cs.dict.itop-config-mgmt.php +++ b/datamodels/2.x/itop-config-mgmt/cs.dict.itop-config-mgmt.php @@ -1898,6 +1898,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array( 'Server:otherinfo' => 'Další informace', 'Server:power' => 'Napájení', 'Person:info' => 'Obecné informace', + 'UserLocal:info' => 'General information~~', 'Person:personal_info' => 'Personal information~~', 'Person:notifiy' => 'Upozornění', 'Class:Subnet/Tab:IPUsage' => 'Využití IP', diff --git a/datamodels/2.x/itop-config-mgmt/da.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/da.dict.itop-config-mgmt.php index 9f4916bc2..b9fe22972 100644 --- a/datamodels/2.x/itop-config-mgmt/da.dict.itop-config-mgmt.php +++ b/datamodels/2.x/itop-config-mgmt/da.dict.itop-config-mgmt.php @@ -1891,6 +1891,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array( 'Server:otherinfo' => 'Øvrig Information', 'Server:power' => 'Power supply~~', 'Person:info' => 'Almindelig Information', + 'UserLocal:info' => 'General information~~', 'Person:personal_info' => 'Personal information~~', 'Person:notifiy' => 'Underretning', 'Class:Subnet/Tab:IPUsage' => 'IP Brug', diff --git a/datamodels/2.x/itop-config-mgmt/de.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/de.dict.itop-config-mgmt.php index 699d16a4c..6fb863d97 100755 --- a/datamodels/2.x/itop-config-mgmt/de.dict.itop-config-mgmt.php +++ b/datamodels/2.x/itop-config-mgmt/de.dict.itop-config-mgmt.php @@ -1893,6 +1893,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array( 'Server:otherinfo' => 'Sonstige Informationen', 'Server:power' => 'Stromversorgung', 'Person:info' => 'Allgemeine Informationen', + 'UserLocal:info' => 'General information~~', 'Person:personal_info' => 'Persönliche Informationen', 'Person:notifiy' => 'Benachrichtigungen', 'Class:Subnet/Tab:IPUsage' => 'IP-Nutzung', diff --git a/datamodels/2.x/itop-config-mgmt/en.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/en.dict.itop-config-mgmt.php index 008a8f231..b2e3139d6 100755 --- a/datamodels/2.x/itop-config-mgmt/en.dict.itop-config-mgmt.php +++ b/datamodels/2.x/itop-config-mgmt/en.dict.itop-config-mgmt.php @@ -1897,6 +1897,7 @@ Dict::Add('EN US', 'English', 'English', array( 'Server:otherinfo' => 'Other information', 'Server:power' => 'Power supply', 'Person:info' => 'General information', + 'UserLocal:info' => 'General information', 'Person:personal_info' => 'Personal information', 'Person:notifiy' => 'Notification', 'Class:Subnet/Tab:IPUsage' => 'IP Usage', diff --git a/datamodels/2.x/itop-config-mgmt/es_cr.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/es_cr.dict.itop-config-mgmt.php index ad67819cc..c08857361 100755 --- a/datamodels/2.x/itop-config-mgmt/es_cr.dict.itop-config-mgmt.php +++ b/datamodels/2.x/itop-config-mgmt/es_cr.dict.itop-config-mgmt.php @@ -1897,6 +1897,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array( 'Server:otherinfo' => 'Otra Información', 'Server:power' => 'Fuente de Poder', 'Person:info' => 'Información General', + 'UserLocal:info' => 'Información General', 'Person:personal_info' => 'Información Personal', 'Person:notifiy' => 'Notificación', 'Class:Subnet/Tab:IPUsage' => 'Uso de IP', diff --git a/datamodels/2.x/itop-config-mgmt/fr.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/fr.dict.itop-config-mgmt.php index 1fb338e2b..60d9bb67e 100755 --- a/datamodels/2.x/itop-config-mgmt/fr.dict.itop-config-mgmt.php +++ b/datamodels/2.x/itop-config-mgmt/fr.dict.itop-config-mgmt.php @@ -1894,6 +1894,7 @@ Dict::Add('FR FR', 'French', 'Français', array( 'Server:otherinfo' => 'Autres informations', 'Server:power' => 'Alimentation électrique', 'Person:info' => 'Informations générales', + 'UserLocal:info' => 'Informations générales', 'Person:personal_info' => 'Informations personnelles', 'Person:notifiy' => 'Notification', 'Class:Subnet/Tab:IPUsage' => 'IP utilisées', diff --git a/datamodels/2.x/itop-config-mgmt/hu.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/hu.dict.itop-config-mgmt.php index a905a791d..2ca28d6f1 100755 --- a/datamodels/2.x/itop-config-mgmt/hu.dict.itop-config-mgmt.php +++ b/datamodels/2.x/itop-config-mgmt/hu.dict.itop-config-mgmt.php @@ -1890,6 +1890,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array( 'Server:otherinfo' => 'Other information~~', 'Server:power' => 'Power supply~~', 'Person:info' => 'General information~~', + 'UserLocal:info' => 'General information~~', 'Person:personal_info' => 'Personal information~~', 'Person:notifiy' => 'Notification~~', 'Class:Subnet/Tab:IPUsage' => 'IP felhasználás', diff --git a/datamodels/2.x/itop-config-mgmt/it.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/it.dict.itop-config-mgmt.php index 8c2f59070..fdb5bf2cc 100755 --- a/datamodels/2.x/itop-config-mgmt/it.dict.itop-config-mgmt.php +++ b/datamodels/2.x/itop-config-mgmt/it.dict.itop-config-mgmt.php @@ -1890,6 +1890,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array( 'Server:otherinfo' => 'Other information~~', 'Server:power' => 'Power supply~~', 'Person:info' => 'General information~~', + 'UserLocal:info' => 'General information~~', 'Person:personal_info' => 'Personal information~~', 'Person:notifiy' => 'Notification~~', 'Class:Subnet/Tab:IPUsage' => 'Utilizzo IP', diff --git a/datamodels/2.x/itop-config-mgmt/ja.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/ja.dict.itop-config-mgmt.php index 47400c105..a3d97ae14 100755 --- a/datamodels/2.x/itop-config-mgmt/ja.dict.itop-config-mgmt.php +++ b/datamodels/2.x/itop-config-mgmt/ja.dict.itop-config-mgmt.php @@ -1890,6 +1890,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array( 'Server:otherinfo' => '他の情報', 'Server:power' => 'Power supply~~', 'Person:info' => '情報', + 'UserLocal:info' => 'General information~~', 'Person:personal_info' => 'Personal information~~', 'Person:notifiy' => '通知', 'Class:Subnet/Tab:IPUsage' => 'IP 利用', diff --git a/datamodels/2.x/itop-config-mgmt/nl.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/nl.dict.itop-config-mgmt.php index cf18fe297..90a31eeca 100644 --- a/datamodels/2.x/itop-config-mgmt/nl.dict.itop-config-mgmt.php +++ b/datamodels/2.x/itop-config-mgmt/nl.dict.itop-config-mgmt.php @@ -1902,6 +1902,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array( 'Server:otherinfo' => 'Andere informatie', 'Server:power' => 'Stroomtoevoer', 'Person:info' => 'Globale informatie', + 'UserLocal:info' => 'Globale informatie~~', 'Person:personal_info' => 'Persoonlijke informatie', 'Person:notifiy' => 'Notificeer', 'Class:Subnet/Tab:IPUsage' => 'IP-gebruik', diff --git a/datamodels/2.x/itop-config-mgmt/pt_br.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/pt_br.dict.itop-config-mgmt.php index 19d09c54b..8e08db5f6 100755 --- a/datamodels/2.x/itop-config-mgmt/pt_br.dict.itop-config-mgmt.php +++ b/datamodels/2.x/itop-config-mgmt/pt_br.dict.itop-config-mgmt.php @@ -1896,6 +1896,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array( 'Server:otherinfo' => 'Outras informações', 'Server:power' => 'Fonte de alimentação', 'Person:info' => 'Informações gerais', + 'UserLocal:info' => 'General information~~', 'Person:personal_info' => 'Informação pessoal', 'Person:notifiy' => 'Notificação', 'Class:Subnet/Tab:IPUsage' => 'IP usado', diff --git a/datamodels/2.x/itop-config-mgmt/ru.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/ru.dict.itop-config-mgmt.php index d4b584380..9d183d1c3 100755 --- a/datamodels/2.x/itop-config-mgmt/ru.dict.itop-config-mgmt.php +++ b/datamodels/2.x/itop-config-mgmt/ru.dict.itop-config-mgmt.php @@ -1883,6 +1883,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array( 'Server:otherinfo' => 'Дополнительно', 'Server:power' => 'Электропитание', 'Person:info' => 'Основное', + 'UserLocal:info' => 'General information~~', 'Person:personal_info' => 'Персональная информация', 'Person:notifiy' => 'Уведомления', 'Class:Subnet/Tab:IPUsage' => 'Использование IP-адресов', diff --git a/datamodels/2.x/itop-config-mgmt/sk.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/sk.dict.itop-config-mgmt.php index 9675eee06..0674f0707 100644 --- a/datamodels/2.x/itop-config-mgmt/sk.dict.itop-config-mgmt.php +++ b/datamodels/2.x/itop-config-mgmt/sk.dict.itop-config-mgmt.php @@ -1895,6 +1895,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array( 'Server:otherinfo' => 'Iné informácie', 'Server:power' => 'Power supply~~', 'Person:info' => 'Všeobecné informácie', + 'UserLocal:info' => 'General information~~', 'Person:personal_info' => 'Personal information~~', 'Person:notifiy' => 'Upozornenie', 'Class:Subnet/Tab:IPUsage' => 'Využívanosť IP adries', diff --git a/datamodels/2.x/itop-config-mgmt/tr.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/tr.dict.itop-config-mgmt.php index 4263b855f..f05b3707c 100755 --- a/datamodels/2.x/itop-config-mgmt/tr.dict.itop-config-mgmt.php +++ b/datamodels/2.x/itop-config-mgmt/tr.dict.itop-config-mgmt.php @@ -1897,6 +1897,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array( 'Server:otherinfo' => 'Other information~~', 'Server:power' => 'Power supply~~', 'Person:info' => 'General information~~', + 'UserLocal:info' => 'General information~~', 'Person:personal_info' => 'Personal information~~', 'Person:notifiy' => 'Notification~~', 'Class:Subnet/Tab:IPUsage' => 'IP Kullanımı', diff --git a/datamodels/2.x/itop-config-mgmt/zh_cn.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/zh_cn.dict.itop-config-mgmt.php index 71cd6aa77..c52a28d36 100755 --- a/datamodels/2.x/itop-config-mgmt/zh_cn.dict.itop-config-mgmt.php +++ b/datamodels/2.x/itop-config-mgmt/zh_cn.dict.itop-config-mgmt.php @@ -1895,6 +1895,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array( 'Server:otherinfo' => '其它信息', 'Server:power' => '电力供应', 'Person:info' => '基本信息', + 'UserLocal:info' => 'General information~~', 'Person:personal_info' => '个人信息', 'Person:notifiy' => '通知', 'Class:Subnet/Tab:IPUsage' => 'IP 使用率',