Updated Class & Template for heimdal

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@8033 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/ihtml/themes/default/pwd_heimdal.tpl b/ihtml/themes/default/pwd_heimdal.tpl
index 2707c3fe48ed405a2c71d9ca3171e9a646e34ab0..bdc58f6b7477fbcf4325f0dcb5d19b4c59564e61 100644 (file)
--- a/ihtml/themes/default/pwd_heimdal.tpl
+++ b/ihtml/themes/default/pwd_heimdal.tpl
@@ -31,15 +31,15 @@
                                        </td>
                                        <td style="width:40px;"><i>{t}infinite{/t}</i>
                                        </td>
-                                       <td><i>{t}Year{/t}</i>
+                                       <td><i>{t}Hour{/t}</i>
                                        </td>
-                                       <td><i>{t}Month{/t}</i>
+                                       <td style="width:60px;"><i>{t}Minute{/t}</i>
                                        </td>
                                        <td><i>{t}Day{/t}</i>
                                        </td>
-                                       <td><i>{t}Hour{/t}</i>
+                                       <td><i>{t}Month{/t}</i>
                                        </td>
-                                       <td><i>{t}Minute{/t}</i>
+                                       <td><i>{t}Year{/t}</i>
                                        </td>
                                </tr>
                                <tr>
@@ -57,13 +57,13 @@
                                                >
                                        </td>
                                        <td>
-                                               <select name="krb5ValidStart_y" id="krb5ValidStart_y" {if $krb5ValidStart_clear} disabled {/if}> 
-                                                       {html_options options=$years selected=$krb5ValidStart_y}
+                                               <select name="krb5ValidStart_h" id="krb5ValidStart_h" {if $krb5ValidStart_clear} disabled {/if}>
+                                                       {html_options options=$hours selected=$krb5ValidStart_h}
                                                </select>
                                        </td>
                                        <td>
-                                               <select name="krb5ValidStart_m" id="krb5ValidStart_m" {if $krb5ValidStart_clear} disabled {/if}>
-                                                       {html_options options=$month selected=$krb5ValidStart_m}
+                                               <select name="krb5ValidStart_i" id="krb5ValidStart_i" {if $krb5ValidStart_clear} disabled {/if}>
+                                                       {html_options options=$minutes selected=$krb5ValidStart_i}
                                                </select>
                                        </td>
                                        <td>
@@ -72,13 +72,13 @@
                                                </select>
                                        </td>
                                        <td>
-                                               <select name="krb5ValidStart_h" id="krb5ValidStart_h" {if $krb5ValidStart_clear} disabled {/if}>
-                                                       {html_options options=$hours selected=$krb5ValidStart_h}
+                                               <select name="krb5ValidStart_m" id="krb5ValidStart_m" {if $krb5ValidStart_clear} disabled {/if}>
+                                                       {html_options options=$month selected=$krb5ValidStart_m}
                                                </select>
                                        </td>
                                        <td>
-                                               <select name="krb5ValidStart_i" id="krb5ValidStart_i" {if $krb5ValidStart_clear} disabled {/if}>
-                                                       {html_options options=$minutes selected=$krb5ValidStart_i}
+                                               <select name="krb5ValidStart_y" id="krb5ValidStart_y" {if $krb5ValidStart_clear} disabled {/if}> 
+                                                       {html_options options=$years selected=$krb5ValidStart_y}
                                                </select>
                                        </td>
                                </tr>
@@ -97,13 +97,13 @@
                                                >
                                        </td>
                                        <td>
-                                               <select name="krb5ValidEnd_y" id="krb5ValidEnd_y" {if $krb5ValidEnd_clear} disabled {/if}>
-                                                       {html_options options=$years selected=$krb5ValidEnd_y}
+                                               <select name="krb5ValidEnd_h" id="krb5ValidEnd_h" {if $krb5ValidEnd_clear} disabled {/if}>
+                                                       {html_options options=$hours selected=$krb5ValidEnd_h}
                                                </select>
                                        </td>
                                        <td>
-                                               <select name="krb5ValidEnd_m" id="krb5ValidEnd_m" {if $krb5ValidEnd_clear} disabled {/if}>
-                                                       {html_options options=$month selected=$krb5ValidEnd_m}
+                                               <select name="krb5ValidEnd_i" id="krb5ValidEnd_i" {if $krb5ValidEnd_clear} disabled {/if}>
+                                                       {html_options options=$minutes selected=$krb5ValidEnd_i}
                                                </select>
                                        </td>
                                        <td>
@@ -112,13 +112,13 @@
                                                </select>
                                        </td>
                                        <td>
