From f0f25e5b3481ff419949496d93d28fc37d2393bc Mon Sep 17 00:00:00 2001 From: cajus Date: Wed, 7 May 2008 16:32:41 +0000 Subject: [PATCH] Modified policy dialogs git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@10827 594d385d-05f5-0310-b6e9-bd551577e9d8 --- .../services/kerberos/class_krb5_policy.inc | 28 +++---- .../systems/services/kerberos/krb5_policy.tpl | 77 ++++++++++--------- 2 files changed, 56 insertions(+), 49 deletions(-) diff --git a/gosa-plugins/heimdal/admin/systems/services/kerberos/class_krb5_policy.inc b/gosa-plugins/heimdal/admin/systems/services/kerberos/class_krb5_policy.inc index 02234d73f..96b107465 100644 --- a/gosa-plugins/heimdal/admin/systems/services/kerberos/class_krb5_policy.inc +++ b/gosa-plugins/heimdal/admin/systems/services/kerberos/class_krb5_policy.inc @@ -69,6 +69,8 @@ class krb5_policy extends plugin foreach($this->attributes as $attr){ $smarty->assign($attr,$this->data[$attr]); } + + $smarty->assign("POLICY_REFCNT", sprintf(""._("This policy is referenced %d times.")."", $this->data["POLICY_REFCNT"])); return($smarty->fetch(get_template_path("krb5_policy.tpl",TRUE,dirname(__FILE__)))); } @@ -98,45 +100,45 @@ class krb5_policy extends plugin $message = array(); $names = $this->parent->getPolicyNames(); if($this->name != $this->init_name && in_array($this->name,$names)){ - $message[] = msgPool::duplicated(_("Name")); + $message[] = msgPool::duplicated(_("Policy name")); } if(empty($this->name)){ - $message[] = msgPool::required(_("Name")); + $message[] = msgPool::required(_("Policy name")); } if(!preg_match("/^[a-z0-9\@\.\-_]*$/i",$this->name)){ - $message[] = msgPool::invalid(_("Name"),$this->name,"/[a-z0-9]/i"); + $message[] = msgPool::invalid(_("Policy name"),$this->name,"/[a-z0-9]/i"); } /* Check password history */ if(!is_numeric($this->data['PW_HISTORY_NUM'])){ - $message[] = msgPool::invalid(_("Password history")); + $message[] = msgPool::invalid(_("Password history size")); }elseif($this->data['PW_HISTORY_NUM'] <= 0){ - $message[] = msgPool::toosmall(_("Password history")); + $message[] = msgPool::toosmall(_("Password history size")); } /* Check password minimum length */ if(!is_numeric($this->data['PW_MIN_LENGTH'])){ - $message[] = msgPool::invalid(_("Password minimum length")); + $message[] = msgPool::invalid(_("Minimum password length")); }elseif($this->data['PW_MIN_LENGTH'] <= 0){ - $message[] = msgPool::toosmall(_("Password minimum length")); + $message[] = msgPool::toosmall(_("Minimum password length")); } /* Check password different character classes */ if(!is_numeric($this->data['PW_MIN_CLASSES'])){ - $message[] = msgPool::invalid(_("Password min characters")); + $message[] = msgPool::invalid(_("Required different characters")); }elseif($this->data['PW_MIN_CLASSES'] <= 0){ - $message[] = msgPool::toosmall(_("Password min characters")); + $message[] = msgPool::toosmall(_("Required different characters")); }elseif($this->data['PW_MIN_CLASSES'] > $this->data['PW_MIN_LENGTH']){ $message[] = sprintf(_("The value specified for '%s' must be smaller than the value specified for '%s'."), - _("Password min characters"),_("Password minimum length")); + _("Required different characters"),_("Minimum password length")); } /* Check password min lifetime */ if(!is_numeric($this->data['PW_MIN_LIFE'])){ - $message[] = msgPool::invalid(_("Password minimum lifetime")); + $message[] = msgPool::invalid(_("Minimum password lifetime")); }elseif($this->data['PW_MIN_LIFE'] <= 0){ - $message[] = msgPool::toosmall(_("Password minimum lifetime")); + $message[] = msgPool::toosmall(_("Minimum password lifetime")); } /* Check password lifetime */ @@ -146,7 +148,7 @@ class krb5_policy extends plugin $message[] = msgPool::toosmall(_("Password lifetime")); }elseif($this->data['PW_MAX_LIFE'] < $this->data['PW_MIN_LIFE']){ $message[] = sprintf(_("The value specified for '%s' must be smaller than the value specified for '%s'."), - _("Password minimum lifetime"),_("Password lifetime")); + _("Minimum password lifetime"),_("Password lifetime")); } return($message); diff --git a/gosa-plugins/heimdal/admin/systems/services/kerberos/krb5_policy.tpl b/gosa-plugins/heimdal/admin/systems/services/kerberos/krb5_policy.tpl index 167e91f18..866a90567 100644 --- a/gosa-plugins/heimdal/admin/systems/services/kerberos/krb5_policy.tpl +++ b/gosa-plugins/heimdal/admin/systems/services/kerberos/krb5_policy.tpl @@ -1,39 +1,44 @@ -

{t}Policy options{/t}

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{t}Policy name{/t}
{t}Password minimum length{/t}
{t}Password history{/t}
{t}Password minimum lifetime{/t} {t}seconds{/t}
{t}Password lifetime{/t} {t}seconds{/t}
{t}Password min characters{/t}
{t}Number of principals referring to this policy{/t}: {$POLICY_REFCNT}
+

{t}Policy settings{/t}

+ + + + + + + + +
+ + + + + + + + + + + + + + + + + +
{t}Policy name{/t}{$must}
{t}Minimum password length{/t}
{t}Required different characters{/t}
{t}Password history size{/t}
+ 		+ + + + + + + + + +
+
{t}Minimum password lifetime{/t} {t}seconds{/t}
{t}Password lifetime{/t} {t}seconds{/t}
+

{$POLICY_REFCNT}

 

-- 2.30.2