From 6416c36fe0c10dd0e986b380d55b6493c87cc4ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Bernigaud?= <come.bernigaud@laposte.net>
Date: Wed, 15 Jan 2014 15:38:04 +0100
Subject: [PATCH] Fixes: #2945 Improved samba munged dial encoding

---
 samba/personal/samba/class_sambaMungedDial.inc |   20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/samba/personal/samba/class_sambaMungedDial.inc b/samba/personal/samba/class_sambaMungedDial.inc
index a9920c2..6ef8cef 100644
--- a/samba/personal/samba/class_sambaMungedDial.inc
+++ b/samba/personal/samba/class_sambaMungedDial.inc
@@ -161,16 +161,16 @@ class sambaMungedDial
     $counter    = 0;
     $result_tmp = "";
     foreach ($params as $paramName => $paramValue) {
-      /* String parameter? */
+      if ($paramValue === '') {
+        continue;
+      }
+      $isString = FALSE;
       if (in_array($paramName, $this->stringParams)) {
+        /* String parameter */
         $isString   = TRUE;
         $paramValue = sambaMungedDial::strhex($paramValue.chr(0).chr(0));
-      } else {
-        $isString = FALSE;
-      }
-
-      /* Time parameter? */
-      if (in_array($paramName, $this->timeParams)) {
+      } elseif (in_array($paramName, $this->timeParams)) {
+        /* Time parameter */
         $paramValue = sambaMungedDial::genTime($paramValue);
       }
 
@@ -350,10 +350,10 @@ class sambaMungedDial
   {
     $flag = substr($this->ctx['CtxCfgFlags1'], 5, 1);
 
-    if (!$checked) {
-      $flag |= 1;
-    } else {
+    if ($checked) {
       $flag &= 0xFE;
+    } else {
+      $flag |= 1;
     }
 
     $this->ctx['CtxCfgFlags1'][5] = sprintf('%1x', $flag);
-- 
1.7.10.4