-                                               <select name="krb5ValidEnd_h" id="krb5ValidEnd_h" {if $krb5ValidEnd_clear} disabled {/if}>
-                                                       {html_options options=$hours selected=$krb5ValidEnd_h}
+                                               <select name="krb5ValidEnd_m" id="krb5ValidEnd_m" {if $krb5ValidEnd_clear} disabled {/if}>
+                                                       {html_options options=$month selected=$krb5ValidEnd_m}
                                                </select>
                                        </td>
                                        <td>
-                                               <select name="krb5ValidEnd_i" id="krb5ValidEnd_i" {if $krb5ValidEnd_clear} disabled {/if}>
-                                                       {html_options options=$minutes selected=$krb5ValidEnd_i}
+                                               <select name="krb5ValidEnd_y" id="krb5ValidEnd_y" {if $krb5ValidEnd_clear} disabled {/if}>
+                                                       {html_options options=$years selected=$krb5ValidEnd_y}
                                                </select>
                                        </td>
                                </tr>
@@ -137,14 +137,15 @@
                                                >
                                        </td>
                                        <td>
-                                               <select name="krb5PasswordEnd_y" id="krb5PasswordEnd_y" {if $krb5PasswordEnd_clear} disabled {/if}>
-                                                       {html_options options=$years selected=$krb5PasswordEnd_y}
+                                               <select name="krb5PasswordEnd_h" id="krb5PasswordEnd_h" {if $krb5PasswordEnd_clear} disabled {/if}>
+                                                       {html_options options=$hours selected=$krb5PasswordEnd_h}
                                                </select>
                                        </td>
                                        <td>
-                                               <select name="krb5PasswordEnd_m" id="krb5PasswordEnd_m" {if $krb5PasswordEnd_clear} disabled {/if}>
-                                                       {html_options options=$month selected=$krb5PasswordEnd_m}
+                                               <select name="krb5PasswordEnd_i" id="krb5PasswordEnd_i" {if $krb5PasswordEnd_clear} disabled {/if}>
+                                                       {html_options options=$minutes selected=$krb5PasswordEnd_i}
                                                </select>
+
                                        </td>
                                        <td>
                                                <select name="krb5PasswordEnd_d" id="krb5PasswordEnd_d" {if $krb5PasswordEnd_clear} disabled {/if}>
@@ -152,15 +153,14 @@
                                                </select>
                                        </td>
                                        <td>
-                                               <select name="krb5PasswordEnd_h" id="krb5PasswordEnd_h" {if $krb5PasswordEnd_clear} disabled {/if}>
-                                                       {html_options options=$hours selected=$krb5PasswordEnd_h}
+                                               <select name="krb5PasswordEnd_m" id="krb5PasswordEnd_m" {if $krb5PasswordEnd_clear} disabled {/if}>
+                                                       {html_options options=$month selected=$krb5PasswordEnd_m}
                                                </select>
                                        </td>
                                        <td>
-                                               <select name="krb5PasswordEnd_i" id="krb5PasswordEnd_i" {if $krb5PasswordEnd_clear} disabled {/if}>
-                                                       {html_options options=$minutes selected=$krb5PasswordEnd_i}
+                                               <select name="krb5PasswordEnd_y" id="krb5PasswordEnd_y" {if $krb5PasswordEnd_clear} disabled {/if}>
+                                                       {html_options options=$years selected=$krb5PasswordEnd_y}
                                                </select>
-
                                        </td>
                                </tr>
                        </table>

diff --git a/include/class_password-methods-heimdal.inc b/include/class_password-methods-heimdal.inc
index 370ee803f8cd3320a5f07a6efed404fdfe6cdc24..05e9dc568a07d9473745b9c08aed3923fe04be97 100644 (file)
--- a/include/class_password-methods-heimdal.inc
+++ b/include/class_password-methods-heimdal.inc
@@ -65,9 +65,9 @@ class passwordMethodheimdal extends passwordMethod
     $this->is_account = FALSE;
     $this->krb5MaxLife    = 86400;
     $this->krb5MaxRenew   = 604800;
-    $this->krb5ValidStart = date("YmdHi",time())."Z";
-    $this->krb5ValidEnd   = date("YmdHi",time())."Z";
-    $this->krb5PasswordEnd= date("YmdHi",time())."Z";
+    $this->krb5ValidStart = date("Ymd",time())."0000Z";
+    $this->krb5ValidEnd   = date("Ymd",time())."0000Z";
+    $this->krb5PasswordEnd= date("Ymd",time())."0000Z";
 
     /* Load existing entries */
     if($dn != "new"){