From 98db8951ecd0b022b1e02cf87cde030bfba966ed Mon Sep 17 00:00:00 2001 From: hickert Date: Tue, 23 Jun 2009 08:15:20 +0000 Subject: [PATCH] Updated FAI template edit git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@13766 594d385d-05f5-0310-b6e9-bd551577e9d8 --- .../fai/admin/fai/class_faiTemplateEdit.inc | 21 ++++++++++++------- .../fai/admin/fai/faiTemplateEdit.tpl | 14 +++++++++++++ 2 files changed, 28 insertions(+), 7 deletions(-) diff --git a/gosa-plugins/fai/admin/fai/class_faiTemplateEdit.inc b/gosa-plugins/fai/admin/fai/class_faiTemplateEdit.inc index 7534e6c0d..059939113 100644 --- a/gosa-plugins/fai/admin/fai/class_faiTemplateEdit.inc +++ b/gosa-plugins/fai/admin/fai/class_faiTemplateEdit.inc @@ -10,15 +10,20 @@ class faiTemplateEdit extends plugin // Encoding identification. Allows to warn the user. var $enc_before_edit = ""; var $enc_after_edit = ""; - var $write_protect = false; + var $write_protect = FALSE; + var $mb_extension = TRUE; function faiTemplateEdit (&$config, $dn, $value) { plugin::plugin ($config, $dn); - $this->value = $value; - $this->enc_before_edit = mb_detect_encoding($value); - if($this->enc_before_edit != "ASCII"){ - $this->write_protect = TRUE; + if(!function_exists("mb_detect_encoding")){ + $this->mb_extension = FALSE; + }else{ + $this->value = $value; + $this->enc_before_edit = mb_detect_encoding($value); + if($this->enc_before_edit != "ASCII"){ + $this->write_protect = TRUE; + } } } @@ -31,12 +36,14 @@ class faiTemplateEdit extends plugin $smarty = get_smarty(); $smarty->assign("templateValue",htmlspecialchars(($this->value))); $smarty->assign("write_protect",$this->write_protect); + $smarty->assign("mb_extension",$this->mb_extension); return($smarty->fetch(get_template_path('faiTemplateEdit.tpl', TRUE))); } /* Save data to object */ function save_object() - { + { + if(!$this->mb_extension) return; if(isset($_POST['templateValue']) && !$this->write_protect){ $this->value = get_post('templateValue'); $this->enc_after_edit = mb_detect_encoding($this->value); @@ -49,7 +56,7 @@ class faiTemplateEdit extends plugin function check() { $message = array(); - if(!$this->write_protect && $this->enc_after_edit !== $this->enc_before_edit ){ + if($this->mb_extension && !$this->write_protect && $this->enc_after_edit !== $this->enc_before_edit ){ $msg = sprintf(_("The file encodig has changed from '%s' to '%s', do you really want to save?"), "".$this->enc_before_edit."","".$this->enc_after_edit.""); $message[] = $msg; diff --git a/gosa-plugins/fai/admin/fai/faiTemplateEdit.tpl b/gosa-plugins/fai/admin/fai/faiTemplateEdit.tpl index a8b2526c8..799d5fff2 100644 --- a/gosa-plugins/fai/admin/fai/faiTemplateEdit.tpl +++ b/gosa-plugins/fai/admin/fai/faiTemplateEdit.tpl @@ -1,5 +1,17 @@

Template entry

+{if !$mb_extension} + +{msgPool type=missingext param1='multi byte'} + +

+

+ +
+

+ +{else} + {if $write_protect} {t}This FAI template is write protected due to its character encoding, editing may brake this file!{/t}
@@ -17,3 +29,5 @@

+ +{/if} -- 2.30.2