From 464ed3c13a06d34642cdc732dae047e70a11dc13 Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <daniel@firewall-services.com>
Date: Fri, 24 Aug 2012 14:01:13 +0200
Subject: [PATCH] Validation du champs Shell

---
 root/etc/e-smith/locale/fr/etc/e-smith/web/functions/userinfo    | 4 ++++
 root/etc/e-smith/web/functions/userinfo                          | 2 +-
 root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/userinfo.pm | 9 +++++++++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/root/etc/e-smith/locale/fr/etc/e-smith/web/functions/userinfo b/root/etc/e-smith/locale/fr/etc/e-smith/web/functions/userinfo
index 0763b93..78d9dcc 100644
--- a/root/etc/e-smith/locale/fr/etc/e-smith/web/functions/userinfo
+++ b/root/etc/e-smith/locale/fr/etc/e-smith/web/functions/userinfo
@@ -107,4 +107,8 @@
         <base>DIR_DOES_NOT_EXIST</base>
         <trans>Ce répertoire n'existe pas</trans>
     </entry>
+    <entry>
+        <base>IS_NOT_AN_EXECUTABLE</base>
+        <trans>Veuillez sélectionner un exécutable</trans>
+    </entry>
 </lexicon>
diff --git a/root/etc/e-smith/web/functions/userinfo b/root/etc/e-smith/web/functions/userinfo
index de34c4a..9be35ab 100644
--- a/root/etc/e-smith/web/functions/userinfo
+++ b/root/etc/e-smith/web/functions/userinfo
@@ -135,7 +135,7 @@ __DATA__
             <label>URL</label>
         </field>
         <field type="text" size="30" id="Shell"
-            value="get_ldap_value('Shell')">
+            value="get_ldap_value('Shell')" validation="exec_exists">
             <label>SHELL</label>
         </field>
         <field type="text" size="30" id="DesktopShell"
diff --git a/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/userinfo.pm b/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/userinfo.pm
index 9297edf..dc093d1 100644
--- a/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/userinfo.pm
+++ b/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/userinfo.pm
@@ -243,4 +243,13 @@ sub dir_exists {
     return $ret;
 }
 
+sub exec_exists {
+
+    my ($self, $field) = @_;
+    my $ret = $self->localise('IS_NOT_AN_EXECUTABLE');
+
+    $ret = 'OK' if (-x "$field");
+    return $ret;
+}
+
 1;